1.闪屏页UI适配 2.搜索页面UI调整

2021-12-15 10:57:44 +08:00
parent 258b87f1b7
commit bb10359612
14 changed files with 29 additions and 28 deletions
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java
@@ -59,7 +59,7 @@ public class ContactsIndicatorAdapter extends CommonNavigatorAdapter {
        indicator.setLineHeight(UIUtil.dip2px(mContext, 5));
        indicator.setRoundRadius(UIUtil.dip2px(mContext, 5));
        indicator.setLineWidth(UIUtil.dip2px(mContext, 9));
-        indicator.setColors(context.getResources().getColor(R.color.white));
+        indicator.setColors(context.getResources().getColor(R.color.app_248cfe));
        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
        lp.bottomMargin = mBottomMargin;
        indicator.setLayoutParams(lp);
@@ -92,13 +92,13 @@ public class ContactsIndicatorAdapter extends CommonNavigatorAdapter {
        @Override
        public void onSelected(int index, int totalCount) {
 //            setBackgroundResource(R.drawable.shape_bg_contact_indicator_item);
-            setTextColor(getResources().getColor(R.color.white));
+            setTextColor(getResources().getColor(R.color.color_333333));
        }

        @Override
        public void onDeselected(int index, int totalCount) {
 //            setBackgroundDrawable(null);
-            setTextColor(getResources().getColor(R.color.text_secondary_4f516a));
+            setTextColor(getResources().getColor(R.color.color_666666));
        }

        @Override
--- a/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomDialog.kt
@@ -22,24 +22,19 @@ class RecommendRoomDialog : BaseDialog<DialogRecommendRoomBinding>() {

    }

-
    private val roomInfo: HomeRoomInfo by lazy { requireArguments().getSerializable("roomInfo") as HomeRoomInfo }

-
    @SuppressLint("CheckResult")
    override fun init() {
        binding.ivClose.setOnClickListener {
            dismissAllowingStateLoss()
        }
-
        binding.tvGo.setOnClickListener {
            dismissAllowingStateLoss()
            AVRoomActivity.start(context, roomInfo.uid)
-
        }
        binding.tvRoomTitle.text = roomInfo.title
        ImageLoadUtils.loadImage(context, roomInfo.avatar, binding.ivAvatar)
    }

-
 }
--- a/app/src/main/res/drawable-hdpi/splash_logo.png
+++ b/app/src/main/res/drawable-hdpi/splash_logo.png
--- a/app/src/main/res/drawable-xhdpi/splash_bg.png
+++ b/app/src/main/res/drawable-xhdpi/splash_bg.png
--- a/app/src/main/res/drawable-xhdpi/splash_bottom.png
+++ b/app/src/main/res/drawable-xhdpi/splash_bottom.png
--- a/app/src/main/res/drawable-xhdpi/splash_logo.png
+++ b/app/src/main/res/drawable-xhdpi/splash_logo.png
--- a/app/src/main/res/drawable/bg_search_edit.xml
+++ b/app/src/main/res/drawable/bg_search_edit.xml
@@ -7,5 +7,5 @@
        android:radius="14.5dp"
        />
    <solid
-        android:color="#35354B" />
+        android:color="@color/white" />
 </shape>
--- a/app/src/main/res/drawable/bg_splash.xml
+++ b/app/src/main/res/drawable/bg_splash.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@color/white"
-        android:gravity="fill" />
+    <item>
+        <bitmap
+            android:gravity="fill"
+            android:src="@drawable/splash_bg" />
+    </item>
+
+    <item android:top="200dp">
+        <bitmap
+            android:gravity="center_horizontal|top"
+            android:src="@drawable/splash_logo" />
+    </item>

    <item>
        <bitmap
-            android:gravity="center"
-            android:src="@drawable/splash_logo" />
+            android:gravity="bottom|end"
+            android:src="@drawable/splash_bottom" />
    </item>
 </layer-list>
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -20,7 +20,7 @@
            android:layout_gravity="center|start"
            android:background="@color/transparent"
            android:scaleType="centerInside"
-            android:src="@drawable/arrow_left_white" />
+            android:src="@drawable/arrow_left" />

        <LinearLayout
            android:layout_width="0dp"
@@ -74,7 +74,7 @@
            android:gravity="center"
            android:paddingEnd="16dp"
            android:text="@string/search"
-            android:textColor="@color/white"
+            android:textColor="@color/color_333333"
            android:textSize="16sp" />

    </LinearLayout>
@@ -91,7 +91,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/label_search_history"
-            android:textColor="@color/white"
+            android:textColor="@color/color_333333"
            android:textSize="@dimen/dp_13"
            app:layout_constraintBottom_toBottomOf="@id/fl_clear_search_history"
            app:layout_constraintStart_toStartOf="parent"
@@ -135,7 +135,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/label_room_history"
-            android:textColor="@color/white"
+            android:textColor="@color/color_333333"
            android:textSize="@dimen/dp_13"
            app:layout_constraintBottom_toBottomOf="@id/fl_clear_room_history"
            app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/dialog_recommend_room.xml
+++ b/app/src/main/res/layout/dialog_recommend_room.xml
@@ -55,7 +55,6 @@
            android:layout_width="180dp"
            android:layout_height="40dp"
            android:layout_marginTop="24dp"
-            android:layout_marginEnd="15dp"
            android:background="@drawable/bg_common_confirm"
            android:gravity="center"
            android:text="去看看"
--- a/app/src/main/res/layout/fragment_recommend.xml
+++ b/app/src/main/res/layout/fragment_recommend.xml
@@ -80,18 +80,17 @@
                                android:layout_width="0dp"
                                android:layout_height="wrap_content"
                                android:layout_weight="176"
-                                app:hw_ratio="0.285">
+                                app:hw_ratio="0.341">

                                <ImageView
                                    android:id="@+id/iv_resource_0"
                                    android:layout_width="match_parent"
                                    android:layout_height="match_parent"
                                    android:scaleType="centerCrop"
-                                    android:src="@drawable/ic_resource_0" />
+                                    android:src="@drawable/default_banner" />

                            </com.yizhuan.erban.ui.widget.RectLayout>

-
                            <View
                                android:layout_width="0dp"
                                android:layout_height="0dp"
@@ -103,7 +102,7 @@
                                android:layout_height="match_parent"
                                android:layout_weight="82"
                                android:scaleType="centerCrop"
-                                android:src="@drawable/ic_resource_1" />
+                                android:src="@drawable/default_banner" />

                            <View
                                android:layout_width="0dp"
@@ -116,7 +115,7 @@
                                android:layout_height="match_parent"
                                android:layout_weight="82"
                                android:scaleType="centerCrop"
-                                android:src="@drawable/ic_resource_2" />
+                                android:src="@drawable/default_banner" />

                        </LinearLayout>

--- a/app/src/main/res/layout/item_room_history.xml
+++ b/app/src/main/res/layout/item_room_history.xml
@@ -44,7 +44,7 @@
        android:layout_marginTop="2.5dp"
        android:singleLine="true"
        android:textSize="@dimen/dp_12"
-        android:textColor="@color/white"
+        android:textColor="@color/color_333333"
        tools:text="小小问问小问问小问问问问"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
--- a/app/src/main/res/layout/item_search_history.xml
+++ b/app/src/main/res/layout/item_search_history.xml
@@ -8,7 +8,7 @@
    android:paddingStart="12.5dp"
    android:paddingEnd="12.5dp"
    android:background="@drawable/bg_secondary_radius_15"
-    android:textColor="@color/white"
+    android:textColor="@color/color_333333"
    android:textSize="@dimen/dp_13"
    android:singleLine="true"
    tools:text="12345678901234567890"/>
--- a/app/src/main/res/layout/list_item_search.xml
+++ b/app/src/main/res/layout/list_item_search.xml
@@ -33,7 +33,7 @@
            android:layout_height="wrap_content"
            android:singleLine="true"
            android:maxWidth="120dp"
-            android:textColor="@color/white"
+            android:textColor="@color/text_title_white"
            android:textSize="15sp"
            tools:text="小涩瑶小涩瑶小涩瑶小涩瑶小涩瑶小涩瑶小涩瑶" />

@@ -73,7 +73,7 @@
            android:id="@+id/erban_no"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:textColor="@color/text_normal_c6c6e9"
+            android:textColor="@color/text_secondary_4f516a"
            android:gravity="center_vertical"
            android:textSize="@dimen/dp_12"
            tools:text="ID:8888"