Changes of com.discord v1053
This commit is contained in:
parent
a1dede544c
commit
10499d975a
1127 changed files with 34326 additions and 30670 deletions
8
com.discord/res/layout/empty_friends_state_view.xml
Normal file
8
com.discord/res/layout/empty_friends_state_view.xml
Normal file
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout style="@style/FriendsList.EmptyState"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ImageView android:src="@drawable/img_wumpus_playing_with_friends" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="@dimen/uikit_spacing_xxlarge" android:layout_marginEnd="@dimen/uikit_spacing_xxlarge" style="@style/FriendsList.EmptyState.Image" />
|
||||
<TextView android:id="@id/empty_friends_state_title" android:text="@string/friends_empty_state_all" style="@style/FriendsList.EmptyState.Title" />
|
||||
<TextView android:text="@string/friends_empty_state_subtitle" style="@style/FriendsList.EmptyState.Subtitle" />
|
||||
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@id/empty_friends_state_add_friend" android:text="@string/add_friend" android:singleLine="true" style="@style/UiKit.Material.Button" />
|
||||
</LinearLayout>
|
|
@ -1,6 +1,6 @@
|
|||
<?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">
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<TextView android:id="@id/user_sheet_volume_label" android:text="@string/user_profile_volume" style="@style/UiKit.ListItem" />
|
||||
<LinearLayout android:id="@id/user_sheet_volume_wrap" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<ImageView android:src="?ic_volume_mute" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge style="@style/UiKit.ViewGroup"
|
||||
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">
|
||||
<RelativeLayout android:id="@id/setting_container" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@id/setting_button" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/setting_label" style="@style/UiKit.TextView" />
|
||||
<TextView android:id="@id/setting_subtext" android:layout_marginTop="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" />
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" app:thumbTint="@color/switch_thumb_color" app:useMaterialThemeColors="true" />
|
||||
</RelativeLayout>
|
||||
</merge>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:drawablePadding="@dimen/uikit_spacing_small" app:drawableTint="?colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextAppearance.Toolbar.Title" />
|
||||
<TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.TextAppearance.Toolbar.Subtitle" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="@dimen/uikit_spacing_small" app:drawableTint="?colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextAppearance.Toolbar.Title" />
|
||||
<TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.TextAppearance.Toolbar.Subtitle" />
|
||||
<com.discord.views.StatusView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="12.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:layout_constraintTop_toTopOf="@id/toolbar_title" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -15,7 +15,8 @@
|
|||
<com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextAppearance" android:textColor="?colorTextNormal" android:gravity="center_vertical" android:id="@id/channels_list_search" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" android:drawableEnd="@drawable/ic_search" android:backgroundTint="?colorBackgroundTertiary" />
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
</com.discord.views.CustomAppBarLayout>
|
||||
<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_search" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
|
||||
<com.discord.widgets.friends.EmptyFriendsStateView android:id="@id/widget_channels_list_empty_friends_state_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_below="@id/channels_list_search" app:ef_title_text_size="@dimen/uikit_textsize_large" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_search" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
|
||||
<ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_anchor="@id/channels_list" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:gravity="center" android:layout_gravity="end" android:id="@id/channels_list_premium_guild_hint" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="48.0dip" android:layout_marginRight="28.0dip" android:translationZ="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<View android:id="@id/channels_list_tooltip_top_tail" android:background="@drawable/drawable_tooltip_top_tail" android:layout_width="24.0dip" android:layout_height="20.0dip" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.discord.app.AppViewFlipper android:id="@id/friends_list_flipper" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="fill_parent"
|
||||
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">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/friends_list_recycler_v2" android:background="?colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<LinearLayout style="@style/FriendsList.EmptyState">
|
||||
<ImageView android:id="@id/friends_list_empty_image" android:src="@drawable/img_wumpus_playing_with_friends" android:contentDescription="@string/sample_empty_string" style="@style/FriendsList.EmptyState.Image" />
|
||||
<TextView android:text="@string/friends_empty_state_all" style="@style/FriendsList.EmptyState.Title" />
|
||||
<TextView android:text="@string/friends_empty_state_subtitle" style="@style/FriendsList.EmptyState.Subtitle" />
|
||||
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@id/friends_list_empty_invite_add_friend" android:text="@string/add_friend" android:singleLine="true" style="@style/UiKit.Material.Button" />
|
||||
</LinearLayout>
|
||||
<com.discord.widgets.friends.EmptyFriendsStateView android:id="@id/friends_list_empty_friends_state_view" android:layout_width="fill_parent" android:layout_height="fill_parent" app:ef_title_text_size="@dimen/uikit_textsize_xlarge" />
|
||||
</com.discord.app.AppViewFlipper>
|
|
@ -1,13 +1,13 @@
|
|||
<?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">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_profile_sheet_constraint_layout" android:background="?colorBackgroundTertiary" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<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="?colorBackgroundSecondary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" 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" />
|
||||
<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: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_constraintBottom_toBottomOf="parent" 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">
|
||||
<LinearLayout android:id="@id/guild_profile_sheet_content_container" 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">
|
||||
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<ImageView android:layout_gravity="center" android:id="@id/guild_profile_sheet_guild_verified_premium_icon" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@id/guild_profile_sheet_name" android:maxLines="1" style="@style/UiKit.TextView.H1.Bold" />
|
||||
|
@ -24,5 +24,12 @@
|
|||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<View android:id="@id/guild_profile_sheet_content_container_bottom_divider" android:background="?colorBackgroundModifierAccent" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_content_container" style="@style/UiKit.Divider" />
|
||||
<LinearLayout android:id="@id/guild_profile_sheet_tab_items" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_content_container_bottom_divider" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_boosts" android:drawableTop="@drawable/ic_member_list_boosted_badge_24dp" android:layout_weight="1.0" style="@style/GuildProfileSheet.TabItems.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_guild_notifications_24dp" android:layout_weight="1.0" style="@style/GuildProfileSheet.TabItems.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_settings" android:text="@string/settings" android:drawableTop="@drawable/ic_guild_settings_24dp" android:layout_weight="1.0" style="@style/GuildProfileSheet.TabItems.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_invite" android:text="@string/instant_invite" android:drawableTop="@drawable/ic_guild_invite_24dp" android:layout_weight="1.0" style="@style/GuildProfileSheet.TabItems.Button" />
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
|
@ -5,7 +5,7 @@
|
|||
<TextView android:gravity="center" android:text="@string/qr_code_login_confirm" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="@color/status_red_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_description" android:textAlignment="center" style="@style/UiKit.TextView" />
|
||||
<androidx.cardview.widget.CardView android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip">
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_temporary_switch" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit.ListItem" />
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_temporary_switch" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit.ListItem.Switch" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/remote_auth_login_button" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_login_on_computer" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_cancel_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue