Changes of com.discord v1072
This commit is contained in:
parent
428d6ce22d
commit
76ad84390c
957 changed files with 35556 additions and 35346 deletions
10
com.discord/res/layout/layout_icon_uploader.xml
Normal file
10
com.discord/res/layout/layout_icon_uploader.xml
Normal file
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_medium" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content" 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/icon_uploader_placeholder_border" android:layout_width="0.0dip" android:layout_height="0.0dip" android:src="@drawable/drawable_circle_dashed" android:tint="?colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" />
|
||||
<ImageView android:id="@id/icon_uploader_placeholder_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_camera_24dp" android:tint="?colorInteractiveNormal" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@id/icon_uploader_placeholder_text" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" app:layout_constraintVertical_chainStyle="packed" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/icon_uploader_placeholder_text" android:layout_width="0.0dip" android:layout_height="24.0dip" android:text="@string/upload" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8.0sp" app:autoSizeStepGranularity="1.0sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@id/icon_uploader_placeholder_icon" style="@style/UiKit.TextView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/icon_uploader_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@null" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/icon_uploader_plus" android:background="@drawable/drawable_circle_brand_500" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_upload_plus_32dp" android:contentDescription="@string/sample_empty_string" android:translationX="6.0dip" android:translationY="-6.0dip" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" style="@style/UiKit.ImageView" />
|
||||
<androidx.constraintlayout.widget.Group android:id="@id/icon_uploader_placeholder_group" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="icon_uploader_placeholder_border,icon_uploader_placeholder_icon,icon_uploader_placeholder_text,icon_uploader_plus" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
13
com.discord/res/layout/view_auth_invite_info.xml
Normal file
13
com.discord/res/layout/view_auth_invite_info.xml
Normal file
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignTop="@id/auth_invite_info_content" android:layout_alignBottom="@id/auth_invite_info_content" android:layout_alignStart="@id/auth_invite_info_content" android:layout_alignEnd="@id/auth_invite_info_content" app:roundedCornerRadius="8.0dip" />
|
||||
<LinearLayout android:id="@id/auth_invite_info_content" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/auth_invite_info_guild_avatar" app:roundWithOverlayColor="?colorBackgroundTertiary" style="@style/Avatar.Large" />
|
||||
<ImageView android:id="@id/auth_invite_info_template_icon" android:visibility="gone" android:src="@drawable/ic_template_32dp" android:tint="?colorHeaderSecondary" android:importantForAccessibility="no" style="@style/Avatar.Large" />
|
||||
<LinearLayout android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:id="@id/auth_invite_info_invited_text" android:layout_marginBottom="@dimen/uikit_spacing_xsmall" style="@style/UiKit.TextView" />
|
||||
<com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:id="@id/auth_invite_info_guild_name" android:maxLines="1" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
6
com.discord/res/layout/view_screen_title.xml
Normal file
6
com.discord/res/layout/view_screen_title.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/screen_title_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Bold" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/screen_title_subtitle" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
|
@ -1,21 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<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">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_captcha_verify" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_captcha_verify" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_captcha_verify" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:gravity="center" android:background="?auth_bg_card" android:padding="@dimen/uikit_spacing_large" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone" />
|
||||
<LinearLayout android:gravity="center" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/verify_by_recaptcha" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/verify_by_recaptcha_description" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_captcha_help" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone" />
|
||||
<LinearLayout android:gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" app:stv_subtitle="@string/verify_by_recaptcha_description" app:stv_title="@string/verify_by_recaptcha" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_captcha_help" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_captcha_verify" android:text="@string/verify" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_captcha_verify" android:text="@string/verify" android:layout_alignParentBottom="true" style="@style/UiKit.AuthButton.Material" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,8 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
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 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>
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat.Transparent" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_back" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout android:visibility="gone" style="@style/UiKit.ViewGroup.RelativeLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignTop="@id/auth_invite_info_content" android:layout_alignBottom="@id/auth_invite_info_content" android:layout_alignStart="@id/auth_invite_info_content" android:layout_alignEnd="@id/auth_invite_info_content" app:roundedCornerRadius="@dimen/uikit_spacing_small" />
|
||||
<LinearLayout android:id="@id/auth_invite_info_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/auth_invite_info_guild_avatar" android:layout_margin="@dimen/uikit_spacing_large" app:roundWithOverlayColor="?colorBackgroundTertiary" style="@style/Avatar.Large" />
|
||||
<ImageView android:id="@id/auth_invite_info_template_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_large" android:src="@drawable/ic_template_32dp" android:tint="?colorHeaderSecondary" android:importantForAccessibility="no" style="@style/Avatar.Large" />
|
||||
<LinearLayout android:layout_gravity="center_vertical" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.app.AppTextView android:id="@id/auth_invite_info_invited_text" style="@style/UiKit.TextView" />
|
||||
<com.discord.app.AppTextView android:id="@id/auth_invite_info_guild_name" android:layout_marginTop="@dimen/uikit_spacing_xsmall" style="@style/UiKit.TextView.H2" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -1,17 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<View android:background="?auth_gradient" android:layout_width="fill_parent" android:layout_height="?actionBarSize" />
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/img_auth_logo" android:scaleType="center" android:layout_above="@id/auth_landing_content" android:layout_below="@id/auth_landing_invite_info" android:layout_alignWithParentIfMissing="true" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
<fragment android:id="@id/auth_landing_invite_info" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="8.0dip" class="com.discord.widgets.auth.WidgetAuthInviteInfo" />
|
||||
<RelativeLayout android:id="@id/auth_landing_content" android:background="?auth_bg_card" android:layout_height="wrap_content" android:layout_margin="8.0dip" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/nuf_title_mobile" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="20.0dip" android:text="@string/nuf_body_mobile" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@id/auth_landing_login" android:text="@string/login" style="@style/UiKit.AuthButton.Material.Transparent" />
|
||||
<View android:background="?primary_500" android:layout_width="wrap_content" android:layout_height="0.25dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:alpha="0.6" />
|
||||
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@id/auth_landing_register" android:text="@string/register" style="@style/UiKit.AuthButton.Material.Transparent" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
<RelativeLayout android:background="?auth_landing_ptrn" 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/auth_landing_switch_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_above="@id/auth_bottom_container" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
|
||||
<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<ImageView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="?auth_logo" android:scaleType="center" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:layout_alignParentBottom="true" android:layout_centerInParent="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
|
||||
</RelativeLayout>
|
||||
<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<ImageView android:layout_width="175.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="?auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerInParent="true">
|
||||
<com.discord.views.ScreenTitleView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
|
||||
<com.discord.widgets.auth.AuthInviteInfoView android:id="@id/auth_landing_invite_info" android:layout_width="fill_parent" android:layout_height="wrap_content" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</com.discord.app.AppViewFlipper>
|
||||
<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/auth_bottom_container" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_landing_register" android:text="@string/register" style="@style/UiKit.AuthButton.Material" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_landing_login" android:text="@string/login" android:backgroundTint="?colorButtonSecondary" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -1,30 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.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">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_login" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_login" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_login" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/login_title" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="8.0dip" android:text="@string/login_body" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_email_wrap" android:hint="@string/form_label_email" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_email" android:inputType="textEmailAddress" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<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: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>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_login" android:text="@string/login" android:layout_alignParentBottom="true" style="@style/UiKit.AuthButton.Material" />
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:orientation="vertical" android:id="@id/auth_login_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/login_body" app:stv_title="@string/login_title" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_email" android:singleLine="true" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_login_password" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_small" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_login_password" android:singleLine="true" android:inputType="textPassword" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@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="12.0dip" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_login" android:text="@string/login" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,22 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_above="@id/auth_button_container" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="8.0dip" android:text="@string/two_fa_enter_token_label" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
<com.discord.views.CodeVerificationView android:id="@id/auth_mfa_verification" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="20.0dip" />
|
||||
<TextView android:textSize="11.0sp" android:gravity="center" android:id="@id/auth_login_forgot_password" android:padding="8.0dip" android:maxWidth="320.0dip" android:text="@string/two_fa_enter_token_body" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<LinearLayout android:id="@id/auth_button_container" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout" />
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="80.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa" style="@style/UiKit.TextView" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.TextView" />
|
||||
<com.discord.views.CodeVerificationView android:id="@id/auth_mfa_verification" android:layout_width="fill_parent" android:layout_height="wrap_content" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/auth_login_forgot_password" android:layout_marginTop="@dimen/uikit_spacing_large" android:maxWidth="320.0dip" android:text="@string/two_fa_enter_token_body" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -2,35 +2,26 @@
|
|||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_register_button_container" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_register_button_container" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_register_button_container" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/register_title" style="@style/UiKit.TextView.H1" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:hint="@string/form_label_username" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_username" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_email_wrap" android:hint="@string/form_label_email" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_email" android:inputType="textEmailAddress" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_password" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.Password" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
|
||||
<CheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/grey_2" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<FrameLayout android:id="@id/auth_register_button_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register" style="@style/UiKit.AuthButton.Material" />
|
||||
</FrameLayout>
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_title="@string/register" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_placeholder_username" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_username" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_register_username" android:singleLine="true" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_register_email" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_account_information" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_email" android:singleLine="true" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_register_password" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_register_password" android:singleLine="true" android:inputType="textPassword" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
|
||||
<com.google.android.material.checkbox.MaterialCheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register_title" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,23 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
<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">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_alignParentBottom="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_alignParentBottom="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:fillViewport="false" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:layout_gravity="center" android:padding="20.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<ImageView android:src="@drawable/img_wump_trash_dark" style="@style/UiKit.ImageView" />
|
||||
<LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/auth_undelete_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_title" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:gravity="center" android:id="@id/auth_undelete_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_description" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_delete" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/return_to_login" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_cancel" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_cancel_mobile" style="@style/UiKit.Material.Button.Outline" />
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<ImageView android:src="@drawable/img_wump_trash_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:id="@id/auth_undelete_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:stv_subtitle="@string/account_scheduled_for_deletion_description" app:stv_title="@string/account_scheduled_for_deletion_title" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
</RelativeLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_delete" android:text="@string/return_to_login" style="@style/UiKit.AuthButton.Material" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_cancel" android:text="@string/account_scheduled_for_deletion_cancel_mobile" android:backgroundTint="?colorButtonSecondary" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -19,12 +19,12 @@
|
|||
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<RelativeLayout android:layout_gravity="center" android:id="@id/guild_create_icon_wrap" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="36.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<TextView android:textColor="?primary_500" android:gravity="center" android:padding="@dimen/uikit_spacing_large" android:text="@string/upload_image" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_create_icon" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/guild_create_icon_placeholder" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/icon_uploader_image" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/icon_uploader_plus" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
|
||||
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
|
||||
|
@ -33,14 +33,14 @@
|
|||
<View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
|
||||
<TextView android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit.TextView.Subtext" />
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit.TextView.Subtext" />
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
@ -2,22 +2,17 @@
|
|||
<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 style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/create_server_button_cta" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<androidx.core.widget.NestedScrollView android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<RelativeLayout android:layout_gravity="center" android:id="@id/guild_create_icon_wrap" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="36.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<TextView android:textColor="?primary_500" android:gravity="center" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/upload_image" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_create_icon" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/guild_create_icon_placeholder" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
|
||||
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/create_server_description_mobile_refresh" app:stv_title="@string/create_server_title_mobile_refresh" />
|
||||
<include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" layout="@layout/layout_icon_uploader" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_server_name" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/guild_create_name" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_guidelines" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -2,23 +2,20 @@
|
|||
<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 style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/invite_people" style="@style/AppTheme.Toolbar" />
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<LinearLayout android:id="@id/guild_invite_empty_suggestions_container" android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_plus_illo" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:gravity="center" android:id="@id/guild_invite_friends_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/instant_invite_friends" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:gravity="center" android:id="@id/guild_invite_friends_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/instant_invite_friends_description" style="@style/UiKit.TextView" />
|
||||
<LinearLayout android:background="@drawable/drawable_bg_outline_dark" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_empty_suggestions_invite_link" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:layout_height="fill_parent" android:text="@string/invite_link_example_verified" android:singleLine="true" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Bold" />
|
||||
<ImageView android:id="@id/guild_invite_empty_suggestions_settings_edit" android:background="?selectableItemBackgroundBorderless" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="10.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="10.0dip" android:layout_width="46.0dip" android:layout_height="46.0dip" android:src="?ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/share_invite_link_for_access" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_invite_empty_suggestions_invite_share_btn" android:layout_width="fill_parent" android:text="@string/share_link" style="@style/UiKit.Material.Button" />
|
||||
</LinearLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/drawable_invite_share_art_envelope" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" app:stv_subtitle="@string/invite_empty_body" app:stv_title="@string/invite_empty_title" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_empty_suggestions_invite_link" android:background="?bg_clickable_rounded_4dp" android:layout_width="0.0dip" android:layout_height="0.0dip" android:text="@string/invite_link_example_verified" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_invite_empty_suggestions_settings_edit" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.SingleLine" />
|
||||
<ImageButton android:id="@id/guild_invite_empty_suggestions_settings_edit" android:background="?bg_clickable_rounded_4dp" android:padding="@dimen/uikit_spacing_large" android:layout_width="56.0dip" android:layout_height="56.0dip" android:src="?ic_settings" android:contentDescription="@string/share_invite_link_for_access" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_invite_empty_suggestions_invite_share_btn" android:text="@string/share_link" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<View android:id="@id/bottom_sheet_tint" android:background="@color/black_alpha_60" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
<com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@id/invite_settings_bottom_sheet" android:background="?primary_630" style="@style/UiKit.ViewGroup.LinearLayout.BottomSheet" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,21 +1,21 @@
|
|||
<?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: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">
|
||||
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:layout_height="fill_parent" android:baselineAligned="false" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:padding="0.0dip" style="@style/UiKit.Copy">
|
||||
<com.google.android.material.textfield.TextInputLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Copy.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/guild_join_invite" android:hint="@string/form_label_instant_invite" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:background="?primary_630" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_height="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:layout_height="fill_parent" android:baselineAligned="false" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/join_server_description_mobile_refresh" app:stv_title="@string/join_server_title_mobile_refresh" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/form_label_invite_link" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/guild_join_invite" android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText">
|
||||
<requestFocus />
|
||||
</com.google.android.material.textfield.TextInputEditText>
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/nuf_join_server_button" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:layout_gravity="bottom|center" android:layout_marginBottom="4.0dip" android:src="?img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/UiKit.ImageView.HideInLandscape" />
|
||||
<ImageView android:layout_gravity="bottom|center" android:layout_marginBottom="@dimen/uikit_spacing_small" android:src="?img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/UiKit.ImageView.HideInLandscape" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,9 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_500" android:padding="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/join_server_description_mobile" style="@style/UiKit.Form.Label" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_500" android:padding="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/instant_invite_looks_like" android:textAllCaps="true" style="@style/UiKit.Form.Label" />
|
||||
<TextView android:textColor="@color/status_yellow_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/invite_link_example_verified" style="@style/UiKit.TextView.Link" />
|
||||
<TextView android:textColor="@color/status_yellow_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/invite_link_example_full" style="@style/UiKit.TextView.Link" />
|
||||
<TextView android:textColor="@color/status_yellow_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/invite_link_example_simple" style="@style/UiKit.TextView.Link" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/join_server_invite_examples_header" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_simple" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_full" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_verified" style="@style/UiKit.TextView" />
|
||||
</merge>
|
|
@ -1,19 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?primary_600" android:padding="@dimen/uikit_spacing_large" android:layout_height="fill_parent" android:weightSum="2.0" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
<RelativeLayout android:background="?primary_600" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<View android:layout_width="fill_parent" android:layout_height="0.0dip" android:minHeight="@dimen/uikit_spacing_large" android:layout_weight="1.0" />
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/img_guild_use_cases" android:adjustViewBounds="true" android:maxHeight="104.0dip" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/nuf_get_started" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/nuf_what_do_you_want" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="8.0dip" app:strokeColor="?primary_660" app:strokeWidth="1.0dip">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_voice_chat" android:text="@string/nuf_voice_chat_while_gaming" android:drawableStart="@drawable/guild_use_cases_voice_chat_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_chat_with_friends" android:text="@string/nuf_chat_with_friends" android:drawableStart="@drawable/guild_use_cases_chat_bubble_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_club" android:text="@string/nuf_club_or_interest_group" android:drawableStart="@drawable/guild_use_cases_club_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_gaming" android:text="@string/nuf_gaming_community" android:drawableStart="@drawable/guild_use_cases_gaming_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_join_a_friend" android:text="@string/nuf_join_a_friend" android:drawableStart="@drawable/guild_use_cases_join_friend_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
<View android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0" />
|
||||
<TextView android:layout_gravity="center_horizontal" android:id="@id/nux_guild_use_cases_dismiss" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/nuf_just_look_around" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<androidx.appcompat.widget.Toolbar android:id="@id/toolbar" android:background="@color/transparent" android:layout_alignParentTop="true" style="@style/AppTheme.Toolbar" />
|
||||
<LinearLayout android:layout_below="@id/toolbar" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/img_guild_use_cases" android:adjustViewBounds="true" android:layout_weight="1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/nuf_what_do_you_want" app:stv_title="@string/nuf_get_started" />
|
||||
<com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" app:strokeColor="?colorBackgroundSecondaryAlt" app:strokeWidth="1.0dip">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_voice_chat" android:text="@string/nuf_voice_chat_while_gaming" android:drawableStart="@drawable/guild_use_cases_voice_chat_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_chat_with_friends" android:text="@string/nuf_chat_with_friends" android:drawableStart="@drawable/guild_use_cases_chat_bubble_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_club" android:text="@string/nuf_club_or_interest_group" android:drawableStart="@drawable/guild_use_cases_club_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_gaming" android:text="@string/nuf_gaming_community" android:drawableStart="@drawable/guild_use_cases_gaming_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_join_a_friend" android:text="@string/nuf_join_a_friend" android:drawableStart="@drawable/guild_use_cases_join_friend_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
<TextView android:textColor="?colorInteractiveNormal" android:layout_gravity="center_horizontal" android:id="@id/nux_guild_use_cases_dismiss" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/nuf_just_look_around" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -1,26 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<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">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/guild_join_action_btn" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/guild_join_action_btn" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:id="@id/guild_join_content" android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/guild_join_action_btn" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/nux_post_reg_join_server_title" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="8.0dip" android:text="@string/nux_post_reg_join_server_description" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/guild_join_invite" android:hint="@string/instant_invite" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
</LinearLayout>
|
||||
<androidx.core.widget.NestedScrollView android:id="@id/guild_join_content" android:layout_height="fill_parent" android:fillViewport="false" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nux_post_reg_join_server_description" app:stv_title="@string/nux_post_reg_join_server_title" />
|
||||
<LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/instant_invite" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/guild_join_invite" android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/nux_post_reg_join_server_skip" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:text="@string/nux_post_reg_join_server_skip" android:layout_alignParentBottom="true" style="@style/UiKit.AuthButton.Material" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
Loading…
Add table
Add a link
Reference in a new issue