Changes of com.discord v874

This commit is contained in:
root 2019-04-13 01:07:39 +02:00
parent ea94f6522c
commit 5fb926a851
478 changed files with 7189 additions and 7799 deletions

View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#552f3136" android:endColor="@color/primary_630" android:angle="270.0" />
</shape>

View file

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval"
<inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/purple_brand" />
</shape>
<shape android:shape="oval">
<stroke android:width="2.0dip" android:color="@color/grey_guilds" />
<solid android:color="@color/purple_brand" />
</shape>
</inset>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/status_red_500" />
<stroke android:width="2.5dip" android:color="@color/grey_guilds" />
<corners android:radius="2.5dip" />
<stroke android:width="2.0dip" android:color="@color/grey_guilds" />
<corners android:radius="2.0dip" />
</shape>

View file

@ -1,23 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="@color/primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
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/app_bar_layout" style="@style/AppTheme.AppBarLayout">
<com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="@color/primary_630" app:layout_scrollFlags="exitUntilCollapsed|scroll">
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="@drawable/drawable_bottom_up_primary_630_gradient">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_banner" android:layout_width="fill_parent" android:layout_height="150.0dip" app:actualImageScaleType="centerInside" />
</FrameLayout>
<androidx.appcompat.widget.Toolbar android:background="@null" style="@style/AppTheme.Toolbar">
<TextView android:textSize="15.0sp" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:shadowColor="@color/primary_630" android:shadowDy="4.0" android:shadowRadius="2.0" android:drawableRight="@drawable/icon_more" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="@drawable/icon_more" style="@style/UiKit.TextView.Bold" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<RelativeLayout android:id="@id/channels_list_search" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white_alpha_20" android:gravity="start|center" android:background="@drawable/drawable_overlay_search" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
<ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<RelativeLayout android:background="@color/primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center_vertical" android:id="@id/channels_list_header_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="15.0sp" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/channels_list_header" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:drawableRight="@drawable/icon_more" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="@drawable/icon_more" style="@style/UiKit.TextView.Bold" />
<RelativeLayout android:id="@id/channels_list_search" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white_alpha_20" android:gravity="start|center" android:background="@drawable/drawable_overlay_search" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
</RelativeLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_header_wrap" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
<ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" />
</RelativeLayout>

View file

@ -12,8 +12,8 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<View style="@style/UiKit.Settings.Divider" />
<TextView android:id="@id/dialog_chat_actions_copy" android:text="@string/copy_text" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<TextView android:id="@id/dialog_chat_actions_add_reaction" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
<LinearLayout android:gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<TextView android:background="@color/transparent" android:clickable="false" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
<androidx.recyclerview.widget.RecyclerView android:layout_gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
</LinearLayout>
<TextView android:id="@id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" android:drawableLeft="?ic_reactions" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />

View file

@ -7,7 +7,7 @@
<TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
<TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
<com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
</LinearLayout>

View file

@ -7,7 +7,7 @@
<TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
<TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
<com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
</LinearLayout>

View file

@ -1,23 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="@color/primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
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/app_bar_layout" style="@style/AppTheme.AppBarLayout">
<com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="@color/primary_630" app:layout_scrollFlags="exitUntilCollapsed|scroll">
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="@drawable/drawable_bottom_up_primary_630_gradient">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_banner" android:layout_width="fill_parent" android:layout_height="150.0dip" app:actualImageScaleType="centerInside" />
</FrameLayout>
<androidx.appcompat.widget.Toolbar android:background="@null" style="@style/AppTheme.Toolbar">
<TextView android:textSize="15.0sp" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:shadowColor="@color/primary_630" android:shadowDy="4.0" android:shadowRadius="2.0" android:drawableRight="@drawable/icon_more" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="@drawable/icon_more" style="@style/UiKit.TextView.Bold" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<RelativeLayout android:id="@id/channels_list_search" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white_alpha_20" android:gravity="start|center" android:background="@drawable/drawable_overlay_search" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" style="@style/UiKit.TextView.Semibold" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
<ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<RelativeLayout android:background="@color/primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center_vertical" android:id="@id/channels_list_header_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="15.0sp" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/channels_list_header" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:drawableRight="@drawable/icon_more" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="@drawable/icon_more" style="@style/UiKit.TextView.Bold" />
<RelativeLayout android:id="@id/channels_list_search" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white_alpha_20" android:gravity="start|center" android:background="@drawable/drawable_overlay_search" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" style="@style/UiKit.TextView.Semibold" />
</RelativeLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_header_wrap" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
<ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" />
</RelativeLayout>

