Changes of com.discord v872

com.discord/res/layout/view_active_subscription.xml

@@ -9,7 +9,7 @@
         <Button android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/active_subscription_top_button" android:background="@drawable/drawable_uikit_primary_100_button_outline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Compact" />
         <ProgressBar android:theme="@style/UiKit.ProgressBar.White" android:id="@id/active_subscription_progress" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/active_subscription_apple_indicator" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_managed_by_itunes" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/active_subscription_apple_indicator" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_managed_by_apple" style="@style/UiKit.TextView" />
     <Button android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" style="@style/UiKit.Button.Grey" />
     <TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/active_subscription_spinner_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_pay_for_it_with" />
     <Spinner android:id="@id/active_subscription_spinner" android:background="@drawable/bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="@drawable/bg_payment_method_spinner_dropdown" />

com.discord/res/layout/view_toolbar_title.xml

@@ -3,5 +3,5 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/toolbar_title" android:layout_width="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Toolbar.TextAppearance.Title" />
     <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="10.5sp" android:layout_height="10.5sp" android:layout_marginLeft="@dimen/uikit_spacing_small" android:baselineAlignBottom="true" app:layout_constraintBaseline_toBaselineOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="10.5dip" android:layout_height="10.5dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:baselineAlignBottom="true" app:layout_constraintBaseline_toBaselineOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_channels_list.xml

@@ -3,8 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:gravity="center_vertical" android:id="@id/channels_list_header_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="15.0sp" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/channels_list_header" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:drawableRight="@drawable/icon_more" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="@drawable/icon_more" style="@style/UiKit.TextView.Bold" />
-        <RelativeLayout android:id="@id/channels_list_search" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="?actionBarSize" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white_alpha_20" android:gravity="start|center" android:background="@drawable/drawable_overlay_search" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" style="@style/UiKit.TextView.Semibold" />
+        <RelativeLayout android:id="@id/channels_list_search" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white_alpha_20" android:gravity="start|center" android:background="@drawable/drawable_overlay_search" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" style="@style/UiKit.TextView.Semibold" />
         </RelativeLayout>
     </LinearLayout>
     <androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_header_wrap" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />

com.discord/res/layout/widget_channels_list_unreads.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:background="@drawable/drawable_button_grey" android:paddingLeft="@dimen/uikit_spacing_xsmall" android:paddingTop="3.0dip" android:paddingRight="@dimen/uikit_spacing_xsmall" android:paddingBottom="3.0dip" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:ellipsize="none" android:id="@id/channels_list_unreads" android:drawablePadding="@dimen/uikit_spacing_xsmall" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
+    <TextView android:textSize="12.0dip" android:textColor="@color/white" android:ellipsize="none" android:id="@id/channels_list_unreads" android:drawablePadding="@dimen/uikit_spacing_xsmall" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
 </RelativeLayout>

com.discord/res/layout/widget_disable_delete_account_dialog.xml

@@ -7,7 +7,7 @@
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
         <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:id="@id/disable_delete_body" style="@style/UiKit.TextView" />
+            <TextView android:textSize="14.0dip" android:id="@id/disable_delete_body" style="@style/UiKit.TextView" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/disable_delete_password_wrap" android:inputType="textPassword" app:hintEnabled="false" app:passwordToggleEnabled="true" app:passwordToggleTint="?primary_400" style="@style/UiKit.TextInputLayout">
                 <EditText android:id="@id/disable_delete_password" android:hint="@string/form_label_password" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.Password" />
             </com.google.android.material.textfield.TextInputLayout>

com.discord/res/layout/widget_friends_add.xml

@@ -11,7 +11,7 @@
             <com.google.android.material.textfield.TextInputLayout android:id="@id/friends_add_text_edit_wrap" android:layout_width="fill_parent" android:hint=" " android:layout_weight="6.0" style="@style/UiKit.Form.Field.EditText.Wrap">
                 <androidx.appcompat.widget.AppCompatEditText android:id="@id/friends_add_text_edit" android:hint="@string/add_friend_input_hint" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.SingleLine" />
             </com.google.android.material.textfield.TextInputLayout>
-            <Button android:enabled="false" android:layout_gravity="end|center|top" android:id="@id/friends_add_send" android:layout_marginTop="24.0dip" android:text="@string/send" android:layout_weight="1.0" style="@style/UiKit.Button.Fit" />
+            <Button android:enabled="false" android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:layout_gravity="end|center|top" android:id="@id/friends_add_send" android:layout_marginTop="24.0dip" android:text="@string/send" android:maxLines="1" android:layout_weight="1.0" style="@style/UiKit.Button.Fit" />
         </LinearLayout>
     </LinearLayout>
     <fragment android:id="@id/friends_add_nearby" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/friends_add_container" class="com.discord.widgets.friends.WidgetFriendsFindNearby" />

com.discord/res/layout/widget_search_suggestions_item_suggestion.xml

@@ -3,5 +3,5 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/suggestion_example_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="17.0dip" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" />
     <TextView android:textColor="?theme_search_suggestion_text_color_primary" android:id="@id/suggestion_example_filter" android:layout_marginLeft="72.0dip" android:layout_centerVertical="true" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textColor="?theme_search_suggestion_text_color_secondary" android:id="@id/suggestion_example_answer" android:layout_marginLeft="5.0dip" android:layout_toRightOf="@id/suggestion_example_filter" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
+    <TextView android:textColor="?theme_search_suggestion_text_color_secondary" android:ellipsize="end" android:id="@id/suggestion_example_answer" android:layout_marginLeft="5.0dip" android:maxLines="1" android:layout_toRightOf="@id/suggestion_example_filter" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
 </RelativeLayout>

com.discord/res/layout/widget_settings_account.xml

@@ -31,10 +31,10 @@
             <TextView android:textColor="@color/status_orange_500" android:id="@id/settings_account_claim_btn" android:visibility="gone" android:text="@string/claim_account" android:drawableRight="@drawable/ic_chevron_right_grey_12dp" android:drawableEnd="@drawable/ic_chevron_right_grey_12dp" style="@style/UiKit.Settings.Item.Header" />
             <View style="@style/UiKit.Divider" />
             <LinearLayout android:id="@id/settings_account_mfa_container" style="@style/UiKit.ViewGroup.LinearLayout">
-                <FrameLayout style="@style/UiKit.ViewGroup">
-                    <TextView android:text="@string/two_fa" style="@style/UiKit.Settings.Item.Header" />
-                    <TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/user_settings_mfa_enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" style="@style/UiKit.TextView.Semibold" />
-                </FrameLayout>
+                <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                    <TextView android:layout_width="0.0dip" android:text="@string/two_fa" android:layout_weight="1.0" style="@style/UiKit.Settings.Item.Header" />
+                    <TextView android:textColor="@color/status_green_500" android:id="@id/settings_account_mfa_enabled_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/user_settings_mfa_enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@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="fill_parent" android:layout_height="wrap_content">
                     <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" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />

com.discord/res/layout/widget_settings_appearance.xml

@@ -5,7 +5,7 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView 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="radio" 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="radio" style="@style/UiKit.CheckedSetting.Themed" />
@@ -17,11 +17,15 @@
             <LinearLayout android:id="@id/settings_appearance_font_scaling_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView 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" />
-                <LinearLayout style="@style/UiKit.Settings.Item">
-                    <TextView android:id="@id/settings_appearance_current_font_scale" android:minWidth="30.0dip" style="@style/UiKit.TextView" />
-                    <SeekBar android:id="@id/settings_appearance_font_scaling_seekbar" android:max="70" style="@style/UiKit.SeekBar" />
-                </LinearLayout>
-                <Button android:layout_gravity="center_horizontal" android:id="@id/settings_appearance_font_scaling_reset" android:text="@string/reset" style="@style/UiKit.Button.Fit" />
+                <RelativeLayout style="@style/UiKit.Settings.Item">
+                    <TextView android:textSize="12.0dip" android:id="@id/settings_appearance_font_scaling_seekbar_text_left" android:text="Aa" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
+                    <SeekBar android:id="@id/settings_appearance_font_scaling_seekbar" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" 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="21.0dip" android:id="@id/settings_appearance_font_scaling_seekbar_text_right" android:text="Aa" android:layout_alignParentRight="true" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
+                </RelativeLayout>
+                <FrameLayout android:background="?chat_embed_bg" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
+                    <include layout="@layout/widget_chat_list_adapter_item_text" />
+                </FrameLayout>
+                <TextView android:layout_gravity="left" android:id="@id/settings_appearance_font_scaling_reset" android:layout_marginLeft="@dimen/uikit_spacing_large" android:text="@string/reset" style="@style/UiKit.TextView.Link" />
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>

com.discord/res/layout/widget_settings_voice.xml

@@ -11,8 +11,8 @@
             <com.discord.views.CheckedSetting android:id="@id/settings_voice_input_mode_radio_2" app:cs_text="@string/input_mode_ptt" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <View style="@style/UiKit.Settings.Divider" />
             <RelativeLayout android:id="@id/settings_voice_sensitivity_wrap" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/settings_voice_sensitivity_header" android:text="@string/form_label_sensitivty" android:layout_alignBaseline="@id/settings_voice_sensitivity_test_button" style="@style/UiKit.TextView" />
-                <Button android:textColor="?primary_100" android:id="@id/settings_voice_sensitivity_test_button" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/form_label_test_microphone" android:drawableLeft="?ic_mic" android:layout_alignParentRight="true" android:drawableStart="?ic_mic" style="@style/UiKit.Button.White.Outline" />
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/settings_voice_sensitivity_header" android:text="@string/form_label_sensitivty" android:maxLines="1" android:layout_toLeftOf="@id/settings_voice_sensitivity_test_button" android:layout_alignBaseline="@id/settings_voice_sensitivity_test_button" android:layout_alignParentLeft="true" style="@style/UiKit.TextView" />
+                <Button android:textSize="@dimen/uikit_textsize_medium" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/settings_voice_sensitivity_test_button" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/form_label_test_microphone" android:maxLines="1" android:drawableLeft="?ic_mic" android:layout_alignParentRight="true" android:drawableStart="?ic_mic" style="@style/UiKit.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="fill_parent" android:layout_height="wrap_content">
                         <com.miguelgaeta.super_bar.SuperBar android:id="@id/settings_voice_sensitivity_manual" android:layout_marginTop="@dimen/uikit_spacing_small" app:sb_barBackgroundColor="@color/status_green_500" app:sb_barColor="@color/status_yellow_500" app:sb_barOverlayColor="@color/white_alpha_40" style="@style/UiKit.SuperBar" />