Changes of com.discord v978

This commit is contained in:
root 2019-10-29 00:46:47 +01:00
parent df68f86f59
commit 8a80fb010e
5172 changed files with 87470 additions and 71576 deletions

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_guild_features_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_guild_feature_emoji" android:drawableLeft="@drawable/ic_emoji_blue_24dp" android:drawableStart="@drawable/ic_emoji_blue_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_guild_feature_audio_quality" android:drawableLeft="@drawable/ic_headset_24dp" android:drawableStart="@drawable/ic_headset_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_guild_feature_upload_size" android:drawableLeft="@drawable/ic_upload_24dp" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
</LinearLayout>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_customize_guild_mobile" android:drawableLeft="@drawable/ic_star_24dp" android:drawableStart="@drawable/ic_star_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_show_support_mobile" android:drawableLeft="@drawable/ic_guild_nitro_24dp" android:drawableStart="@drawable/ic_guild_nitro_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_upload_sizes_mobile" android:drawableLeft="@drawable/ic_upload_24dp" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_new_role_mobile" android:drawableLeft="@drawable/ic_role_24dp" android:drawableStart="@drawable/ic_role_24dp" style="@style/UiKit.TextView.Perk" />
</LinearLayout>

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_user_features_header" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_user_feature_member_badge" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_user_feature_profile_badge" android:drawableLeft="@drawable/ic_booster_profile_badge_24dp" android:drawableStart="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit.TextView.Perk" />
<TextView android:textColor="?primary_000" android:text="@string/premium_guild_user_feature_role" android:drawableLeft="@drawable/ic_role_24dp" android:drawableStart="@drawable/ic_role_24dp" style="@style/UiKit.TextView.Perk" />
</LinearLayout>

View file

@ -6,10 +6,9 @@
<ImageView android:id="@id/premium_settings_nitro_classic_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="@drawable/img_wumpus_riding_wheel" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/premium_settings_nitro_classic" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="?img_logo_discord_nitro_classic" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
</LinearLayout>
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_features_chat_perks" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
<TextView android:textColor="?primary_000" android:id="@id/premium_settings_nitro_classic_boost_discount" android:layout_marginTop="@dimen/uikit_spacing_medium" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
<TextView android:textColor="?primary_000" android:id="@id/premium_settings_nitro_classic_boost_count" android:layout_marginTop="@dimen/uikit_spacing_medium" android:drawableLeft="@drawable/ic_clear_primary_300_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_clear_primary_300_24dp" style="@style/UiKit.TextView" />
<com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_yearly" android:background="@drawable/button_status_green_500" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" />
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_features_enhanced_chat_perks" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_features_premium_guild_subscriptions" android:drawableLeft="@drawable/ic_clear_primary_300_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_clear_primary_300_24dp" style="@style/UiKit.TextView" />
<com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_yearly" android:background="@drawable/button_status_green_500" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" />
<Button android:id="@id/premium_settings_premium_classic_monthly" style="@style/UiKit.Button.Grey" />
<TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_gift" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:focusable="true" android:clickable="true" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
</LinearLayout>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:id="@id/user_status_update_online" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
<LinearLayout android:id="@id/user_status_update_online" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:layout_gravity="top" android:id="@id/user_status_presence_dot" android:layout_width="12.0dip" android:layout_height="12.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="5.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" />
<ImageView android:layout_gravity="top" android:id="@id/user_status_presence_dot" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_margin="@dimen/uikit_spacing_small" />
<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textColor="?primary_100" android:id="@id/user_status_presence_title" style="@style/UiKit.TextView.Large" />
<TextView android:id="@id/user_status_presence_subtitle" android:layout_marginTop="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:gravity="center_vertical" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:focusable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_status_presence_custom_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" android:layout_marginRight="@dimen/uikit_spacing_large" app:placeholderImage="?ic_smiley_desaturated" />
<TextView android:textColor="?primary_100" android:id="@id/user_status_presence_custom_text" android:layout_width="0.0dip" android:singleLine="true" android:layout_weight="1.0" style="@style/UiKit.TextView.Large" />
<androidx.appcompat.widget.AppCompatImageView android:id="@id/user_status_presence_custom_clear" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="?ic_close_24dp" android:tint="?primary_300" android:contentDescription="@string/custom_status_clear_custom_status" style="@style/UiKit.ImageView.Clickable" />
</LinearLayout>

View file

@ -20,6 +20,7 @@
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<TextView android:id="@id/boost_confirmation_warning" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscribe_confirm_cooldown_warning" style="@style/UiKit.TextView" />
</LinearLayout>
</ScrollView>
<LinearLayout android:id="@id/boost_confirmation_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">

View file

