Changes of com.discord v1082

This commit is contained in:
root 2020-03-27 23:23:51 +01:00
parent 6522098e74
commit 60bdc9c81a
9090 changed files with 414758 additions and 386577 deletions

View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/view_dialog_confirmation_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/accessibility_detection_modal_header" style="@style/UiKit.TextView" />
<View style="@style/UiKit.Divider" />
<com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/accessibility_detection_body_text" android:padding="@dimen/uikit_spacing_large" 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>

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView android:id="@id/header_item_text" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" style="@style/UiKit.Search.Header"
<TextView android:textColor="?colorHeaderSecondary" android:id="@id/header_item_text" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" style="@style/UiKit.Search.Header"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/FlexInput.Main.Widget"
<LinearLayout android:id="@id/flex_input_container" android:background="?colorBackgroundPrimary" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@id/attachment_preview_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/attachment_preview_list" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" app:layoutManager="LinearLayoutManager" />
<ImageButton 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="4.0dip" style="@style/FlexInput.Input.Button" />
<LinearLayout android:gravity="center_vertical" android:id="@id/flex_input_attachment_preview_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/flex_input_attachment_preview_list" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" app:layoutManager="LinearLayoutManager" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_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="4.0dip" style="@style/FlexInput.Input.Button" />
</LinearLayout>
<LinearLayout android:orientation="horizontal" android:id="@id/main_input_container" style="@style/FlexInput.Input.Widget">
<ImageButton android:id="@id/add_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/attach_files" style="@style/FlexInput.Input.Button.AddContent" />
<com.lytefast.flexinput.widget.FlexEditText android:id="@id/text_input" android:background="@android:color/transparent" android:focusable="true" android:focusableInTouchMode="true" android:layout_width="0.0dip" android:layout_height="fill_parent" android:hint="@string/send_a_message" android:maxLines="2" android:layout_weight="1.0" android:inputType="textAutoComplete|textMultiLine|textShortMessage" />
<ImageButton android:id="@id/emoji_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/emoji" style="@style/FlexInput.Input.Button.Emoji" />
<ImageButton android:id="@id/send_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/send_message" style="@style/FlexInput.Input.Button.Send" />
</LinearLayout>
<FrameLayout android:orientation="vertical" android:id="@id/emoji_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
<RelativeLayout android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" 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/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_carot_right_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/expand_buttons" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
</LinearLayout>
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.lytefast.flexinput.widget.FlexEditText android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@android:color/transparent" android:focusable="true" android:focusableInTouchMode="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:hint="@string/send_a_message" android:maxLines="5" android:layout_weight="1.0" android:inputType="textAutoComplete|textMultiLine|textShortMessage" />
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:tint="?colorInteractiveNormal" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" style="@style/UiKit.ImageButton" />
</LinearLayout>
<FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:visibility="gone" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:backgroundTint="?chat_send_btn_bg">
<ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:tint="?chat_send_btn" android:importantForAccessibility="no" />
</FrameLayout>
</RelativeLayout>
<FrameLayout android:orientation="vertical" android:id="@id/flex_input_emoji_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
</LinearLayout>

View file

@ -5,7 +5,7 @@
<com.camerakit.CameraKitView android:gravity="center" android:layout_gravity="center" android:id="@id/camera_view" android:layout_width="fill_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" app:camera_facing="back" app:camera_flash="auto" app:camera_focus="continuous" app:camera_imageJpegQuality="100" />
<ImageButton android:id="@id/camera_flash_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/FlexInput.Input.Button.Camera.Flash" />
<ImageButton android:id="@id/camera_facing_btn" 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="56.0dip" android:layout_height="56.0dip" android:contentDescription="@string/ios_media_keyboard_take_a_photo" style="@style/FlexInput.Input.Button.Camera.Capture" />
<ImageView android:id="@id/take_photo_btn" android:layout_width="56.0dip" android:layout_height="56.0dip" 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" style="@style/FlexInput.Input.Button.Camera.Launcher" />
</RelativeLayout>
<FrameLayout android:id="@id/permissions_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/FlexInput.AddContent.Permissions" />

