Changes of com.discord v1021
This commit is contained in:
parent
e84f986f3b
commit
d9f15b99ae
157 changed files with 6818 additions and 3189 deletions
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge android:layout_height="wrap_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/button_boxed_button" android:focusable="false" android:clickable="false" android:layout_width="fill_parent" style="@style/UiKit.Material.Button" />
|
||||
<LinearLayout android:gravity="center" android:layout_gravity="center" android:translationZ="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<TextView android:textColor="@color/primary_100" android:id="@id/button_text" android:paddingLeft="@dimen/uikit_spacing_large" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/button_boxed_text" android:background="@drawable/bg_boxed_button_outline" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingTop="@dimen/uikit_spacing_xsmall" android:paddingRight="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_xsmall" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:textAllCaps="true" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/button_boxed_button" android:focusable="false" android:clickable="false" android:layout_width="fill_parent" style="@style/UiKit.Material.Button" />
|
||||
</merge>
|
|
@ -2,7 +2,7 @@
|
|||
<merge style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:src="@drawable/img_boost_hands" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_server_boost_long" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_server_boost_long" android:tint="?colorTextInteractiveActive" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textColor="?colorHeadingPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_header" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeadingPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/UiKit.TextView" />
|
||||
</merge>
|
|
@ -9,7 +9,7 @@
|
|||
<ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xxlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<include layout="@layout/layout_search" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:fitsSystemWindows="false" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<TextView android:id="@id/guild_invite_empty_results" android:visibility="gone" style="@style/UiKit.TextView.NoResults" />
|
||||
</LinearLayout>
|
||||
</com.discord.app.AppViewFlipper>
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<FrameLayout android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
|
||||
<FrameLayout android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guilds_item_avatar" app:fadeDuration="50" style="@style/UiKit.GuildsListIcon" />
|
||||
<TextView android:textColor="@color/white" android:gravity="center" android:id="@id/guilds_item_avatar_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorHeadingPrimary" android:gravity="center" android:id="@id/guilds_item_avatar_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit.TextView" />
|
||||
</FrameLayout>
|
||||
<ImageView android:id="@id/guilds_item_application_stream" android:visibility="gone" android:layout_alignTop="@id/guilds_item_avatar_wrap" android:contentDescription="@string/status_streaming" android:layout_alignEnd="@id/guilds_item_avatar_wrap" style="@style/UiKit.GuildsListApplicationStreamIcon" />
|
||||
<ImageView android:id="@id/guilds_item_voice" android:layout_alignTop="@id/guilds_item_avatar_wrap" android:contentDescription="@string/connection_status_voice_connected" android:layout_alignEnd="@id/guilds_item_avatar_wrap" style="@style/UiKit.GuildsListVoiceIcon" />
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<androidx.core.widget.NestedScrollView android:id="@id/scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:paddingTop="@dimen/uikit_spacing_medium" android:text="@string/message_preview" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/external_share_list" android:background="?container_bg_dark_a60" android:visibility="gone" android:fitsSystemWindows="false" android:clipToPadding="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/external_share_list" android:background="?container_bg_dark_a60" android:visibility="gone" android:clipToPadding="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@id/external_share_activity_action_preview" android:background="?chat_embed_bg" android:visibility="visible" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:animateLayoutChanges="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout" />
|
||||
<EditText android:id="@id/external_share_comment" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:hint="@string/add_a_comment_optional" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<TextView android:text="@string/share_to" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:fillViewport="true" app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||
<androidx.core.widget.NestedScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:fillViewport="true" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:src="@drawable/drawable_boost_removal" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_header" style="@style/UiKit.TextView.H1.Bold" />
|
||||
|
@ -16,6 +16,6 @@
|
|||
<TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_transfer_error" android:visibility="invisible" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/premium_guild_transfer_select" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/premium_guild_subscribe_transfer_confirm_confirmation" style="@style/UiKit.Material.Button" />
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -2,7 +2,7 @@
|
|||
<LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_remote_auth_loaded" android:importantForAccessibility="no" />
|
||||
<TextView android:text="@string/qr_code_login_confirm" style="@style/UiKit.TextView.H1" />
|
||||
<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">
|
||||
<androidx.appcompat.widget.SwitchCompat android:textColor="?colorHeadingPrimary" 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" />
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/boost_status_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
|
||||
</LinearLayout>
|
||||
<androidx.core.widget.NestedScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:fillViewport="true">
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeadingPrimary" android:layout_gravity="center_horizontal" android:id="@id/boost_status_num_boosts" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_boosted_badge_18dp" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_blurb_mobile" style="@style/UiKit.TextView" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/boost_status_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/boost_status_subscribe_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/boost_status_gift_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_gift_premium" app:icon="@drawable/ic_gift_white_16dp" app:iconGravity="textStart" app:iconPadding="@dimen/uikit_spacing_xlarge" style="@style/UiKit.Material.Button.Secondary" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/boost_status_gift_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_gift_premium" app:icon="@drawable/ic_gift_white_16dp" app:iconGravity="textStart" app:iconPadding="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Secondary" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/boost_status_protip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<include android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" layout="@layout/view_boost_progress_bar" />
|
||||
<com.discord.utilities.simple_pager.SimplePager android:id="@id/boost_status_viewpager" android:paddingLeft="48.0dip" android:paddingRight="48.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" />
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
<TextView android:id="@id/server_settings_audit_logs_action_filter" style="@style/UiKit.Search.Chip" />
|
||||
</LinearLayout>
|
||||
<com.discord.app.AppViewFlipper android:id="@id/server_settings_audit_logs_view_results_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/server_settings_audit_logs_recycler" android:fitsSystemWindows="false" android:scrollbars="vertical" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/server_settings_audit_logs_recycler" android:scrollbars="vertical" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/no_logs_title" android:text="@string/guild_settings_label_audit_log_empty_title" style="@style/UiKit.TextView.NoResults" />
|
||||
<TextView android:gravity="center" android:id="@id/no_logs_body" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_label_audit_log_empty_body" style="@style/UiKit.TextView" />
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/applications_and_connections" style="@style/UiKit.Settings.Item.Header" />
|
||||
<TextView android:text="@string/applications_and_connections_body" style="@style/UiKit.Settings.Item.Addition" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/authorized_apps_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:fitsSystemWindows="false" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/authorized_apps_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
Loading…
Add table
Add a link
Reference in a new issue