xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'OutDoor/httpSignore' into httpSignore

Browse Source 
# Conflicts:
#	app/src/main/res/layout/poi_fragment.xml
This commit is contained in:
wds
2021-08-12 13:13:42 +08:00
parent 1942162fa4 b88aca24e4
commit f5155b11ac
10 changed files with 78 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,6 +153,7 @@
android:background="@null"
android:hint="6-20位密码"
android:paddingTop="10dp"
android:inputType="textPassword"
android:layout_marginLeft="20dp"
android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
@@ -190,6 +191,7 @@
android:hint="请再次输入一遍密码"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:inputType="textPassword"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:layout_marginLeft="20dp"

13
app/src/main/res/layout/fragment_register.xml
View File

@@ -233,14 +233,15 @@
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"/>
<ImageView
<CheckBox
android:id="@+id/iv_register_check"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@drawable/select_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:buttonTint="@color/white"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"
android:layout_marginTop="5dp"/>
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"