View file

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content"
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/add_friend_user_item_avatar" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
<com.discord.views.StatusView android:id="@id/add_friend_user_item_status" android:layout_width="16.0dip" android:layout_height="wrap_content" android:translationX="2.0dip" android:translationY="2.0dip" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="4.0dip" />
<TextView android:id="@id/add_friend_user_item_name" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/add_friend_user_item_name_secondary" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_name" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_send" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Subtext.SingleLine" />
<com.google.android.material.button.MaterialButton android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Material.Button.Outline" />
<com.google.android.material.button.MaterialButton android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Material.Button.Green.Outline" />
<TextView android:textColor="?primary_500" android:gravity="center" android:id="@id/add_friend_user_item_sent" android:visibility="gone" android:minWidth="90.0dip" android:text="@string/invite_friend_modal_sent" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
<com.discord.views.StatusView android:id="@id/add_friend_user_item_status" android:layout_width="16.0dip" android:layout_height="wrap_content" android:translationX="2.0dip" android:translationY="2.0dip" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="3.0dip" app:sv_corner_radius="4.0dip" />
<LinearLayout android:gravity="start|center" android:id="@id/add_friend_user_item_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_buttons" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?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="?colorHeaderSecondary" android:ellipsize="end" android:id="@id/add_friend_user_item_name_secondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" 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="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" 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:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:srcCompat="@drawable/ic_add_friend_green_check" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/nuf_channels_description" app:stv_title="@string/nuf_channels_title" />
<ImageView android:layout_width="280.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="?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>

View file

@ -2,14 +2,13 @@
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<include layout="@layout/widget_chat_input_guard" />
<LinearLayout android:orientation="vertical" android:id="@id/chat_input_wrap" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content">
<LinearLayout android:id="@id/chat_input_wrap" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_mentions_recycler" android:background="?theme_chat_input" android:scrollbars="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" />
<RelativeLayout android:id="@id/chat_input_edit" android:background="?theme_chat_input_edit" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content">
<View android:id="@id/chat_input_edit_border" android:background="?theme_chat_input_divider" android:layout_width="fill_parent" android:layout_height="0.25dip" android:layout_alignParentTop="true" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_input_text" android:paddingLeft="16.0dip" android:paddingTop="6.0dip" android:paddingRight="16.0dip" android:paddingBottom="6.0dip" android:text="@string/editing_message" android:layout_below="@id/chat_input_edit_border" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextNormal" android:paddingLeft="16.0dip" android:paddingTop="6.0dip" android:paddingRight="16.0dip" android:paddingBottom="6.0dip" android:text="@string/editing_message" android:layout_below="@id/chat_input_edit_border" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/chat_input_edit_cancel" android:paddingLeft="12.0dip" android:paddingTop="6.0dip" android:paddingRight="12.0dip" android:paddingBottom="6.0dip" android:text="@string/cancel" android:layout_below="@id/chat_input_edit_border" android:layout_alignParentEnd="true" style="@style/UiKit.TextView.Bold" />
</RelativeLayout>
<View android:background="?theme_chat_input_divider" android:layout_width="fill_parent" android:layout_height="0.75dip" />
<fragment android:name="com.lytefast.flexinput.fragment.FlexInputFragment" android:id="@id/chat_input_widget" android:layout_width="fill_parent" android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView"
<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout style="@style/UiKit.ViewGroup.Page"
<RelativeLayout android:background="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.Page"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<include android:id="@id/emoji_search_bar" layout="@layout/layout_search_actionbar" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView" />
<RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true" android:elevation="@dimen/uikit_spacing_medium">
<androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" style="@style/AppTheme.Toolbar.Transparent">
<RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
<com.google.android.material.textfield.TextInputEditText android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/emoji_search_input" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:hint="@string/search_emojis" android:layout_toStartOf="@id/emoji_search_clear" />
<ImageView android:id="@id/emoji_search_clear" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:tint="?colorTextMuted" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" />
</RelativeLayout>
</androidx.appcompat.widget.Toolbar>
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:padding="12.0dip" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_toolbar" style="@style/UiKit.ViewGroup.RecyclerView" />
<View android:background="?colorBackgroundTertiary" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
<RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true" android:elevation="@dimen/uikit_spacing_medium">
<ImageView android:id="@id/emoji_picker_search_icon" android:src="?theme_search_menu_icon" android:contentDescription="@string/search" android:layout_alignParentStart="true" style="@style/EmojiPickerButtonIcon" />
<com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
<ImageView android:id="@id/emoji_picker_backspace_icon" android:src="?theme_backspace_icon" android:contentDescription="@string/delete" android:layout_alignParentEnd="true" style="@style/EmojiPickerButtonIcon" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:animateLayoutChanges="true"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.chip.Chip android:textAppearance="@style/UiKit.TextAppearance" android:textColor="@color/white" android:gravity="start" android:layout_gravity="center_horizontal" android:id="@id/chat_overlay_old_messages_chip" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/youre_viewing_older_messages" android:textAlignment="textStart" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" app:chipBackgroundColor="@color/status_grey_500" app:chipIcon="@drawable/ic_message_white_18dp" app:chipIconEnabled="true" app:chipIconSize="18.0dip" app:chipIconVisible="true" app:closeIcon="@drawable/ic_arrow_drop_down_white_18dp" app:closeIconEnabled="true" app:closeIconEndPadding="@dimen/uikit_spacing_medium" app:closeIconSize="18.0dip" app:closeIconTint="@color/white" app:closeIconVisible="true" app:ensureMinTouchTargetSize="false" app:iconStartPadding="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toTopOf="@id/chat_overlay_typing" style="@style/Widget.MaterialComponents.Chip.Action" />
<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="@dimen/uikit_spacing_medium" android:src="@drawable/ic_arrow_down" android:tint="?colorInteractiveNormal" android:backgroundTint="?colorBackgroundTertiary" app:borderWidth="0.0dip" app:fabSize="mini" app:layout_constraintBottom_toTopOf="@id/chat_overlay_typing" app:layout_constraintRight_toRightOf="parent" />
<RelativeLayout android:gravity="center_vertical" android:id="@id/chat_overlay_typing" android:background="?chat_typing_bg" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_typing_indicator_height" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:elevation="8.0dip" app:layout_constraintBottom_toBottomOf="parent" style="@style/UiKit.ViewGroup">
<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_alignParentStart="true" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="end|center" 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" />

