Changes of com.discord v1059

This commit is contained in:
root 2020-03-11 00:21:53 +01:00
parent 0b1b8ea694
commit 24066264d9
1946 changed files with 108435 additions and 102128 deletions

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<merge android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" 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.google.android.material.button.MaterialButton android:id="@id/channel_sidebar_actions_search" android:text="@string/search" android:drawableTop="@drawable/ic_sidebar_search_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/ChannelSideBarActions.Actions.Button" />
<com.google.android.material.button.MaterialButton android:id="@id/channel_sidebar_actions_pins" android:text="@string/pins" android:drawableTop="@drawable/ic_sidebar_pins_on_dark_24dp" style="@style/ChannelSideBarActions.Actions.Button" />
<com.google.android.material.button.MaterialButton android:id="@id/channel_sidebar_actions_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_sidebar_notifications_off_dark_24dp" style="@style/ChannelSideBarActions.Actions.Button" />
<com.google.android.material.button.MaterialButton android:id="@id/channel_sidebar_actions_settings" android:text="@string/settings" android:drawableTop="@drawable/ic_settings_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/ChannelSideBarActions.Actions.Button" />
</merge>

View file

@ -3,11 +3,13 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:id="@id/container" android:background="?primary_630" android:minHeight="315.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<RelativeLayout android:id="@id/perks_level_header" android:background="?primary_700" android:layout_width="fill_parent" android:layout_height="wrap_content">
<TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@id/perks_level_header_text" android:layout_marginTop="12.0dip" android:layout_marginBottom="12.0dip" android:maxLines="1" android:drawablePadding="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/perks_level_header_boosts" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:id="@id/perks_level_header_boosts" android:drawablePadding="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:drawableEnd="@drawable/ic_perk_lock" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
<androidx.cardview.widget.CardView android:id="@id/perks_level_header_unlocked" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" app:cardBackgroundColor="@color/white" app:cardCornerRadius="10.0dip">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/brand_500" android:gravity="center_vertical" android:layout_marginLeft="6.0dip" android:layout_marginRight="6.0dip" android:text="@string/guild_settings_premium_guild_unlocked" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
</androidx.cardview.widget.CardView>
<TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@id/perks_level_header_text" android:layout_marginTop="12.0dip" android:layout_marginBottom="12.0dip" android:maxLines="1" android:drawablePadding="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/perks_level_header_boosts_container" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
<FrameLayout android:id="@id/perks_level_header_boosts_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true">
<TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/perks_level_header_boosts" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableEnd="@drawable/ic_perk_lock" style="@style/UiKit.TextView" />
<androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@id/perks_level_header_unlocked" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white" app:cardCornerRadius="10.0dip">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/brand_500" android:gravity="center_vertical" android:layout_marginLeft="6.0dip" android:layout_marginRight="6.0dip" android:text="@string/guild_settings_premium_guild_unlocked" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
</androidx.cardview.widget.CardView>
</FrameLayout>
</RelativeLayout>
<TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/perks_level_contents_header" 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_medium" style="@style/UiKit.TextView" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/perks_level_contents_recycler" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:nestedScrollingEnabled="false" style="@style/UiKit.ViewGroup.RecyclerView" />

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">
<View android:id="@id/widget_channel_sidebar_actions_divider" android:background="?colorBackgroundModifierAccent" android:layout_width="fill_parent" android:layout_height="1.0dip" />
<com.discord.views.GuildChannelSideBarActionsView android:id="@id/widget_channel_sidebar_actions_guild_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
</FrameLayout>

View file

@ -2,5 +2,6 @@
<RelativeLayout android:layout_gravity="end" android:id="@id/main_panel_right" android:background="?colorBackgroundPrimary" android:fitsSystemWindows="true" android:layout_width="@dimen/right_panel_width" android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android">
<fragment android:name="com.discord.widgets.channels.WidgetChannelTopic" android:id="@id/widget_channel_topic" android:layout_width="fill_parent" android:layout_height="wrap_content" />
<fragment android:name="com.discord.widgets.channels.memberlist.WidgetChannelMembersList" android:id="@id/widget_connected_list" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/widget_channel_topic" />
<fragment android:name="com.discord.widgets.channels.WidgetChannelSidebarActions" android:id="@id/widget_channel_action_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/widget_channel_topic" />
<fragment android:name="com.discord.widgets.channels.memberlist.WidgetChannelMembersList" android:id="@id/widget_connected_list" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/widget_channel_action_bar" />
</RelativeLayout>

View file

@ -10,10 +10,10 @@
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<androidx.appcompat.widget.LinearLayoutCompat style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/user_settings" style="@style/UiKit.Settings.Item.Header" />
<LinearLayout android:gravity="center_vertical" android:id="@id/settings_set_status_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatTextView android:layout_width="0.0dip" android:text="@string/set_status" android:layout_weight="1.0" android:drawableStart="@drawable/ic_status_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
<LinearLayout android:gravity="center_vertical" android:id="@id/settings_set_status_container" android:background="?selectableItemBackground" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatTextView android:background="@color/transparent" android:layout_width="0.0dip" android:text="@string/set_status" android:layout_weight="1.0" android:drawableStart="@drawable/ic_status_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
<com.discord.views.StatusView android:id="@id/settings_status_view" android:layout_width="16.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="4.0dip" />
<TextView android:id="@id/settings_presence_text" android:layout_width="wrap_content" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Settings.Item" />
<TextView android:id="@id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Settings.Item" />
</LinearLayout>
<TextView android:id="@id/settings_account" android:text="@string/user_settings_my_account" android:drawableStart="?ic_my_account_a60" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_privacy" android:text="@string/privacy_and_safety" android:drawableStart="?ic_privacy_a60" style="@style/UiKit.Settings.Item.Icon" />

View file

@ -6,9 +6,9 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/back_button_behavior_label_mobile" style="@style/UiKit.Settings.Item.Header" />
<com.discord.views.CheckedSetting android:id="@id/settings_behavior_back_button_toggle" app:cs_text="@string/back_button_behavior_mobile" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
<View style="@style/UiKit.Settings.Divider" />
<TextView android:id="@id/settings_behavior_back_button_header" android:visibility="gone" android:text="@string/back_button_behavior_label_mobile" style="@style/UiKit.Settings.Item.Header" />
<com.discord.views.CheckedSetting android:id="@id/settings_behavior_back_button_toggle" android:visibility="gone" app:cs_text="@string/back_button_behavior_mobile" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
<View android:id="@id/settings_behavior_back_button_divider" android:visibility="gone" style="@style/UiKit.Settings.Divider" />
<TextView android:text="@string/keyboard_behavior_mobile_header" style="@style/UiKit.Settings.Item.Header" />
<com.discord.views.CheckedSetting android:id="@id/settings_behavior_shift_send_toggle" app:cs_subtext="@string/keyboard_behavior_mobile_shift_enter_to_send_hint" app:cs_text="@string/keyboard_behavior_mobile_shift_enter_to_send" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
<View style="@style/UiKit.Settings.Divider" />

View file

@ -5,7 +5,6 @@
<fragment android:name="com.discord.widgets.main.WidgetMain" android:id="@id/widget_tabs_host_home" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<FrameLayout android:id="@id/widget_tabs_host_non_fullscreen_nav_host" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent">
<fragment android:name="com.discord.widgets.friends.WidgetFriendsTab" android:id="@id/widget_tabs_host_friends" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<fragment android:name="com.discord.widgets.user.search.WidgetGlobalSearch" android:id="@id/widget_tabs_host_search" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<fragment android:name="com.discord.widgets.user.WidgetUserMentions" android:id="@id/widget_tabs_host_mentions" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<fragment android:name="com.discord.widgets.settings.WidgetSettings" android:id="@id/widget_tabs_host_user_settings" android:layout_width="fill_parent" android:layout_height="fill_parent" />
</FrameLayout>