View file

@ -12,8 +12,8 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<View style="@style/UiKit.Settings.Divider" />
<TextView android:id="@id/dialog_chat_actions_copy" android:text="@string/copy_text" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<TextView android:id="@id/dialog_chat_actions_add_reaction" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
<LinearLayout android:gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<TextView android:background="@color/transparent" android:clickable="false" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
<androidx.recyclerview.widget.RecyclerView android:layout_gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
</LinearLayout>
<TextView android:id="@id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" android:drawableLeft="?ic_reactions" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />

View file

@ -7,7 +7,7 @@
<TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
<TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
<com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
</LinearLayout>

View file

@ -73,7 +73,6 @@
<item type="id" name="alert_verify_email_change_email" />
<item type="id" name="alert_verify_email_change_password" />
<item type="id" name="alert_verify_email_resend" />
<item type="id" name="app_bar_layout" />
<item type="id" name="application_news_content" />
<item type="id" name="application_news_description" />
<item type="id" name="application_news_error_container" />
@ -297,8 +296,8 @@
<item type="id" name="channels_list_actions_leave_server_confirm" />
<item type="id" name="channels_list_actions_leave_server_header" />
<item type="id" name="channels_list_actions_leave_server_text" />
<item type="id" name="channels_list_banner" />
<item type="id" name="channels_list_header" />
<item type="id" name="channels_list_header_wrap" />
<item type="id" name="channels_list_item_friends_icon" />
<item type="id" name="channels_list_item_friends_mentions" />
<item type="id" name="channels_list_item_header" />
@ -409,7 +408,6 @@
<item type="id" name="client_outdated_anchor_wrap" />
<item type="id" name="client_outdated_update" />
<item type="id" name="close" />
<item type="id" name="collapsing_toolbar" />
<item type="id" name="color_picker_done" />
<item type="id" name="color_picker_gridview" />
<item type="id" name="color_picker_reset" />

File diff suppressed because it is too large Load diff

View file

@ -979,7 +979,7 @@ HERE ARE MORE THINGS {progress}
<string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
<string name="cloud_sync_modal_or">OR</string>
<string name="collapse_category">Collapse Category</string>
<string name="com.crashlytics.android.build_id">39d8066a-d90e-4f50-a701-6e615769938d</string>
<string name="com.crashlytics.android.build_id">ed1abe1c-bb83-4657-8b84-57966c1d3b66</string>
<string name="coming_soon">Coming Soon</string>
<string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
<string name="coming_soon_title">COMING SOON!</string>

View file

@ -3424,6 +3424,7 @@
</style>
<style name="UiKit.GuildsListItem" parent="@style/UiKit.ViewGroup.RelativeLayout">
<item name="android:background">?selectableItemBackgroundBorderless</item>
<item name="android:clipChildren">false</item>
<item name="android:layout_width">@dimen/guild_list_size</item>
<item name="android:layout_height">@dimen/guild_item_size</item>
</style>
@ -3432,6 +3433,7 @@
</style>
<style name="UiKit.GuildsListItemHoriz" parent="@style/UiKit.ViewGroup.RelativeLayout">
<item name="android:background">?selectableItemBackgroundBorderless</item>
<item name="android:clipChildren">false</item>
<item name="android:layout_width">@dimen/guild_item_size</item>
<item name="android:layout_height">@dimen/guild_list_size</item>
</style>
@ -3480,11 +3482,11 @@
</style>
<style name="UiKit.GuildsListVoiceIcon" parent="@style/UiKit.ImageView">
<item name="android:gravity">center</item>
<item name="android:background">?colorPrimaryCircle</item>
<item name="android:padding">@dimen/uikit_spacing_xsmall</item>
<item name="android:layout_width">@dimen/uikit_spacing_large</item>
<item name="android:layout_height">@dimen/uikit_spacing_large</item>
<item name="android:src">?ic_volume</item>
<item name="android:background">@drawable/drawable_circle_purple_brand</item>
<item name="android:padding">2.0dip</item>
<item name="android:layout_width">16.0dip</item>
<item name="android:layout_height">16.0dip</item>
<item name="android:src">@drawable/ic_volume_up_white_24dp</item>
</style>
<style name="UiKit.ImageView" parent="">
<item name="android:layout_width">wrap_content</item>