View file

@ -1,18 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout style="@style/UiKit.ViewGroup.Page"
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<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.tabs.TabLayout android:id="@id/action_bar_tabs" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabGravity="fill" app:tabIndicatorColor="?tabSelectedTextColor" app:tabIndicatorHeight="0.0dip" app:tabMaxWidth="0.0dip" app:tabMode="fixed" app:tabSelectedTextColor="?tabSelectedTextColor" app:tabTextAppearance="@style/App.TabLayout.FriendsAdd.Text" app:tabTextColor="?tabTextColor">
<com.google.android.material.tabs.TabItem android:id="@id/tab_item_username" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/username" />
<com.google.android.material.tabs.TabItem android:id="@id/tab_item_nearby" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/nearby_scan" />
</com.google.android.material.tabs.TabLayout>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout android:id="@id/friends_add_container" android:layout_below="@id/action_bar_toolbar_layout" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/add_friend_add_manually" style="@style/UiKit.Settings.Item.Header" />
<TextView android:textColor="?primary_400" android:text="@string/add_friend_no_capitalization" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<LinearLayout android:id="@id/friends_add_header" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<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>
<com.google.android.material.button.MaterialButton 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="12.0dip" android:text="@string/send" android:maxLines="1" android:layout_weight="1.0" style="@style/UiKit.Material.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.app.AppViewFlipper android:id="@id/friends_add_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/action_bar_toolbar_layout">
<fragment android:id="@id/friends_add_by_id" android:layout_width="fill_parent" android:layout_height="fill_parent" class="com.discord.widgets.friends.WidgetFriendsAddById" />
<fragment android:id="@id/friends_add_nearby" android:layout_width="fill_parent" android:layout_height="fill_parent" class="com.discord.widgets.friends.WidgetFriendsFindNearby" />
</com.discord.app.AppViewFlipper>
</RelativeLayout>

