From 040f1aba13b179ff318366680a6346af7fd97795 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 11 四月 2025 16:11:23 +0800
Subject: [PATCH] feat(generallibrary): 新增补卡功能并优化底部导航栏
---
generallibrary/src/main/res/layout/activity_main.xml | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 57 insertions(+), 54 deletions(-)
diff --git a/generallibrary/src/main/res/layout/activity_main.xml b/generallibrary/src/main/res/layout/activity_main.xml
index e655d2c..cd5ed8a 100644
--- a/generallibrary/src/main/res/layout/activity_main.xml
+++ b/generallibrary/src/main/res/layout/activity_main.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffff">
@@ -12,115 +13,117 @@
android:layout_height="match_parent"
android:layout_above="@id/bottom_navigation" />
+ <!-- 搴曢儴瀵艰埅闃村奖 -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="3dp"
+ android:layout_above="@id/bottom_navigation"
+ android:background="@drawable/shadow_gradient" />
<LinearLayout
android:id="@+id/bottom_navigation"
android:layout_width="match_parent"
- android:layout_height="70dp"
+ android:layout_height="55dp"
android:layout_alignParentBottom="true"
- android:layout_marginTop="-20dp"
- android:background="#00ffffff"
+ android:background="#FFFFFF"
+ android:elevation="8dp"
android:gravity="bottom"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/BSCardLL"
android:layout_width="0dp"
- android:layout_height="50dp"
+ android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@color/bottom_color"
+ android:background="@drawable/tab_selector_background"
+ android:clickable="true"
+ android:focusable="true"
+ android:foreground="@drawable/bottom_tab_selector"
android:gravity="center"
android:orientation="vertical">
- <RelativeLayout
- android:layout_width="25dp"
- android:layout_height="33dp">
- <ImageView
- android:id="@+id/BSCardImg"
- android:layout_width="wrap_content"
- android:layout_height="25dp"
- android:layout_marginTop="8dp"
- android:src="@drawable/bottom_card_black" />
+ <ImageView
+ android:id="@+id/BSCardImg"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginTop="6dp"
+ android:src="@drawable/bottom_card_black" />
-
- </RelativeLayout>
<TextView
android:id="@+id/BSCardText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
android:layout_marginBottom="3dp"
android:text="鍒跺崱"
-
+ android:textColor="@drawable/text_color_selector"
android:textSize="12sp" />
</LinearLayout>
- <FrameLayout
+
+ <LinearLayout
android:id="@+id/rechargeLL"
android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_gravity="center"
android:layout_weight="1"
- android:gravity="bottom"
+ android:background="@drawable/tab_selector_background"
+ android:clickable="true"
+ android:focusable="true"
+ android:foreground="@drawable/bottom_tab_selector"
+ android:gravity="center"
android:orientation="vertical">
- <View
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_gravity="bottom"
- android:background="@color/bottom_color"
- android:orientation="vertical" />
+ <ImageView
+ android:id="@+id/rechargeImg"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginTop="6dp"
+ android:src="@drawable/bottom_recharge_white" />
- <LinearLayout
- android:layout_width="80dp"
- android:layout_height="70dp"
- android:layout_gravity="center"
- android:background="@drawable/bottom_circle_bg"
- android:gravity="center"
- android:orientation="vertical">
+ <TextView
+ android:id="@+id/rechargeText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:layout_marginBottom="3dp"
+ android:text="鍏呭��"
+ android:textColor="@color/white"
+ android:textSize="12sp" />
- <ImageView
- android:id="@+id/rechargeImg"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:layout_marginTop="8dp"
- android:src="@drawable/bottom_recharge_white" />
+ </LinearLayout>
- <TextView
- android:id="@+id/rechargeText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍏呭��"
- android:textColor="@color/white"
- android:textSize="15sp" />
-
- </LinearLayout>
-
- </FrameLayout>
<LinearLayout
android:id="@+id/myLL"
android:layout_width="0dp"
- android:layout_height="50dp"
+ android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@color/bottom_color"
+ android:background="@drawable/tab_selector_background"
+ android:clickable="true"
+ android:focusable="true"
+ android:foreground="@drawable/bottom_tab_selector"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/myImg"
- android:layout_width="wrap_content"
- android:layout_height="25dp"
- android:layout_marginTop="8dp"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginTop="6dp"
android:src="@drawable/bottom_my_black" />
<TextView
android:id="@+id/myText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
android:layout_marginBottom="3dp"
android:text="鎴戠殑"
+ android:textColor="@drawable/text_color_selector"
android:textSize="12sp" />
</LinearLayout>
--
Gitblit v1.8.0