Changes of com.discord v1036
This commit is contained in:
parent
6af0b89813
commit
5ade252ac3
1147 changed files with 42563 additions and 33154 deletions
12
com.discord/res/layout/layout_switch_plan_interval.xml
Normal file
12
com.discord/res/layout/layout_switch_plan_interval.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ImageView android:id="@id/premium_switch_interval_logo" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="24.0sp" android:textColor="?colorInteractiveActive" android:id="@id/premium_switch_interval_header" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Bold" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:gravity="center" android:id="@id/premium_switch_interval_info" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/billing_switch_plan_choose_one" style="@style/UiKit.Settings.Item.Header" />
|
||||
<RadioGroup android:id="@id/premium_switch_interval_radio_group" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="?colorBackgroundModifierAccent" android:showDividers="middle">
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton android:gravity="start|center" android:id="@id/premium_switch_interval_radio_year" android:background="@color/transparent" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layoutDirection="rtl" style="@style/UiKit.RadioButton" />
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton android:gravity="start|center" android:id="@id/premium_switch_interval_radio_month" android:background="@color/transparent" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layoutDirection="rtl" style="@style/UiKit.RadioButton" />
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
16
com.discord/res/layout/layout_switch_plan_tier_page.xml
Normal file
16
com.discord/res/layout/layout_switch_plan_tier_page.xml
Normal file
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardCornerRadius="8.0dip" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<LinearLayout android:id="@id/premium_switch_page_background" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="68.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_logo_discord" android:scaleType="centerCrop" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:layout_gravity="center_horizontal" android:id="@id/premium_switch_page_logo" android:layout_width="fill_parent" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:adjustViewBounds="true" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center|top" android:layout_gravity="center_horizontal" android:id="@id/premium_switch_page_info" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lines="2" style="@style/UiKit.TextView" />
|
||||
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<ImageView android:layout_gravity="bottom|center|right" android:id="@id/premium_switch_page_wumpus" android:layout_width="fill_parent" android:layout_height="wrap_content" android:src="@drawable/img_nitro_card" android:scaleType="fitEnd" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:layout_gravity="bottom|center|left" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginBottom="52.0sp" android:text="@string/starting_at" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="@color/white" android:layout_gravity="bottom|center|left" android:id="@id/premium_switch_page_monthly_price" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
</FrameLayout>
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:id="@id/view_premium_marketing_marketing_container" android:background="@drawable/drawable_bg_nitro_gradient_corners" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
<LinearLayout android:id="@id/view_premium_marketing_marketing_container" android:background="@drawable/drawable_bg_premium_guild_gradient_corners" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<TextView android:textSize="20.0sp" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_marketing_marketing_title" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_heading_secondary" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Bold" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_marketing_marketing_subtitle" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_heading_secondary" style="@style/UiKit.TextView.Semibold" />
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:background="@drawable/drawable_bg_boost_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
|
||||
<ImageView android:background="@drawable/drawable_bg_nitro_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_gifting_nitro_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
|
||||
<com.discord.views.BoxedButton android:gravity="center" android:id="@id/settings_gifting_nitro_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" app:background_color="@color/status_green_500" app:boxed_text="-16%" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/settings_gifting_nitro_monthly" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Secondary" />
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
|
||||
<RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/checkboxes_container" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/setting_label" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<TextView android:id="@id/setting_label" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large" />
|
||||
<TextView android:id="@id/setting_subtext" android:layout_marginTop="5.0dip" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@id/checkboxes_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
|
|
|
@ -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">
|
||||
<TextView android:id="@id/toolbar_title" android:layout_width="wrap_content" android:drawablePadding="@dimen/uikit_spacing_small" 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.Toolbar.TextAppearance.Title" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/toolbar_title" android:layout_width="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.Toolbar.TextAppearance.Title" />
|
||||
<TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" 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.Toolbar.TextAppearance.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>
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat.Transparent">
|
||||
<androidx.appcompat.widget.Toolbar style="@style/UiKit.AuthToolbar" />
|
||||
<androidx.appcompat.widget.Toolbar app:navigationIcon="@drawable/ic_arrow_back_white_24dp" style="@style/UiKit.AuthToolbar" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="32.0dip" android:layout_margin="12.0dip" android:src="@drawable/img_auth_logo_small" android:scaleType="fitCenter" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
</merge>
|
|
@ -18,8 +18,8 @@
|
|||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_password" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.Password" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:id="@id/auth_login_password_manager_link" android:padding="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_password_manager_link" android:padding="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
|
|
@ -4,12 +4,9 @@
|
|||
<LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout">
|
||||
<FrameLayout android:background="?bg_announcements_follow_sheet" android:layout_width="fill_parent" android:layout_height="96.0dip">
|
||||
<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_height="32.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_guild_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" app:roundedCornerRadius="4.0dip" />
|
||||
<androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="fill_parent" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip">
|
||||
<LinearLayout android:gravity="center_vertical" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<ImageView android:layout_width="20.0dip" android:layout_height="20.0dip" android:src="?ic_guild_channel_header" android:importantForAccessibility="no" />
|
||||
<TextView android:gravity="center_vertical" android:id="@id/channel_follow_channel_name" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
</LinearLayout>
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_guild_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:roundedCornerRadius="4.0dip" />
|
||||
<androidx.cardview.widget.CardView android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip">
|
||||
<androidx.appcompat.widget.AppCompatTextView android:gravity="center_vertical" android:id="@id/channel_follow_channel_name" android:layout_width="fill_parent" android:layout_height="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:drawableStartCompat="@drawable/ic_channel_text" app:drawableTint="?colorTextMuted" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
<com.discord.views.TernaryCheckBox android:id="@id/channel_permission_text_embed_links" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/embed_links" />
|
||||
<com.discord.views.TernaryCheckBox android:id="@id/channel_permission_text_attach_files" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/attach_files" />
|
||||
<com.discord.views.TernaryCheckBox android:id="@id/channel_permission_text_read_message_history" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/read_message_history" />
|
||||
<com.discord.views.TernaryCheckBox android:id="@id/channel_permission_text_mention_everyone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/mention_everyone" app:tcs_subtext="@string/mention_everyone_description" />
|
||||
<com.discord.views.TernaryCheckBox android:id="@id/channel_permission_text_mention_everyone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/mention_everyone" app:tcs_subtext="@string/mention_everyone_channel_description" />
|
||||
<com.discord.views.TernaryCheckBox android:id="@id/channel_permission_text_use_external_emojis" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/use_external_emojis" app:tcs_subtext="@string/use_external_emojis_description" />
|
||||
<com.discord.views.TernaryCheckBox android:id="@id/channel_permission_text_add_reactions" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/add_reactions" app:tcs_subtext="@string/add_reactions_description" />
|
||||
</LinearLayout>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView android:text="@string/form_label_role_settings" style="@style/UiKit.Settings.Item.Header" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/role_settings_hoist_checkedsetting" app:cs_text="@string/form_label_hoist_description" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/role_settings_mentionable_checkedsetting" app:cs_text="@string/form_label_mentionable" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/role_settings_mentionable_checkedsetting" app:cs_subtext="@string/form_label_mentionable_description" app:cs_text="@string/form_label_mentionable" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView android:text="@string/general_permissions" style="@style/UiKit.Settings.Item.Header" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/role_settings_administrator" app:cs_subtext="@string/administrator_description" app:cs_text="@string/administrator" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
|
|
|
@ -2,9 +2,10 @@
|
|||
<com.discord.app.AppViewFlipper android:id="@id/friends_list_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<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 android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large">
|
||||
<ImageView android:id="@id/friends_list_item_empty_no_friends" android:layout_width="320.0dip" android:layout_height="wrap_content" android:src="?theme_friends_no_friends" android:scaleType="fitCenter" android:adjustViewBounds="true" android:contentDescription="@string/sample_empty_string" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:gravity="center" android:layout_width="320.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/friends_empty_state_all" style="@style/UiKit.TextView.Semibold" />
|
||||
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@id/friends_list_item_empty_invite" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/tip_instant_invite_title3" android:singleLine="true" style="@style/UiKit.Material.Button" />
|
||||
<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.app.AppViewFlipper>
|
|
@ -1,22 +0,0 @@
|
|||
<?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">
|
||||
<com.google.android.material.card.MaterialCardView android:id="@id/guild_actions_add_create" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/brand_500" app:cardCornerRadius="8.0dip" app:cardElevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:textColor="@color/white" android:text="@string/create_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/guild_actions_add_create_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:src="@drawable/ic_navigate_next_white_a60_24dp" android:tint="@color/primary_100" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
<com.google.android.material.card.MaterialCardView android:id="@id/guild_actions_add_join" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/status_green_500" app:cardCornerRadius="8.0dip" app:cardElevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:textColor="@color/primary_000" android:text="@string/join_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="@color/white" android:ellipsize="end" android:id="@id/guild_actions_add_join_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:src="@drawable/ic_navigate_next_white_a60_24dp" android:tint="@color/primary_100" android:contentDescription="@string/coming_soon" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
</LinearLayout>
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:orientation="vertical" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_weight="1.0" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip">
|
||||
<LinearLayout android:id="@id/guild_actions_add_edu" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/drawable_nitro_server_boost" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/create_or_join_edu_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<com.discord.app.AppTextView android:text="@string/create_or_join_edu_details" app:tv_markdown_enabled="true" style="@style/UiKit.TextView.Large" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
<com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView.H1" android:id="@id/guild_actions_add_create" android:padding="@dimen/uikit_spacing_large" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta" android:drawableEnd="@drawable/ic_navigate_next_white_a60_24dp" android:textAlignment="textStart" app:drawableTint="@color/white" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView.H1" android:id="@id/guild_actions_add_join" android:padding="@dimen/uikit_spacing_large" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta" android:drawableEnd="@drawable/ic_navigate_next_white_a60_24dp" android:textAlignment="textStart" app:drawableTint="@color/white" style="@style/UiKit.Material.Button.Green" />
|
||||
</LinearLayout>
|
|
@ -16,6 +16,7 @@
|
|||
</LinearLayout>
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/server_notifications_everyone_switch" app:cs_text="@string/form_label_suppress_everyone" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/server_notifications_roles_switch" app:cs_text="@string/form_label_suppress_roles" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/server_notifications_push_switch" app:cs_text="@string/form_label_mobile_push_notifications" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView android:text="@string/notification_overrides" style="@style/UiKit.Settings.Item.Header" />
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<androidx.cardview.widget.CardView android:id="@id/premium_settings_renew_mutation_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip">
|
||||
<TextView android:id="@id/premium_settings_renew_mutation_tv" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="?ic_info_a60" style="@style/UiKit.TextView" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/drawable_bg_boost_gradient" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/drawable_bg_nitro_gradient" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
|
||||
<com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
|
||||
<com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_guild_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_payment_premium_description" style="@style/UiKit.TextView" />
|
||||
|
|
19
com.discord/res/layout/widget_settings_premium_switch.xml
Normal file
19
com.discord/res/layout/widget_settings_premium_switch.xml
Normal file
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.discord.app.AppViewFlipper android:id="@id/premium_switch_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/premium_switch_select_btn">
|
||||
<ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
|
||||
<LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<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/premium_switch_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
|
||||
</LinearLayout>
|
||||
<RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<TextView android:id="@id/premium_switch_pager_header" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:text="@string/billing_step_select_a_plan" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<androidx.viewpager.widget.ViewPager android:id="@id/premium_switch_pager" android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingRight="@dimen/uikit_spacing_xxlarge" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_above="@id/premium_switch_pager_tabs" android:layout_below="@id/premium_switch_pager_header" />
|
||||
<com.google.android.material.tabs.TabLayout android:id="@id/premium_switch_pager_tabs" android:layout_width="fill_parent" android:layout_height="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_alignParentBottom="true" app:tabBackground="@drawable/tab_dot_selector_wide" app:tabGravity="center" app:tabIndicator="@null" />
|
||||
</RelativeLayout>
|
||||
<include layout="@layout/layout_switch_plan_interval" />
|
||||
</com.discord.app.AppViewFlipper>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/premium_switch_select_btn" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_small" android:layout_above="@id/premium_switch_cancel_btn" style="@style/UiKit.Material.Button.Green" />
|
||||
<TextView android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/premium_switch_cancel_btn" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/nevermind" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</RelativeLayout>
|
Loading…
Add table
Add a link
Reference in a new issue