@ -10,24 +10,31 @@
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<Button android:id="@id/settings_boost_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Button.Grey" />
</LinearLayout>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xlarge" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/premium_guild_subscription_subtitle_mobile_1" style="@style/UiKit.TextView" />
<TextView android:id="@id/settings_boost_subtext" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/settings_boost_recycler" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.RecyclerView" />
</LinearLayout>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<ImageView android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/img_server_boost" style="@style/UiKit.ImageView" />
<ImageView android:src="@drawable/img_boost_hands" style="@style/UiKit.ImageView" />
</LinearLayout>
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:text="@string/premium_guild_subscription_marketing_header" style="@style/UiKit.TextView.H1" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:id="@id/settings_boost_marketing_info" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/UiKit.TextView" />
<include layout="@layout/view_boost_user_settings_user_perks" />
<include layout="@layout/view_boost_user_settings_guild_perks" />
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_header_mobile" style="@style/UiKit.TextView.H1" />
<TextView android:textColor="?primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_marketing_guilds_empty_blurb_mobile" style="@style/UiKit.TextView" />
<ScrollView style="@style/UiKit.ViewGroup.ScrollView">
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip">
<com.discord.utilities.view.text.LinkifiedTextView android:textColor="?primary_000" android:id="@id/settings_boost_no_sub_banner" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView" />
</androidx.cardview.widget.CardView>
<FrameLayout style="@style/UiKit.ViewGroup">
<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:id="@id/settings_boost_no_sub_logo" 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" />
<TextView android:id="@id/settings_boost_no_sub_learn_more_text" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<Button android:id="@id/settings_boost_no_sub_learn_more" 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_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</FrameLayout>
<TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_features_title" style="@style/UiKit.TextView.H1" />
<com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_features_blurb" app:tv_markdown_enabled="true" style="@style/UiKit.TextView" />
<include layout="@layout/view_boost_user_settings_perks" />
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_more" style="@style/UiKit.TextView" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</ScrollView>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/premium_guild_subscription_title" style="@style/UiKit.Settings.Item.Header" />
<TextView android:id="@id/settings_boost_subtext" style="@style/UiKit.Settings.Item.SubText" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/settings_boost_recycler" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
</LinearLayout>
</com.discord.app.AppViewFlipper>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
xmlns:android="http://schemas.android.com/apk/res/android">
<com.google.android.material.appbar.AppBarLayout android:background="?primary_630" style="@style/AppTheme.AppBarLayout">
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:gravity="center_vertical" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<FrameLayout android:id="@id/set_custom_status_emoji_button" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/set_custom_status_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" />
</FrameLayout>
<com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextInputLayout">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/set_custom_status_text" android:hint="@string/custom_status_set_custom_status" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" style="@style/UiKit.Form.Field.EditText.SingleLine">
<requestFocus />
</androidx.appcompat.widget.AppCompatEditText>
</com.google.android.material.textfield.TextInputLayout>
<ImageView android:id="@id/set_custom_status_clear" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="?theme_search_clear_icon" android:contentDescription="@string/reset" style="@style/UiKit.ImageView.Clickable" />
</LinearLayout>
<RadioGroup android:id="@id/set_custom_status_expiration" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_large">
<RadioButton android:id="@id/set_custom_status_expiration_never" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/custom_status_dont_clear" style="@style/UiKit.ListItem" />
<RadioButton android:id="@id/set_custom_status_expiration_30_minutes" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/custom_status_clear_in_minutes" style="@style/UiKit.ListItem" />
<RadioButton android:id="@id/set_custom_status_expiration_4_hours" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/custom_status_clear_in_hours" style="@style/UiKit.ListItem" />
<RadioButton android:id="@id/set_custom_status_expiration_tomorrow" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/custom_status_clear_tomorrow" style="@style/UiKit.ListItem" />
</RadioGroup>
</LinearLayout>
</ScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/set_custom_status_save" android:visibility="visible" style="@style/Settings.FloatingActionButton.Save" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginLeft="60.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/set_status" style="@style/UiKit.Sheet.Header.Title" />
<TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/set_status" style="@style/UiKit.Sheet.Header.Title" />
<View style="@style/UiKit.Divider" />
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<include android:id="@id/user_status_update_online" layout="@layout/view_user_status_presence" />
<include android:id="@id/user_status_update_idle" layout="@layout/view_user_status_presence" />
<include android:id="@id/user_status_update_dnd" layout="@layout/view_user_status_presence" />
<include android:id="@id/user_status_update_invisible" layout="@layout/view_user_status_presence" />
<com.discord.widgets.user.profile.UserStatusPresenceCustomView android:id="@id/user_status_update_custom" android:layout_width="fill_parent" android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>