View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView android:scrollbars="none" style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center" android:id="@id/friends_add_container" android:background="?colorBackgroundPrimary" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" 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:contentDescription="@string/sample_empty_string" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_by_id_title" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/add_by_id_body" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout">
<com.google.android.material.textfield.TextInputLayout android:id="@id/friends_add_text_edit_wrap" android:layout_marginBottom="@dimen/uikit_spacing_small" android:hint="@string/username" style="@style/UiKit.Material.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText android:id="@id/friends_add_text_edit" android:singleLine="true" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<com.google.android.material.button.MaterialButton android:enabled="false" android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:id="@id/friends_add_send" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/add_friend_add_manually" android:maxLines="1" style="@style/UiKit.Material.Button.Fit" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -1,22 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout">
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<TextView android:layout_gravity="start|center" android:text="@string/add_friend_nearby" style="@style/UiKit.Settings.Item.Header" />
<TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="end|center" android:id="@id/nearby_friends_learn_more" android:text="@string/learn_more" android:layout_marginEnd="@dimen/uikit_spacing_large" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Link" />
</FrameLayout>
<com.discord.app.AppViewFlipper android:id="@id/nearby_friends_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
<TextView android:gravity="center" android:layout_gravity="center" android:id="@id/nearby_friends_error" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_enable_settings_android" android:drawableTop="?img_addfriends_notconnected" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="220.0dip" android:layout_height="220.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
<TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:padding="@dimen/uikit_spacing_small" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
</com.discord.app.AppViewFlipper>
<com.discord.app.AppViewFlipper android:id="@id/nearby_friends_button_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@id/nearby_friends_enable" android:layout_width="fill_parent" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/UiKit.Material.Button" />
<com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@id/nearby_friends_disable" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_disable_scanning" android:textAllCaps="true" style="@style/UiKit.Material.Button.Outline" />
</com.discord.app.AppViewFlipper>
<LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="220.0dip" android:layout_height="220.0dip" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/nearby_friends_searching_title" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_title" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/nearby_friends_searching_body" android:layout_marginTop="@dimen/uikit_spacing_medium" 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:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/learn_more" app:fontFamily="@font/whitney_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="@dimen/uikit_spacing_xxlarge" android:backgroundTint="?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_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/UiKit.Material.Button" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/nuf_voice_channels_description" app:stv_title="@string/nuf_voice_channels_title" />
<ImageView android:layout_width="280.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_voice_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit.ImageView" />
<com.google.android.material.button.MaterialButton android:id="@id/guild_call_onboarding_connect" android:text="@string/connect_to_voice" style="@style/UiKit.AuthButton.Material" />
</LinearLayout>
</LinearLayout>

View file

@ -6,7 +6,7 @@
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_profile_sheet_constraint_layout" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_banner" android:layout_width="0.0dip" android:layout_height="wrap_content" app:actualImageScaleType="centerCrop" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" 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="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" app:contentPadding="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="@id/guild_profile_sheet_banner" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_banner">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" app:roundedCornerRadius="16.0dip" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" app:roundWithOverlayColor="?colorBackgroundTertiary" app:roundedCornerRadius="16.0dip" />
<TextView android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_profile_sheet_icon_name" android:padding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Large.SingleLine" />
</androidx.cardview.widget.CardView>
<LinearLayout android:id="@id/guild_profile_sheet_content_container" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_icon_card" style="@style/UiKit.ViewGroup.LinearLayout">

View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView android:gravity="center_horizontal" android:id="@id/guild_welcome_channel" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="@dimen/uikit_spacing_medium" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_details" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_icon" android:layout_width="wrap_content" android:layout_height="fill_parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_welcome_channel_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent">
<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="@dimen/uikit_spacing_small" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
<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="fitCenter" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text" app:roundedCornerRadius="@dimen/uikit_spacing_small" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_text" android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guild_welcome_channel_icon" app:layout_constraintTop_toTopOf="parent">
<TextView android:id="@id/guild_welcome_channel_description" android:layout_marginTop="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/guild_welcome_channel_name" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Bold" />
<ImageView android:id="@id/guild_welcome_channel_hash" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginTop="2.0dip" android:src="@drawable/ic_channel_text" android:contentDescription="@string/sample_empty_string" android:layout_marginEnd="2.0dip" 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="?colorHeaderSecondary" android:id="@id/guild_welcome_channel_name" android:layout_width="wrap_content" android:layout_marginStart="2.0dip" 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>

View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.discord.app.AppViewFlipper android:id="@id/guild_welcome_sheet_flipper" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content">
<ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
<LinearLayout android:background="?colorBackgroundPrimary" android:paddingBottom="@dimen/uikit_spacing_large" 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="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" 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="16.0dip" />
<TextView android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_welcome_sheet_icon_name" android:padding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Large.SingleLine" />
</androidx.cardview.widget.CardView>
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:gravity="center_horizontal" android:id="@id/guild_welcome_sheet_name" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/guild_welcome_sheet_description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/welcome_screen_choice_header" android:textAllCaps="true" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Bold" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_welcome_sheet_channels" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</LinearLayout>
</LinearLayout>
</com.discord.app.AppViewFlipper>
</androidx.core.widget.NestedScrollView>

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout style="@style/UiKit.ViewGroup.Page"
<FrameLayout android:id="@id/widget_home_overlapping_panels_container" style="@style/UiKit.ViewGroup.Page"
xmlns:android="http://schemas.android.com/apk/res/android">
<include layout="@layout/widget_main_panel_loading" />
<com.discord.widgets.main.OverlappingPanelsLayout android:id="@id/widget_home_overlapping_panels_container" style="@style/UiKit.ViewGroup.Page">
<com.discord.widgets.main.OverlappingPanelsLayout android:id="@id/widget_home_overlapping_panels_panels_layout" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="fill_parent">
<include android:id="@id/main_panel_left" layout="@layout/widget_main_panel_left" />
<include layout="@layout/widget_main_panel_center" />
<include layout="@layout/widget_main_panel_right" />

View file

@ -1,15 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:background="?colorBackgroundTertiary" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:id="@id/mute_settings_sheet_title" style="@style/MuteSettings.Row.Title" />
<TextView android:id="@id/mute_settings_sheet_subtitle" style="@style/MuteSettings.Row.Subtitle" />
</LinearLayout>
<TextView android:id="@id/mute_settings_sheet_option_fifteen_minutes" android:text="@string/mute_duration_15_minutes" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_one_hour" android:text="@string/mute_duration_1_hour" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_eight_hours" android:text="@string/mute_duration_8_hours" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_twenty_four_hours" android:text="@string/mute_duration_24_hours" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_always" android:text="@string/mute_duration_always" style="@style/UiKit.ListItem" />
<LinearLayout android:gravity="center" android:id="@id/mute_settings_sheet_unmute_button" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:visibility="gone" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="?ic_sidebar_notifications_off_24dp" />
<LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:id="@id/mute_settings_sheet_unmute_button_label" android:text="@string/unmute_channel" style="@style/UiKit.TextView.SingleLine" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/mute_settings_sheet_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/UiKit.ViewGroup.LinearLayout">
<TextView android:id="@id/mute_settings_sheet_option_fifteen_minutes" android:text="@string/mute_duration_15_minutes" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_one_hour" android:text="@string/mute_duration_1_hour" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_eight_hours" android:text="@string/mute_duration_8_hours" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_twenty_four_hours" android:text="@string/mute_duration_24_hours" style="@style/UiKit.ListItem" />
<TextView android:id="@id/mute_settings_sheet_option_always" android:text="@string/mute_duration_always" style="@style/UiKit.ListItem" />
</LinearLayout>
<FrameLayout android:id="@id/mute_settings_sheet_notification_settings_button_container" android:layout_width="fill_parent" android:layout_height="wrap_content">
<View android:background="?colorBackgroundModifierAccent" android:layout_width="fill_parent" android:layout_height="1.0dip" />
<LinearLayout android:id="@id/mute_settings_sheet_notification_settings_button" android:background="@drawable/bg_pressed_highlight_darken" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<TextView android:id="@id/mute_settings_sheet_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="0.0dip" android:layout_height="1.0dip" android:layout_weight="1.0" />
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveMuted" android:id="@id/mute_settings_sheet_notification_settings_overrides_label" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableEnd="@drawable/ic_arrow_right_24dp" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:drawableTint="?colorInteractiveMuted" style="@style/UiKit.TextView.SingleLine" />
</LinearLayout>
</FrameLayout>
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/mute_settings_sheet_channel_muted_details" android:paddingBottom="@dimen/uikit_spacing_large" android:text="@string/form_description_mobile_notification_muted" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_search_suggestion_header_text_color" android:id="@id/suggestion_example_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="48.0dip" android:textAllCaps="true"
<RelativeLayout android:id="@id/suggestion_example_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="48.0dip"
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_centerVertical="true" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="17.0dip" />
<TextView android:textColor="?theme_search_suggestion_text_color_primary" android:id="@id/suggestion_example_filter" android:layout_centerVertical="true" android:layout_marginStart="72.0dip" style="@style/UiKit.TextView.Semibold" />

View file

@ -24,6 +24,7 @@
<TextView 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="switchview" 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="switchview" 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="switchview" 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="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Outline" />
<TextView android:layout_gravity="center_horizontal" android:id="@id/settings_privacy_request_data_link" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />