Changes of com.discord v1077

This commit is contained in:
root 2020-03-25 23:26:17 +01:00
parent f238cbac41
commit fd9571e717
988 changed files with 32067 additions and 38711 deletions

View file

@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
<com.discord.views.StatusView android:id="@id/add_friend_user_item_status" android:layout_width="16.0dip" android:layout_height="wrap_content" android:translationX="2.0dip" android:translationY="2.0dip" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="3.0dip" app:sv_corner_radius="4.0dip" />
<LinearLayout android:gravity="start|center" android:id="@id/add_friend_user_item_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_buttons" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:id="@id/add_friend_user_item_name" android:maxLines="1" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:ellipsize="end" android:id="@id/add_friend_user_item_name_secondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.SingleLine" />
</LinearLayout>
<LinearLayout android:id="@id/add_friend_user_item_buttons" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_send_button" android:layout_width="wrap_content" android:layout_height="wrap_content" app:srcCompat="@drawable/ic_add_friend_send" />
<androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_check_image" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:srcCompat="@drawable/ic_add_friend_green_check" />
</LinearLayout>
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
<com.discord.views.StatusView android:id="@id/add_friend_user_item_status" android:layout_width="16.0dip" android:layout_height="wrap_content" android:translationX="2.0dip" android:translationY="2.0dip" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="4.0dip" />
<TextView android:id="@id/add_friend_user_item_name" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/add_friend_user_item_name_secondary" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_name" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_send" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Subtext.SingleLine" />
<com.google.android.material.button.MaterialButton android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Material.Button.Outline" />
<com.google.android.material.button.MaterialButton android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Material.Button.Green.Outline" />
<TextView android:textColor="?primary_500" android:gravity="center" android:id="@id/add_friend_user_item_sent" android:visibility="gone" android:minWidth="90.0dip" android:text="@string/invite_friend_modal_sent" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout style="@style/UiKit.ViewGroup.Page"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:android="http://schemas.android.com/apk/res/android">
<com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" style="@style/AppTheme.AppBarLayout.Flat">
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
<com.google.android.material.tabs.TabLayout android:id="@id/action_bar_tabs" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabGravity="fill" app:tabIndicatorColor="?tabSelectedTextColor" app:tabIndicatorHeight="0.0dip" app:tabMaxWidth="0.0dip" app:tabMode="fixed" app:tabSelectedTextColor="?tabSelectedTextColor" app:tabTextAppearance="@style/App.TabLayout.FriendsAdd.Text" app:tabTextColor="?tabTextColor">
<com.google.android.material.tabs.TabItem android:id="@id/tab_item_username" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/username" />
<com.google.android.material.tabs.TabItem android:id="@id/tab_item_nearby" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/nearby_scan" />
</com.google.android.material.tabs.TabLayout>
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/friends_add_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/action_bar_toolbar_layout">
<fragment android:id="@id/friends_add_by_id" android:layout_width="fill_parent" android:layout_height="fill_parent" class="com.discord.widgets.friends.WidgetFriendsAddById" />
<fragment android:id="@id/friends_add_nearby" android:layout_width="fill_parent" android:layout_height="fill_parent" class="com.discord.widgets.friends.WidgetFriendsFindNearby" />
</com.discord.app.AppViewFlipper>
<LinearLayout android:id="@id/friends_add_container" android:layout_below="@id/action_bar_toolbar_layout" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/add_friend_add_manually" style="@style/UiKit.Settings.Item.Header" />
<TextView android:textColor="?primary_400" android:text="@string/add_friend_no_capitalization" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<LinearLayout android:id="@id/friends_add_header" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.google.android.material.textfield.TextInputLayout android:id="@id/friends_add_text_edit_wrap" android:layout_width="fill_parent" android:hint=" " android:layout_weight="6.0" style="@style/UiKit.Form.Field.EditText.Wrap">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/friends_add_text_edit" android:hint="@string/add_friend_input_hint" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.SingleLine" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton android:enabled="false" android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:layout_gravity="end|center|top" android:id="@id/friends_add_send" android:layout_marginTop="12.0dip" android:text="@string/send" android:maxLines="1" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Fit" />
</LinearLayout>
</LinearLayout>
<fragment android:id="@id/friends_add_nearby" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/friends_add_container" class="com.discord.widgets.friends.WidgetFriendsFindNearby" />
</RelativeLayout>

