From 8aa3165449dd2757e016bdc43cfd5d111cd4c7a6 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:54:06 +0800
Subject: [PATCH] 修改了家庭资产的显示问题
---
app/src/main/res/layout/activity_income_and_expenses_detail.xml | 67 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/activity_income_and_expenses_detail.xml b/app/src/main/res/layout/activity_income_and_expenses_detail.xml
index ae9cbae..e20bab9 100644
--- a/app/src/main/res/layout/activity_income_and_expenses_detail.xml
+++ b/app/src/main/res/layout/activity_income_and_expenses_detail.xml
@@ -12,14 +12,33 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/titleBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="瀹跺涵鏀舵敮鍙拌处"
- app:titleGravity="left" />
+ app:titleGravity="left"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ android:visibility="@{viewModel.beanLiveData.ownData==1}"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}"
+ />
+ </FrameLayout>
+ </com.android.app_base.widget.ExtendTitleBar>
+
<ScrollView
android:layout_width="match_parent"
@@ -27,7 +46,7 @@
>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="20dp"
android:paddingBottom="20dp"
@@ -36,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dp_20"
- android:text="鍩洪噾/鍙拌处"
+ android:text="鍙拌处"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -48,9 +67,11 @@
android:inputType="text"
android:autofillHints="creditCardNumber"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ彴璐:``}"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@{viewModel.beanLiveData.type==0?`鍩洪噾`:`鍙拌处`}"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:text="@={viewModel.beanLiveData.type}"
/>
<TextView
@@ -63,12 +84,18 @@
/>
<EditText
+ android:id="@+id/et_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:inputType="text"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃堕棿`:``}"
+ android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.createTime}"
+ android:backgroundTint="#6B000000"
+ app:isEditable="@{false}"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -78,15 +105,21 @@
android:textColor="#767375"
android:textSize="12sp"
/>
+
<EditText
+ android:id="@+id/et_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:text="@{viewModel.beanLiveData.price}"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏀跺叆/鏀嚭`:``}"
+ android:text="@={viewModel.beanLiveData.price}"
android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:backgroundTint="#6B000000"
+ app:isEditable="@{false}"
+ android:enabled="@{viewModel.typeLiveData}"
android:textSize="16sp" />
+
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -101,7 +134,9 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ敤閫擿:``}"
android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
android:text="@={viewModel.beanLiveData.useFor}"
android:textSize="16sp" />
<TextView
@@ -117,15 +152,17 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:inputType="text"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ娇鐢ㄤ汉`:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
android:text="@={viewModel.beanLiveData.usePeople}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鐜伴噾/鑷姩鍒掓墸"
+ android:text="鏀粯鏂瑰紡"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -134,15 +171,17 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:inputType="text"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ敮浠樻柟寮廯:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@{viewModel.beanLiveData.kind==0?`鐜伴噾`:`鑷姩鍒掓墸`}"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:text="@={viewModel.beanLiveData.kind}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="浣欓"
+ android:text="閲戦"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -151,8 +190,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:inputType="text"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ラ噾棰漙:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
android:text="@={viewModel.beanLiveData.balance}"
android:textSize="16sp" />
<TextView
@@ -168,8 +209,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:inputType="text"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ娉╜:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
android:text="@={viewModel.beanLiveData.remark}"
android:textSize="16sp" />
<TextView
--
Gitblit v1.9.1