Changes of com.discord v1256
This commit is contained in:
parent
de564f6f1c
commit
44a3074eab
4133 changed files with 118671 additions and 88687 deletions
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout style="@style/EmojiCategoryItem"
|
||||
<FrameLayout style="@style/ExpressionPickerCategoryItem"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.discord.widgets.chat.input.emoji.GuildAvatar android:layout_gravity="center" android:id="@id/emoji_category_item_guild_avatar" android:layout_width="24.0dip" android:layout_height="24.0dip" android:scaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" app:roundAsCircle="true" />
|
||||
<include layout="@layout/emoji_category_selection_overline_view" />
|
||||
<com.discord.widgets.chat.input.emoji.GuildAvatar android:layout_gravity="center" android:id="@id/emoji_category_item_guild_avatar" android:layout_width="24.0dip" android:layout_height="24.0dip" android:scaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:roundAsCircle="true" />
|
||||
<include layout="@layout/expression_picker_category_selection_overline_view" />
|
||||
</FrameLayout>
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout style="@style/EmojiCategoryItem"
|
||||
<FrameLayout style="@style/ExpressionPickerCategoryItem"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:layout_gravity="center" android:id="@id/emoji_category_item_standard_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_search" app:tint="?colorInteractiveActive" />
|
||||
<include layout="@layout/emoji_category_selection_overline_view" />
|
||||
<include layout="@layout/expression_picker_category_selection_overline_view" />
|
||||
</FrameLayout>
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<View android:layout_gravity="top" android:id="@id/emoji_category_selection_overline" android:background="@color/brand" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="3.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,3 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/emoji_item_draweeview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="@dimen/chat_input_emoji_size" android:layout_height="@dimen/chat_input_emoji_size" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" app:placeholderImageScaleType="fitCenter"
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/emoji_item_draweeview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="@dimen/chat_input_emoji_size" android:layout_height="@dimen/chat_input_emoji_size" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:placeholderImageScaleType="fitCenter"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
|
|
@ -0,0 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<View android:layout_gravity="top" android:id="@id/expression_picker_category_selection_overline" android:background="@color/brand" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="3.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
6
com.discord/res/layout/sticker_category_item_pack.xml
Normal file
6
com.discord/res/layout/sticker_category_item_pack.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout style="@style/ExpressionPickerCategoryItem"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.discord.widgets.chat.input.sticker.StickerPackAvatar android:layout_gravity="center" android:id="@id/sticker_category_item_pack_avatar" android:layout_width="24.0dip" android:layout_height="24.0dip" android:scaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:roundAsCircle="true" />
|
||||
<include layout="@layout/expression_picker_category_selection_overline_view" />
|
||||
</FrameLayout>
|
6
com.discord/res/layout/sticker_category_item_recent.xml
Normal file
6
com.discord/res/layout/sticker_category_item_recent.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout style="@style/ExpressionPickerCategoryItem"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ImageView android:layout_gravity="center" android:id="@id/sticker_category_item_recent" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_recent_24dp" android:scaleType="fitCenter" />
|
||||
<include layout="@layout/expression_picker_category_selection_overline_view" />
|
||||
</FrameLayout>
|
6
com.discord/res/layout/sticker_picker_apng_item.xml
Normal file
6
com.discord/res/layout/sticker_picker_apng_item.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout android:layout_width="@dimen/chat_input_sticker_size" android:layout_height="@dimen/chat_input_sticker_size"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ImageView android:id="@id/sticker_item_imageview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:importantForAccessibility="no" />
|
||||
<ProgressBar android:layout_gravity="center" android:id="@id/sticker_item_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
|
||||
</FrameLayout>
|
6
com.discord/res/layout/sticker_picker_lottie_item.xml
Normal file
6
com.discord/res/layout/sticker_picker_lottie_item.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout android:layout_width="@dimen/chat_input_sticker_size" android:layout_height="@dimen/chat_input_sticker_size"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.discord.rlottie.RLottieImageView android:id="@id/sticker_item_imageview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:placeholderImageScaleType="fitCenter" />
|
||||
<ProgressBar android:layout_gravity="center" android:id="@id/sticker_item_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
|
||||
</FrameLayout>
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout 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:paddingLeft="12.0dip" android:paddingTop="16.0dip" android:paddingRight="12.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.discord.views.LoadingButton android:id="@id/sticker_store_buy_button_premium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1.0" android:layout_marginEnd="8.0dip" app:lb_background_color="@color/status_green" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white" />
|
||||
<com.discord.views.LoadingButton android:id="@id/sticker_store_buy_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1.0" app:lb_background_color="?colorButtonSecondary" app:lb_progress_color="@color/white" />
|
||||
</LinearLayout>
|
||||
<View android:id="@id/sticker_store_buy_button_divider" style="@style/UiKit.Divider" />
|
||||
</LinearLayout>
|
11
com.discord/res/layout/sticker_store_header_item.xml
Normal file
11
com.discord/res/layout/sticker_store_header_item.xml
Normal file
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:paddingLeft="12.0dip" android:paddingTop="8.0dip" android:paddingRight="12.0dip" android:paddingBottom="12.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/sticker_store_header_item_title" android:layout_marginRight="8.0dip" style="@style/UiKit.TextView" />
|
||||
<FrameLayout android:layout_gravity="center_vertical" android:id="@id/sticker_store_header_item_animated" android:background="?primary_200_circle" android:layout_width="16.0dip" android:layout_height="16.0dip" android:translationY="1.0sp" android:backgroundTint="?colorBackgroundModifierAccent">
|
||||
<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/ic_play_arrow_24dp" app:tint="?primary_300" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/sticker_store_header_item_subtitle" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
|
@ -5,7 +5,7 @@
|
|||
<LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
|
||||
<ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_age_gate_birthday" android:contentDescription="@string/age_gate_header" />
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="24.0dip" app:stv_title="@string/age_gate_header" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_birthday_wrap" android:layout_marginBottom="8.0dip" android:hint="@string/age_gate_date_of_birth" style="@style/UiKit.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_birthday" android:layout_marginBottom="8.0dip" 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="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup">
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ProgressBar android:layout_gravity="center" android:id="@id/chat_list_adapter_item_sticker_lottie_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
|
||||
<ProgressBar android:layout_gravity="center" android:id="@id/chat_list_adapter_item_sticker_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
|
||||
<com.discord.rlottie.RLottieImageView android:id="@id/chat_list_adapter_item_sticker_lottie" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
</FrameLayout>
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_sticker_png" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
<ProgressBar android:layout_gravity="center" android:id="@id/chat_list_adapter_item_sticker_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
|
||||
<ImageView android:id="@id/chat_list_adapter_item_sticker_png" android:layout_width="fill_parent" android:layout_height="fill_parent" android:importantForAccessibility="no" />
|
||||
</FrameLayout>
|
|
@ -4,7 +4,7 @@
|
|||
<androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" 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="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" 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="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
|
||||
<TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" android:importantForAccessibility="no" 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.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" 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.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" 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_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1.0dip" android:text="TAG" android:singleLine="true" android:layout_marginStart="6.0dip" 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="?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="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_tag" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
@ -11,14 +11,14 @@
|
|||
</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/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" 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="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawablePadding="16.0dip" app:drawableTopCompat="?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="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_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="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
|
||||
<View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?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="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/emoji_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
|
||||
<androidx.constraintlayout.widget.Barrier android:id="@id/emoji_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" 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="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
|
||||
<ImageView android:id="@id/emoji_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
|
||||
<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="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
|
||||
<ImageView android:id="@id/emoji_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -7,10 +7,13 @@
|
|||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:id="@id/expression_tray_segmented_control" android:background="@drawable/drawable_bg_corners_4dp" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<androidx.cardview.widget.CardView android:id="@id/expression_tray_emoji_card" android:contentDescription="@string/expression_picker_open_emoji_picker_a11y_label" style="@style/ExpressionTrayTabCard">
|
||||
<TextView android:id="@id/expression_tray_emoji_button" android:text="@string/emoji" style="@style/ExpressionTrayTab" />
|
||||
<TextView android:id="@id/expression_tray_emoji_button" android:text="@string/expression_picker_emoji" style="@style/ExpressionTrayTab" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
<androidx.cardview.widget.CardView android:id="@id/expression_tray_gif_card" android:contentDescription="@string/expression_picker_open_gif_picker_a11y_label" style="@style/ExpressionTrayTabCard">
|
||||
<TextView android:id="@id/expression_tray_gif_button" android:text="@string/gif" style="@style/ExpressionTrayTab" />
|
||||
<TextView android:id="@id/expression_tray_gif_button" android:text="@string/expression_picker_gif" style="@style/ExpressionTrayTab" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
<androidx.cardview.widget.CardView android:id="@id/expression_tray_sticker_card" android:visibility="gone" android:contentDescription="@string/expression_picker_open_sticker_picker_a11y_label" style="@style/ExpressionTrayTabCard">
|
||||
<TextView android:id="@id/expression_tray_sticker_button" android:text="@string/expression_picker_sticker" style="@style/ExpressionTrayTab" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
</LinearLayout>
|
||||
<com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" 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:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
|
||||
|
@ -23,6 +26,7 @@
|
|||
<FrameLayout android:id="@id/expression_tray_content_container" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/expression_tray_toolbar" app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_emoji_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_gif_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_sticker_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
</FrameLayout>
|
||||
</com.discord.utilities.views.ContentResizingCoordinatorLayout>
|
||||
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_detail_page" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
<androidx.recyclerview.widget.RecyclerView android:id="@id/oauth_authorize_permissions_list" android:clipToPadding="false" android:layout_height="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<View android:layout_marginLeft="16.0dip" android:layout_marginTop="24.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" style="@style/UiKit.Divider" />
|
||||
<RelativeLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<ImageView android:id="@id/oauth_authorize_age_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_emoji_recent_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?colorTextMuted" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:id="@id/oauth_authorize_age_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_recent_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?colorTextMuted" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_age_notice" android:padding="0.0dip" android:layout_marginStart="8.0dip" android:layout_toEndOf="@id/oauth_authorize_age_notice_icon" android:layout_alignParentEnd="true" style="@style/UiKit.Auth.Note.Rotatable" />
|
||||
</RelativeLayout>
|
||||
<RelativeLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
|
|
|
@ -8,5 +8,5 @@
|
|||
</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="fill_parent" android:layout_height="fill_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="fill_parent" android:layout_height="fill_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" style="@style/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>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_emojis_container" android:background="?selectableItemBackground" android:padding="8.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
|
||||
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/server_settings_emojis_avatar" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/emoji_size" android:layout_height="@dimen/emoji_size" android:layout_margin="8.0dip" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_avatar" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/emoji_size" android:layout_height="@dimen/emoji_size" android:layout_margin="8.0dip" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" />
|
||||
<TextView android:id="@id/server_settings_emojis_name" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<TextView android:textColor="?primary_100_alpha_60" android:gravity="end" android:id="@id/server_settings_emojis_username" android:layout_width="wrap_content" android:maxWidth="100.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_username_avatar" android:layout_margin="8.0dip" style="@style/Avatar.Medium" />
|
||||
|
|
|
@ -9,7 +9,14 @@
|
|||
<TextView 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="switchview" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_attachments_toggle" app:cs_subtext="@string/inline_attachment_media_help" app:cs_text="@string/inline_attachment_media" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<TextView android:text="@string/emoji" style="@style/UiKit.Settings.Item.Header" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_allow_animate_emoji_switch" app:cs_subtext="@string/animate_emoji_note" app:cs_text="@string/animate_emoji" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<LinearLayout android:id="@id/settings_text_images_stickers_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/stickers_auto_play_heading" style="@style/UiKit.Settings.Item.Header" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_stickers_always_animate" app:cs_text="@string/stickers_always_animate" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_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="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_stickers_never_animate" app:cs_text="@string/stickers_never_animate" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
</LinearLayout>
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView 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="switchview" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
|
|
30
com.discord/res/layout/widget_sticker_picker.xml
Normal file
30
com.discord/res/layout/widget_sticker_picker.xml
Normal file
|
@ -0,0 +1,30 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/sticker_picker_container" 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">
|
||||
<com.google.android.material.appbar.AppBarLayout android:id="@id/sticker_app_bar" android:background="@color/transparent" android:layout_width="fill_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="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
|
||||
<RelativeLayout android:id="@id/sticker_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:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/sticker_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_stickers" style="@style/ExpressionSearchInput" />
|
||||
<ImageView android:id="@id/sticker_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_stickers" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
|
||||
</RelativeLayout>
|
||||
</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/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_sticker_picker_recycler" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" 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="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:id="@id/chat_input_sticker_picker_empty_image" android:layout_width="72.0dip" android:layout_height="72.0dip" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/chat_input_sticker_picker_empty_subtitle" android:layout_marginLeft="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="24.0dip" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</com.discord.app.AppViewFlipper>
|
||||
<View android:layout_gravity="bottom" android:id="@id/sticker_picker_bottom_bar_divider" android:background="?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="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/sticker_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/sticker_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
|
||||
<androidx.constraintlayout.widget.Barrier android:id="@id/sticker_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="sticker_picker_store_icon, sticker_picker_backspace_icon" />
|
||||
<FrameLayout android:id="@id/sticker_picker_store_icon" app:layout_constraintEnd_toStartOf="@id/sticker_picker_backspace_icon" style="@style/ExpressionPickerCategoryItem">
|
||||
<ImageView android:layout_gravity="center" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_sticker_pack_store_32dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_purchase_modal_header" />
|
||||
<include android:id="@id/sticker_picker_store_hightlight" layout="@layout/expression_picker_category_selection_overline_view" />
|
||||
</FrameLayout>
|
||||
<ImageView android:id="@id/sticker_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
3
com.discord/res/layout/widget_sticker_picker_sheet.xml
Normal file
3
com.discord/res/layout/widget_sticker_picker_sheet.xml
Normal file
|
@ -0,0 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.fragment.app.FragmentContainerView android:id="@id/sticker_sheet_sticker_picker_content" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
Loading…
Add table
Add a link
Reference in a new issue