Changes of com.discord v1085
This commit is contained in:
parent
9a4bb1ef73
commit
8785313ee6
750 changed files with 24287 additions and 23647 deletions
|
@ -2,6 +2,5 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:id="@id/oauth_token_permission_detailed_icon" android:layout_margin="@dimen/uikit_spacing_small" android:src="@drawable/ic_check_circle_green_24dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/oauth_token_permission_detailed_name" android:layout_width="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:id="@id/oauth_token_permission_detailed_desc" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/oauth_token_permission_detailed_name" app:layout_constraintTop_toBottomOf="@id/oauth_token_permission_detailed_name" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/oauth_token_permission_detailed_name" android:layout_width="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toBottomOf="@id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toTopOf="@id/oauth_token_permission_detailed_icon" style="@style/UiKit.TextView.H2" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -1,18 +1,16 @@
|
|||
<?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 style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior">
|
||||
<com.discord.app.AppViewFlipper android:id="@id/guild_call_view_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" android:layout_above="@id/guild_call_controls" android:layout_alignWithParentIfMissing="true">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_call_participant_list" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:src="?img_voice_no_connections" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="13.75sp" android:gravity="center" android:layout_margin="16.0dip" android:text="@string/voice_channel_empty" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<com.discord.utilities.view.grid.FrameGridLayout android:id="@id/guild_call_video_grid" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
</com.discord.app.AppViewFlipper>
|
||||
<com.discord.widgets.voice.fullscreen.VoiceControlsView android:id="@id/guild_call_controls" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" />
|
||||
</RelativeLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_call_container" android:layout_width="fill_parent" android:layout_height="fill_parent" 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.utilities.view.grid.FrameGridLayout android:id="@id/guild_call_video_grid" android:background="@color/black" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/guild_call_participant_list" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" />
|
||||
<LinearLayout android:gravity="center" android:id="@id/guild_call_empty_state" android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:src="?img_voice_no_connections" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center" android:text="@string/voice_channel_empty" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<com.discord.widgets.voice.fullscreen.VoiceControlsView android:id="@id/guild_call_controls" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
|
||||
<com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
|
||||
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -2,31 +2,48 @@
|
|||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:fitsSystemWindows="true" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/drawable_auth_splash" android:scaleType="centerCrop" android:importantForAccessibility="no" />
|
||||
<com.google.android.material.card.MaterialCardView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip" app:strokeColor="@color/primary_800" app:strokeWidth="1.0dip" style="@style/Widget.MaterialComponents.CardView">
|
||||
<LinearLayout android:id="@id/oauth_authorize_not_supported" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/scope_unsupported_on_android" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:text="@string/scope_unsupported_on_android_description" android:drawableBottom="@drawable/img_baddies_dark_theme" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_browser" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/open_in_browser" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_cancel" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_gravity="center" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.ScrollView">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:id="@id/oauth_authorize_logo" android:layout_width="fill_parent" android:layout_height="32.0dip" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_auth_logo" android:scaleType="centerInside" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
<com.google.android.material.card.MaterialCardView android:id="@id/oauth_authorize_card" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundFloating" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip" style="@style/Widget.MaterialComponents.CardView">
|
||||
<LinearLayout android:id="@id/oauth_authorize_not_supported" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/scope_unsupported_on_android" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:text="@string/scope_unsupported_on_android_description" android:drawableBottom="?img_baddies" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_browser" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/open_in_browser" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_cancel" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@id/oauth_authorize_content" android:visibility="gone" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingRight="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_authorize_application_icon" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" style="@style/Avatar.XXLarge" />
|
||||
<TextView android:textSize="40.0sp" android:textColor="?colorBackgroundAccent" android:layout_height="fill_parent" android:layout_marginLeft="2.0dip" android:layout_marginRight="2.0dip" android:text="..." style="@style/UiKit.TextView.SingleLine" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_authorize_user_icon" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_xlarge" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" style="@style/Avatar.XXLarge" />
|
||||
</LinearLayout>
|
||||
<TextView android:textSize="20.0sp" android:id="@id/oauth_authorize_application_name" android:layout_marginTop="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<TextView android:id="@id/oauth_authorize_connect_label" android:text="@string/oauth2_requests_account_access" style="@style/UiKit.TextView.Large" />
|
||||
</LinearLayout>
|
||||
<View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.Divider" />
|
||||
<com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/oauth_authorize_permissions_label_tv" android:padding="0.0dip" style="@style/UiKit.Settings.Item.Header" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/oauth_authorize_permissions_list" android:clipToPadding="false" android:layout_height="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.Divider" />
|
||||
<RelativeLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<ImageView android:id="@id/oauth_authorize_age_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_emoji_recent_24dp" android:tint="?colorTextMuted" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" style="@style/UiKit.ImageView" />
|
||||
<com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_age_notice" android:padding="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_toEndOf="@id/oauth_authorize_age_notice_icon" android:layout_alignParentEnd="true" app:tv_markdown_enabled="true" style="@style/UiKit.Auth.Note.Rotatable" />
|
||||
</RelativeLayout>
|
||||
<RelativeLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<ImageView android:id="@id/oauth_authorize_security_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_shieldstar_24dp" android:tint="?colorTextMuted" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" style="@style/UiKit.ImageView" />
|
||||
<com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_security_notice" android:padding="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_toEndOf="@id/oauth_authorize_security_notice_icon" android:layout_alignParentEnd="true" app:tv_markdown_enabled="true" style="@style/UiKit.Auth.Note.Rotatable" />
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layoutDirection="rtl" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_grant" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/authorize" android:layout_weight="1.0" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_deny" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Transparent" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@id/oauth_authorize_loading" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ProgressBar android:layout_gravity="center" android:padding="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_large" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_loading_cancel" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:orientation="vertical" android:id="@id/oauth_authorize_content" android:visibility="gone" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<RelativeLayout android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_authorize_application_icon" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentEnd="true" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" app:roundingBorderColor="@color/primary_200_alpha_30" style="@style/Avatar.Large" />
|
||||
<TextView android:id="@id/oauth_authorize_connect_label" android:text="@string/oauth2_connect_to_discord" android:layout_alignParentTop="true" android:layout_toStartOf="@id/oauth_authorize_application_icon" android:layout_alignParentStart="true" style="@style/UiKit.TextView.H2" />
|
||||
<TextView android:textSize="24.0sp" android:id="@id/oauth_authorize_application_name" android:layout_below="@id/oauth_authorize_connect_label" android:layout_toStartOf="@id/oauth_authorize_application_icon" android:layout_alignParentStart="true" style="@style/UiKit.TextView.H1.Bold" />
|
||||
</RelativeLayout>
|
||||
<com.discord.app.AppTextView android:id="@id/oauth_authorize_permissions_label_tv" style="@style/UiKit.Settings.Item.Header" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:scrollbarAlwaysDrawVerticalTrack="true" android:id="@id/oauth_authorize_permissions_list" android:paddingBottom="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_height="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:fadeScrollbars="false" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
<View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.Divider.Thick" />
|
||||
<com.discord.app.AppTextView android:textColor="@color/primary_400" android:id="@id/oauth_authorize_security_notice" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" app:tv_markdown_enabled="true" style="@style/UiKit.Auth.Note.Rotatable" />
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_grant" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/authorize" android:layout_weight="1.0" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_deny" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Transparent" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@id/oauth_authorize_loading" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ProgressBar android:layout_gravity="center" android:padding="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_large" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_loading_cancel" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
Loading…
Add table
Add a link
Reference in a new issue