Changes of com.discord v850
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#994f545c" android:pathData="M7.34,6.41L0.86,12.9l6.49,6.48 6.49,-6.48 -6.5,-6.49zM3.69,12.9l3.66,-3.66L11,12.9l-3.66,3.66 -3.65,-3.66zM19.36,6.64C17.61,4.88 15.3,4 13,4L13,0.76L8.76,5 13,9.24L13,6c1.79,0 3.58,0.68 4.95,2.05 2.73,2.73 2.73,7.17 0,9.9C16.58,19.32 14.79,20 13,20c-0.97,0 -1.94,-0.21 -2.84,-0.61l-1.49,1.49C10.02,21.62 11.51,22 13,22c2.3,0 4.61,-0.88 6.36,-2.64 3.52,-3.51 3.52,-9.21 0,-12.72z" />
|
||||
</vector>
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#99ffffff" android:pathData="M7.34,6.41L0.86,12.9l6.49,6.48 6.49,-6.48 -6.5,-6.49zM3.69,12.9l3.66,-3.66L11,12.9l-3.66,3.66 -3.65,-3.66zM19.36,6.64C17.61,4.88 15.3,4 13,4L13,0.76L8.76,5 13,9.24L13,6c1.79,0 3.58,0.68 4.95,2.05 2.73,2.73 2.73,7.17 0,9.9C16.58,19.32 14.79,20 13,20c-0.97,0 -1.94,-0.21 -2.84,-0.61l-1.49,1.49C10.02,21.62 11.51,22 13,22c2.3,0 4.61,-0.88 6.36,-2.64 3.52,-3.51 3.52,-9.21 0,-12.72z" />
|
||||
</vector>
|
Before Width: | Height: | Size: 606 B |
Before Width: | Height: | Size: 497 B |
Before Width: | Height: | Size: 412 B |
Before Width: | Height: | Size: 309 B |
Before Width: | Height: | Size: 429 B |
Before Width: | Height: | Size: 350 B |
Before Width: | Height: | Size: 766 B |
Before Width: | Height: | Size: 613 B |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 886 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.1 KiB |
|
@ -1,13 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
<LinearLayout android:background="@color/transparent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<FrameLayout android:id="@id/guild_actions_add_create" android:background="?colorPrimaryBg" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<FrameLayout android:id="@id/guild_actions_add_create" android:background="?colorPrimaryBg" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<LinearLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/create_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_create_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
<FrameLayout android:id="@id/guild_actions_add_join" android:background="?colorPrimaryBg" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
|
@ -16,7 +16,7 @@
|
|||
<TextView android:text="@string/join_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_join_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" android:contentDescription="@string/coming_soon" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
|
@ -36,11 +36,11 @@
|
|||
<TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/user_settings_mfa_enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
|
||||
</FrameLayout>
|
||||
<com.discord.app.AppViewFlipper android:id="@id/settings_account_mfa_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:id="@id/settings_account_mfa_enabled_container" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />
|
||||
<TextView android:id="@id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/UiKit.Settings.Item" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:id="@id/settings_account_mfa_disabled_container" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.airbnb.lottie.LottieAnimationView android:id="@id/settings_account_mfa_lottie" android:visibility="gone" android:layout_width="110.0dip" android:layout_height="118.0dip" app:lottie_autoPlay="true" app:lottie_fileName="animations/anim_verify_by_phone.json" app:lottie_loop="true" />
|
||||
<TextView android:id="@id/settings_account_mfa_sales_pitch" android:visibility="gone" android:text="@string/two_fa_sales_pitch" style="@style/UiKit.Settings.Item.SubText" />
|
||||
<Button android:id="@id/settings_account_mfa_enable" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/two_fa_enable" style="@style/UiKit.Button.Grey" />
|
||||
|
|
|
@ -36,11 +36,11 @@
|
|||
<TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/user_settings_mfa_enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
|
||||
</FrameLayout>
|
||||
<com.discord.app.AppViewFlipper android:id="@id/settings_account_mfa_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:id="@id/settings_account_mfa_enabled_container" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />
|
||||
<TextView android:id="@id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/UiKit.Settings.Item" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:id="@id/settings_account_mfa_disabled_container" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.airbnb.lottie.LottieAnimationView android:id="@id/settings_account_mfa_lottie" android:visibility="gone" android:layout_width="110.0dip" android:layout_height="118.0dip" app:lottie_autoPlay="true" app:lottie_fileName="animations/anim_verify_by_phone.json" app:lottie_loop="true" />
|
||||
<TextView android:id="@id/settings_account_mfa_sales_pitch" android:visibility="gone" android:text="@string/two_fa_sales_pitch" style="@style/UiKit.Settings.Item.SubText" />
|
||||
<Button android:id="@id/settings_account_mfa_enable" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/two_fa_enable" style="@style/UiKit.Button.Grey" />
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<com.discord.views.ScrollingViewPager android:id="@id/steps_viewpager" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_above="@id/steps_button_container" />
|
||||
<com.discord.views.ScrollingViewPager android:id="@id/steps_viewpager" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/steps_button_container" />
|
||||
<ImageView android:id="@id/steps_close" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackgroundBorderless" android:src="?ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" style="@style/UiKit.ImageView" />
|
||||
<LinearLayout android:id="@id/steps_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<Button android:id="@id/steps_done" android:visibility="gone" android:text="@string/done" style="@style/UiKit.Button.Grey" />
|
||||
|
|
|
@ -1,13 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
|
||||
<LinearLayout android:background="@color/transparent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Sheet.Header">
|
||||
<androidx.constraintlayout.widget.Guideline style="@style/UiKit.Sheet.Guideline" />
|
||||
<TextView android:id="@id/guild_actions_overview_header_tv" android:text="@string/add_a_server" style="@style/UiKit.Sheet.Header.Title" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView android:id="@id/guild_actions_add_join" android:text="@string/join_server_button_cta_mobile" android:drawableLeft="?ic_join_server" android:drawableStart="?ic_join_server" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<TextView android:id="@id/guild_actions_add_create" android:text="@string/create_server_button_cta_mobile" android:drawableLeft="?ic_add_circle_outline" android:drawableStart="?ic_add_circle_outline" style="@style/UiKit.Settings.Item.Icon" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<FrameLayout android:id="@id/guild_actions_add_create" android:background="?colorPrimaryBg" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<LinearLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/create_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_create_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
<FrameLayout android:id="@id/guild_actions_add_join" android:background="?colorPrimaryBg" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<LinearLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/join_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_join_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" android:contentDescription="@string/coming_soon" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<FrameLayout android:id="@id/guild_actions_add_create" android:background="?colorPrimaryBg" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<LinearLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/create_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_create_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
<FrameLayout android:id="@id/guild_actions_add_join" android:background="?colorPrimaryBg" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<LinearLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/join_server_button_cta" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:textColor="?primary_300" android:ellipsize="end" android:id="@id/guild_actions_add_join_desc" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
<ImageView android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
|
@ -36,11 +36,11 @@
|
|||
<TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/user_settings_mfa_enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" style="@style/UiKit.TextView.Semibold" />
|
||||
</FrameLayout>
|
||||
<com.discord.app.AppViewFlipper android:id="@id/settings_account_mfa_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:id="@id/settings_account_mfa_enabled_container" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />
|
||||
<TextView android:id="@id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/UiKit.Settings.Item" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:id="@id/settings_account_mfa_disabled_container" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.airbnb.lottie.LottieAnimationView android:id="@id/settings_account_mfa_lottie" android:visibility="gone" android:layout_width="110.0dip" android:layout_height="118.0dip" app:lottie_autoPlay="true" app:lottie_fileName="animations/anim_verify_by_phone.json" app:lottie_loop="true" />
|
||||
<TextView android:id="@id/settings_account_mfa_sales_pitch" android:visibility="gone" android:text="@string/two_fa_sales_pitch" style="@style/UiKit.Settings.Item.SubText" />
|
||||
<Button android:id="@id/settings_account_mfa_enable" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/two_fa_enable" style="@style/UiKit.Button.Grey" />
|
||||
|
|
|
@ -541,7 +541,6 @@
|
|||
<attr name="ic_insert_drive_file" format="reference" />
|
||||
<attr name="ic_integrations_a60" format="reference" />
|
||||
<attr name="ic_invites_a60" format="reference" />
|
||||
<attr name="ic_join_server" format="reference" />
|
||||
<attr name="ic_link_a60" format="reference" />
|
||||
<attr name="ic_locale_a60" format="reference" />
|
||||
<attr name="ic_lock" format="reference" />
|
||||
|
|
|
@ -1259,7 +1259,9 @@
|
|||
<item type="id" name="settings_account_edit" />
|
||||
<item type="id" name="settings_account_email" />
|
||||
<item type="id" name="settings_account_mfa_container" />
|
||||
<item type="id" name="settings_account_mfa_disabled_container" />
|
||||
<item type="id" name="settings_account_mfa_enable" />
|
||||
<item type="id" name="settings_account_mfa_enabled_container" />
|
||||
<item type="id" name="settings_account_mfa_enabled_header" />
|
||||
<item type="id" name="settings_account_mfa_flipper" />
|
||||
<item type="id" name="settings_account_mfa_lottie" />
|
||||
|
|
|
@ -1,9 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<plurals name="activity_feed_now_playing_header_one_known_extra">
|
||||
<item quantity="other">%d others</item>
|
||||
<item quantity="one">%d other</item>
|
||||
</plurals>
|
||||
<plurals name="activity_feed_now_playing_header_two_known_extras">
|
||||
<item quantity="other">%d others</item>
|
||||
<item quantity="one">%d other</item>
|
||||
</plurals>
|
||||
<plurals name="activity_feed_recently_played_header_multiple_extra">
|
||||
<item quantity="other">%d others</item>
|
||||
<item quantity="one">%d other</item>
|
||||
</plurals>
|
||||
<plurals name="activity_feed_single_member_list_header_memberCount">
|
||||
<item quantity="other">%d People</item>
|
||||
<item quantity="one">%d Person</item>
|
||||
</plurals>
|
||||
<plurals name="application_progress_indicator_installing_hours_timeRemaining">
|
||||
<item quantity="other">%d hours</item>
|
||||
<item quantity="one">%d hour</item>
|
||||
|
@ -566,17 +578,17 @@
|
|||
<item quantity="other">minutes</item>
|
||||
<item quantity="one">minute</item>
|
||||
</plurals>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_18">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_23">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_24">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_25">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_2f">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_30">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_5c">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_64">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_72">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_73">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_7d">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_8b">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_8c">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_1b">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_26">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_27">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_28">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_32">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_33">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_5f">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_67">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_75">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_76">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_80">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_8e">false</item>
|
||||
<item type="plurals" name="APKTOOL_DUMMY_8f">false</item>
|
||||
</resources>
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
<string name="activity_feed_none_playing_header">No one is playing games right now</string>
|
||||
<string name="activity_feed_now_playing_action_go_to_server">Go to Server</string>
|
||||
<string name="activity_feed_now_playing_action_join_channel">Join Channel</string>
|
||||
<string name="activity_feed_now_playing_header_one_known">**%1$s** and %2$s others</string>
|
||||
<string name="activity_feed_now_playing_header_one_known">**%1$s** and %2$s</string>
|
||||
<string name="activity_feed_now_playing_header_two_known">**%1$s**, **%2$s**, and %3$s</string>
|
||||
<string name="activity_feed_now_playing_header_two_known_only">**%1$s** and **%2$s**</string>
|
||||
<string name="activity_feed_now_playing_in_a_voice_channel">In a Voice Channel</string>
|
||||
|
@ -90,12 +90,13 @@
|
|||
<string name="activity_feed_now_playing_watching">Watching a Stream</string>
|
||||
<string name="activity_feed_now_playing_xbox">Playing on Xbox</string>
|
||||
<string name="activity_feed_now_streaming_twitch">Streaming on Twitch</string>
|
||||
<string name="activity_feed_recently_played_header_multiple">%1$s and %2$s</string>
|
||||
<string name="activity_feed_share_modal_footer_title">Or, share the link directly</string>
|
||||
<string name="activity_feed_share_modal_header">Share Post</string>
|
||||
<string name="activity_feed_share_modal_search_placeholder">Search users and channels</string>
|
||||
<string name="activity_feed_share_modal_sent">Sent</string>
|
||||
<string name="activity_feed_share_modal_share">Share</string>
|
||||
<string name="activity_feed_single_member_list_header">%1$s People</string>
|
||||
<string name="activity_feed_single_member_list_header">%1$s</string>
|
||||
<string name="activity_feed_user_playing_for_days">%1$s – %2$sd</string>
|
||||
<string name="activity_feed_user_playing_for_hours">%1$s – %2$sh</string>
|
||||
<string name="activity_feed_user_playing_for_minutes">%1$s – %2$sm</string>
|
||||
|
@ -907,7 +908,7 @@ HERE ARE MORE THINGS {progress}
|
|||
<string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
|
||||
<string name="cloud_sync_modal_or">OR</string>
|
||||
<string name="collapse_category">Collapse Category</string>
|
||||
<string name="com.crashlytics.android.build_id">4f2e0253-2c0d-4851-bf87-1bdb3adf0889</string>
|
||||
<string name="com.crashlytics.android.build_id">8774afa5-29f7-49ba-9bbe-25d5648ffca2</string>
|
||||
<string name="coming_soon">Coming Soon</string>
|
||||
<string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
|
||||
<string name="coming_soon_title">COMING SOON!</string>
|
||||
|
|
|
@ -251,7 +251,6 @@
|
|||
<item name="ic_insert_drive_file">@drawable/ic_insert_drive_file_dark_a60_24dp</item>
|
||||
<item name="ic_integrations_a60">@drawable/ic_integrations_dark_a60_24dp</item>
|
||||
<item name="ic_invites_a60">@drawable/ic_invites_dark_a60_24dp</item>
|
||||
<item name="ic_join_server">@drawable/ic_rotate_90_degrees_ccw_white_a60_24dp</item>
|
||||
<item name="ic_link_a60">@drawable/ic_link_dark_a60_24dp</item>
|
||||
<item name="ic_locale_a60">@drawable/ic_locale_dark_a60_24dp</item>
|
||||
<item name="ic_lock">@drawable/ic_lock_dark_a60_24dp</item>
|
||||
|
@ -609,7 +608,6 @@
|
|||
<item name="ic_insert_drive_file">@drawable/ic_insert_drive_file_light_a60_24dp</item>
|
||||
<item name="ic_integrations_a60">@drawable/ic_integrations_light_a60_24dp</item>
|
||||
<item name="ic_invites_a60">@drawable/ic_invites_light_a60_24dp</item>
|
||||
<item name="ic_join_server">@drawable/ic_rotate_90_degrees_ccw_grey_a60_24dp</item>
|
||||
<item name="ic_link_a60">@drawable/ic_link_light_a60_24dp</item>
|
||||
<item name="ic_locale_a60">@drawable/ic_locale_light_a60_24dp</item>
|
||||
<item name="ic_lock">@drawable/ic_lock_light_a60_24dp</item>
|
||||
|
|