Changes of com.discord v1207
This commit is contained in:
parent
79cc469071
commit
ec286a9030
11183 changed files with 624324 additions and 580196 deletions
14
com.discord/res/layout/leave_guild_dialog.xml
Normal file
14
com.discord/res/layout/leave_guild_dialog.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/leave_guild_dialog_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/leave_server_title" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<View style="@style/UiKit.Divider" />
|
||||
</LinearLayout>
|
||||
<com.discord.app.AppTextView android:textColor="@color/primary_200" android:id="@id/leave_guild_dialog_body" android:paddingTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/leave_server_body" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
|
||||
<com.google.android.material.button.MaterialButton android:textColor="?primary_200" android:id="@id/leave_guild_cancel_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
|
||||
<com.discord.views.LoadingButton android:id="@id/leave_guild_confirm_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:lb_progress_color="@color/white" app:lb_text="@string/leave_server" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:id="@id/channel_members_list_item_add" android:background="@drawable/drawable_circle_background_secondary" android:padding="@dimen/uikit_spacing_medium" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_add_person_16dp" android:scaleType="fitCenter" android:contentDescription="@string/invite_members" android:layout_marginEnd="@dimen/uikit_spacing_large" app:tint="?colorInteractiveNormal" />
|
||||
<ImageView android:id="@id/channel_members_list_item_add" android:background="@drawable/drawable_circle_background_secondary" android:padding="@dimen/uikit_spacing_medium" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_add_person_16dp" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" app:tint="?colorInteractiveNormal" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:id="@id/channel_members_list_item_add_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/invite_members" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?colorBackgroundSecondary" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?colorBackgroundSecondary" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.CoordinatorLayout.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout android:id="@id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar android:id="@id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
|
||||
|
@ -10,7 +10,7 @@
|
|||
</androidx.appcompat.widget.Toolbar>
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<com.discord.app.AppViewFlipper android:id="@id/gif_search_view_flipper" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/gif_search_gif_recycler" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/gif_search_gif_recycler" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@id/gif_search_loading_view" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_height="fill_parent" app:glv_is_staggered="true" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
</com.discord.app.AppViewFlipper>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,3 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.chat.input.gifpicker.WidgetGifPickerSearch" android:id="@id/gif_search_sheet_content" android:tag="WidgetGifPickerSearchTag" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||
<androidx.fragment.app.FragmentContainerView android:id="@id/gif_search_sheet_content" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?colorPrimary" style="@style/UiKit.ViewGroup.CoordinatorLayout.Page"
|
||||
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 android:background="?primary_630" style="@style/AppTheme.AppBarLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/global_search_bar" style="@style/UiKit.TextInputLayout.Search.ActionBar.Filter">
|
||||
<com.google.android.material.textfield.TextInputEditText android:hint="@string/quickswitcher_placeholder" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search">
|
||||
|
@ -9,18 +9,25 @@
|
|||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_guild_list" style="@style/UiKit.GuildsList.Horiz" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<com.discord.app.AppViewFlipper android:id="@id/global_search_view_flipper" android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
|
||||
<com.discord.app.AppViewFlipper android:id="@id/global_search_view_flipper" android:background="?colorBackgroundPrimary" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<TextView android:textColor="?primary_400" android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" android:drawableTop="@drawable/img_quick_switcher_empty" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView.H2" />
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:gravity="center_horizontal" android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:src="?img_empty_search" android:contentDescription="@string/search_no_results" style="@style/UiKit.ImageView" />
|
||||
<TextView android:drawableTop="@null" style="@style/UiKit.TextView.NoResults" />
|
||||
<View android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.Divider" />
|
||||
<TextView android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/other_options" style="@style/UiKit.TextView.H2" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/global_search_add_a_friend_btn" android:text="@string/add_friend" style="@style/UiKit.Material.Button.Outline" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/global_search_join_guild_btn" android:text="@string/join_server_button_cta" style="@style/UiKit.Material.Button.Outline" />
|
||||
<androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
|
||||
<LinearLayout android:gravity="center_horizontal" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:src="@drawable/img_quick_switcher_empty" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
|
||||
<LinearLayout android:gravity="center_horizontal" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:src="?img_empty_search" android:contentDescription="@string/search_no_results" style="@style/UiKit.ImageView.HideInLandscape" />
|
||||
<TextView android:drawableTop="@null" style="@style/UiKit.TextView.NoResults" />
|
||||
<View android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.Divider" />
|
||||
<TextView android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/other_options" style="@style/UiKit.TextView.H2" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/global_search_add_a_friend_btn" android:text="@string/add_friend" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/global_search_join_guild_btn" android:text="@string/join_server_button_cta" style="@style/UiKit.Material.Button" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</com.discord.app.AppViewFlipper>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -20,7 +20,7 @@
|
|||
<TextView android:id="@id/settings_authorized_apps" android:text="@string/authorized_apps" android:drawableStart="@drawable/ic_authed_apps_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<TextView android:id="@id/settings_connections" android:text="@string/connections" android:drawableStart="@drawable/ic_phonelink_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<TextView android:id="@id/settings_billing" android:visibility="gone" android:text="@string/billing" android:drawableStart="@drawable/ic_billing_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<TextView android:id="@id/settings_qr_scanner" android:visibility="gone" android:text="@string/user_settings_scan_qr_code" android:drawableStart="@drawable/ic_qr_code_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<TextView android:id="@id/settings_qr_scanner" android:text="@string/user_settings_scan_qr_code" android:drawableStart="@drawable/ic_qr_code_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<LinearLayout android:id="@id/settings_nitro_settings" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView android:text="@string/premium_settings" style="@style/UiKit.Settings.Item.Header" />
|
||||
|
|
|
@ -1,29 +1,32 @@
|
|||
<?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" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout android:background="?primary_630" style="@style/AppTheme.AppBarLayout">
|
||||
<com.google.android.material.appbar.AppBarLayout 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">
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<RelativeLayout android:gravity="center_vertical" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" 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_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView">
|
||||
<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" app:actualImageScaleType="fitCenter" />
|
||||
</FrameLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/set_custom_status_text" android:hint="@string/custom_status_set_custom_status" android:layout_toEndOf="@id/set_custom_status_emoji_button" app:endIconDrawable="?theme_search_clear_icon" app:endIconMode="custom" style="@style/UiKit.TextInputLayout.Primary">
|
||||
<com.google.android.material.textfield.TextInputEditText android:maxLength="128" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" style="@style/UiKit.TextInputLayout.EditText.SingleLine">
|
||||
<requestFocus />
|
||||
</com.google.android.material.textfield.TextInputEditText>
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</RelativeLayout>
|
||||
<RadioGroup android:id="@id/set_custom_status_expiration" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_never" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_dont_clear" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_30_minutes" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_in_minutes" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_1_hour" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_in_hours" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_4_hours" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_in_hours" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_tomorrow" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_tomorrow" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
|
||||
<androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" style="@style/UiKit.ViewGroup">
|
||||
<RelativeLayout android:gravity="center_vertical" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<FrameLayout android:id="@id/set_custom_status_emoji_button" android:layout_alignTop="@id/set_custom_status_text" android:layout_alignBottom="@id/set_custom_status_text" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" 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" app:actualImageScaleType="fitCenter" />
|
||||
</FrameLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/set_custom_status_text" android:hint="@string/custom_status_set_custom_status" android:layout_toEndOf="@id/set_custom_status_emoji_button" app:endIconDrawable="?theme_search_clear_icon" app:endIconMode="custom" style="@style/UiKit.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:maxLength="128" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine">
|
||||
<requestFocus />
|
||||
</com.google.android.material.textfield.TextInputEditText>
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</RelativeLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
<RadioGroup android:id="@id/set_custom_status_expiration" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_never" android:text="@string/custom_status_dont_clear" style="@style/UiKit.ListItem.Icon.Radio" />
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_30_minutes" android:text="@string/custom_status_clear_in_minutes" style="@style/UiKit.ListItem.Icon.Radio" />
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_1_hour" android:text="@string/custom_status_clear_in_hours" style="@style/UiKit.ListItem.Icon.Radio" />
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_4_hours" android:text="@string/custom_status_clear_in_hours" style="@style/UiKit.ListItem.Icon.Radio" />
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_tomorrow" android:text="@string/custom_status_clear_tomorrow" style="@style/UiKit.ListItem.Icon.Radio" />
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:layout_gravity="bottom|center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_wumpus_custom_status" android:importantForAccessibility="no" style="@style/UiKit.ImageView.HideInLandscape" />
|
||||
<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>
|
Loading…
Add table
Add a link
Reference in a new issue