admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jinyuera
2021-03-03 19:04:02 +08:00
parent 25baefb313 48e8f1f04b
commit ebe720b2f7
11 changed files with 210 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_main_tab.xml
View File

@@ -71,7 +71,7 @@
android:button="@null"
android:drawableTop="@drawable/main_bottom_1"
android:gravity="center"
android:text="发现"
android:text="邻里圈"
android:textColor="@color/radiobuttoncolor" />
<RadioButton

17
app/src/main/res/layout/dialog_add_family.xml
View File

@@ -7,27 +7,26 @@
android:padding="8dp"
android:layout_height="wrap_content">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_height="wrap_content">
<TextView
android:layout_width="0dp"
android:layout_width="wrap_content"
android:text="新增家庭成员"
android:textSize="16sp"
android:textColor="#000"
android:layout_weight="1"
android:layout_centerInParent="true"
android:gravity="center"
android:layout_height="30dp"/>
<ImageView
android:id="@+id/iv_close"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:src="@drawable/ic_close"/>
</LinearLayout>
</RelativeLayout>
<EditText
@@ -59,7 +58,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="注：添加新家庭成员需成员确认才添加成功"
android:text="注：请添加已注册手机用户"
android:textSize="12sp"
android:layout_marginRight="12dp"
android:layout_marginLeft="12dp"

2
app/src/main/res/layout/fragment_discovery.xml
View File

@@ -31,7 +31,7 @@
android:layout_marginLeft="16dp"
android:gravity="center"
android:layout_centerInParent="true"
android:text="发现"
android:text="邻里圈"
android:textColor="@color/white"
android:textSize="16sp"

2
app/src/main/res/layout/fragment_main.xml
View File

@@ -174,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/view"
android:layout_marginLeft="8dp"
android:text="发现精彩" />
android:text="社区精彩" />
<TextView
android:id="@+id/moew1"

2
app/src/main/res/layout/fragment_main4.xml
View File

@@ -190,7 +190,7 @@
android:textColor="#000"
android:layout_width="0dp"
android:layout_height="match_parent"
android:text="上传人脸"
android:text="人脸认证"
/>
<ImageView