View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView android:scrollbars="none" style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center" android:id="@id/friends_add_container" android:background="?colorBackgroundPrimary" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_save_your_group" android:contentDescription="@string/sample_empty_string" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_by_id_title" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/add_by_id_body" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout">
<com.google.android.material.textfield.TextInputLayout android:id="@id/friends_add_text_edit_wrap" android:layout_marginBottom="@dimen/uikit_spacing_small" android:hint="@string/username" style="@style/UiKit.Material.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText android:id="@id/friends_add_text_edit" android:singleLine="true" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<com.google.android.material.button.MaterialButton android:enabled="false" android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:id="@id/friends_add_send" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/add_friend_add_manually" android:maxLines="1" style="@style/UiKit.Material.Button.Fit" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -1,12 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="220.0dip" android:layout_height="220.0dip" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/nearby_friends_searching_title" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_title" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/nearby_friends_searching_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/add_friend_nearby_body" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="center" android:id="@id/nearby_friends_learn_more" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/learn_more" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Link" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.RecyclerView" />
<com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@id/nearby_friends_enable" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/UiKit.Material.Button" />
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout">
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<TextView android:layout_gravity="start|center" android:text="@string/add_friend_nearby" style="@style/UiKit.Settings.Item.Header" />
<TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="end|center" android:id="@id/nearby_friends_learn_more" android:text="@string/learn_more" android:layout_marginEnd="@dimen/uikit_spacing_large" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Link" />
</FrameLayout>
<com.discord.app.AppViewFlipper android:id="@id/nearby_friends_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
<TextView android:gravity="center" android:layout_gravity="center" android:id="@id/nearby_friends_error" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_enable_settings_android" android:drawableTop="?img_addfriends_notconnected" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
<LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="220.0dip" android:layout_height="220.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
<TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:padding="@dimen/uikit_spacing_small" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
</com.discord.app.AppViewFlipper>
<com.discord.app.AppViewFlipper android:id="@id/nearby_friends_button_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@id/nearby_friends_enable" android:layout_width="fill_parent" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/UiKit.Material.Button" />
<com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@id/nearby_friends_disable" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_disable_scanning" android:textAllCaps="true" style="@style/UiKit.Material.Button.Outline" />
</com.discord.app.AppViewFlipper>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View file

@ -6,7 +6,7 @@
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_profile_sheet_constraint_layout" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_banner" android:layout_width="0.0dip" android:layout_height="wrap_content" app:actualImageScaleType="centerCrop" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:viewAspectRatio="1.78" />
<androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_icon_card" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" app:contentPadding="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="@id/guild_profile_sheet_banner" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_banner">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" app:roundWithOverlayColor="?colorBackgroundTertiary" app:roundedCornerRadius="16.0dip" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" app:roundedCornerRadius="16.0dip" />
<TextView android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_profile_sheet_icon_name" android:padding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Large.SingleLine" />
</androidx.cardview.widget.CardView>
<LinearLayout android:id="@id/guild_profile_sheet_content_container" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_icon_card" style="@style/UiKit.ViewGroup.LinearLayout">

View file

@ -2,7 +2,7 @@
<FrameLayout style="@style/UiKit.ViewGroup.Page"
xmlns:android="http://schemas.android.com/apk/res/android">
<include layout="@layout/widget_main_panel_loading" />
<com.discord.widgets.main.OverlappingPanelsLayout android:id="@id/widget_home_overlapping_panels_container" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="fill_parent">
<com.discord.widgets.main.OverlappingPanelsLayout android:id="@id/widget_home_overlapping_panels_container" style="@style/UiKit.ViewGroup.Page">
<include android:id="@id/main_panel_left" layout="@layout/widget_main_panel_left" />
<include layout="@layout/widget_main_panel_center" />
<include layout="@layout/widget_main_panel_right" />