Skip to content

A
android_fiveworld
Commit eb1a045a authored by 张释方's avatar 张释方
Browse files
Options

Merge branch 'dev_1.0.0' of http://gitlab.mints-id.com/android/android_street into branche_zsf

parents 62909d0d 8220094b
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 57 deletions
app/src/main/res/layout/activity_aboutus.xml
View file @ eb1a045a
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp" android:layout_marginRight="30dp"
android:gravity="center" android:gravity="center"
android:text="Copyright © 2019 Inc.." android:text="Copyright © 2019-2021 Inc.."
android:textColor="@color/color_333" android:textColor="@color/color_333"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_moresettings.xml
View file @ eb1a045a
...@@ -15,62 +15,46 @@ ...@@ -15,62 +15,46 @@
<include layout="@layout/include_header" /> <include layout="@layout/include_header" />
<com.mints.street.widget.ElasticScrollView <include
android:layout_width="match_parent" android:id="@+id/item_phone"
android:layout_height="wrap_content" layout="@layout/item_settings" />
android:overScrollMode="never">
<View
<LinearLayout style="@style/view_line_E6E6E6"
android:id="@+id/ly_linear" android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_marginStart="20dp"
android:layout_height="match_parent"
android:elevation="5dp" android:layout_marginEnd="20dp" />
android:orientation="vertical">
<include
<include android:id="@+id/item_userAgree"
android:id="@+id/item_phone" layout="@layout/item_settings" />
layout="@layout/item_settings" />
<View
<View style="@style/view_line_E6E6E6"
style="@style/view_line_E6E6E6" android:layout_alignParentBottom="true"
android:layout_alignParentBottom="true" android:layout_marginStart="20dp"
android:layout_marginStart="20dp" android:layout_marginEnd="20dp" />
android:layout_marginEnd="20dp" /> <include
android:id="@+id/item_privacyAgree"
<include layout="@layout/item_settings" />
android:id="@+id/item_userAgree"
layout="@layout/item_settings" /> <Button
android:id="@+id/btn_switch"
<View android:layout_width="200dp"
style="@style/view_line_E6E6E6" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_gravity="center"
android:layout_marginStart="20dp" android:layout_marginTop="20dp"
android:layout_marginEnd="20dp" /> android:layout_marginBottom="20dp"
android:background="@drawable/shape_btn_switch"
<include android:text="退出登录"
android:id="@+id/item_privacyAgree" android:textColor="@color/white"
layout="@layout/item_settings" /> android:textSize="16sp" />
<View
<Button android:id="@+id/el_view"
android:id="@+id/btn_switch" android:layout_width="wrap_content"
android:layout_width="200dp" android:layout_height="wrap_content"/>
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shape_btn_switch"
android:text="退出登录"
android:textColor="@color/white"
android:textSize="16sp" />
<View
android:id="@+id/el_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</com.mints.street.widget.ElasticScrollView>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment