Skip to content

L
LuckyFarm
Commit 0c98abe6 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

11

parent 11ac084b
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 174 deletions
app/src/main/res/layout/dialog_get_water_drop.xml
View file @ 0c98abe6
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
android:layout_height="350dp" android:layout_height="350dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:background="@mipmap/icon_content_bg"> android:background="@mipmap/icon_content_bg">
......
userinfo/src/main/res/layout/activity_setting.xml
View file @ 0c98abe6
...@@ -17,220 +17,221 @@ ...@@ -17,220 +17,221 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="26dp" android:layout_marginLeft="26dp"
android:src="@drawable/icon_back_red" /> android:src="@drawable/icon_back_red" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginTop="-20dp" android:layout_height="wrap_content"
android:layout_below="@+id/id_iv_back" android:layout_below="@+id/id_iv_back"
android:layout_height="wrap_content"> android:layout_marginTop="-35dp">
<!-- android:background="@drawable/icon_rl_content"--> <!-- android:background="@drawable/icon_rl_content"-->
<ImageView <ImageView
android:background="@drawable/icon_rl_content"
android:adjustViewBounds="true"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"
android:layout_marginTop="20dp"
<androidx.core.widget.NestedScrollView android:layout_marginBottom="20dp"
android:paddingBottom="40dp" android:adjustViewBounds="true"
android:paddingTop="40dp" android:background="@drawable/icon_rl_content" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<LinearLayout <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:paddingTop="40dp"
android:paddingBottom="40dp"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="14dp"
android:background="@drawable/icon_setting_item_bg">
<TextView
android:id="@+id/id_tv_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="17dp"
android:paddingTop="19dp"
android:paddingRight="20dp"
android:paddingBottom="20dp"
android:text="ID:1234567"
android:textColor="#642D2D"
android:textSize="15sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/id_iv_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:src="@drawable/icon_setting_copy_btn" />
</RelativeLayout>
>
<FrameLayout
android:id="@+id/id_ad_frame_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="30dp"
android:layout_marginTop="14dp"
android:layout_marginRight="18dp"
android:layout_marginBottom="20dp"
android:padding="5dp"
android:visibility="visible" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginRight="8dp"
android:background="@drawable/icon_ll_bg"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_marginLeft="30dp"
android:paddingLeft="16dp" android:layout_marginRight="8dp"
android:paddingTop="40dp" android:layout_marginBottom="14dp"
android:paddingRight="20dp" android:background="@drawable/icon_setting_item_bg">
android:paddingBottom="10dp">
<TextView <TextView
android:layout_width="0dp" android:id="@+id/id_tv_id"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:paddingLeft="17dp"
android:text="联系我们" android:paddingTop="19dp"
android:paddingRight="20dp"
android:paddingBottom="20dp"
android:text="ID:1234567"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="15sp" /> android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_qq"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="官方QQ：1234567"
android:textColor="#642D2D" />
<ImageView <ImageView
android:id="@+id/id_iv_copy"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/icon_setting_back" /> android:layout_alignParentRight="true"
</LinearLayout> android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:src="@drawable/icon_setting_copy_btn" />
</RelativeLayout>
<TextView
android:id="@+id/tv_setting_user_contact_us"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back"
android:paddingLeft="20dp"
android:paddingTop="17dp"
android:paddingRight="20dp"
android:paddingBottom="17dp"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:background="@drawable/bg_setting_line" />
<TextView <FrameLayout
android:id="@+id/id_setting_update_version" android:id="@+id/id_ad_frame_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back" android:layout_gravity="center_horizontal"
android:gravity="center_vertical" android:layout_marginLeft="30dp"
android:paddingLeft="16dp" android:layout_marginTop="14dp"
android:paddingTop="20dp" android:layout_marginRight="18dp"
android:paddingRight="20dp" android:layout_marginBottom="20dp"
android:paddingBottom="10dp" android:padding="5dp"
android:text="检查更新"
android:textColor="#642D2D"
android:textSize="15sp"
android:visibility="visible" /> android:visibility="visible" />
<View <LinearLayout
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:background="@drawable/bg_setting_line" />
<TextView
android:id="@+id/tv_setting_user_agreement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back" android:layout_marginLeft="30dp"
android:gravity="center_vertical" android:layout_marginRight="8dp"
android:paddingLeft="16dp" android:background="@drawable/icon_ll_bg"
android:paddingTop="20dp" android:orientation="vertical">
android:paddingRight="20dp"
android:paddingBottom="10dp"
android:text="@string/user_agreement"
android:textColor="#642D2D"
android:textSize="15sp" />
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:background="@drawable/bg_setting_line" />
<TextView <LinearLayout
android:id="@+id/tv_setting_privacy_policy" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:gravity="center_vertical"
android:drawableRight="@drawable/icon_setting_back" android:paddingLeft="16dp"
android:gravity="center_vertical" android:paddingTop="40dp"
android:paddingLeft="16dp" android:paddingRight="20dp"
android:paddingTop="20dp" android:paddingBottom="10dp">
android:paddingRight="20dp"
android:paddingBottom="10dp" <TextView
android:text="@string/user_privacy_policy" android:layout_width="0dp"
android:textColor="#642D2D" android:layout_height="wrap_content"
android:textSize="15sp" /> android:layout_weight="1"
android:text="联系我们"
<View android:textColor="#642D2D"
android:layout_width="match_parent" android:textSize="15sp" />
android:layout_height="3dp"
android:layout_marginLeft="14dp" <TextView
android:layout_marginRight="14dp" android:id="@+id/id_tv_qq"
android:background="@drawable/bg_setting_line" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="官方QQ：1234567"
android:textColor="#642D2D" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_setting_back" />
</LinearLayout>
<TextView <TextView
android:id="@+id/tv_setting_about_us" android:id="@+id/tv_setting_user_contact_us"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back" android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical" android:paddingLeft="20dp"
android:paddingLeft="16dp" android:paddingTop="17dp"
android:paddingTop="20dp" android:paddingRight="20dp"
android:paddingRight="20dp" android:paddingBottom="17dp"
android:paddingBottom="40dp" android:visibility="gone" />
android:text="@string/user_about_us"
android:textColor="#642D2D" <View
android:textSize="15sp" /> android:layout_width="match_parent"
</LinearLayout> android:layout_height="3dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:background="@drawable/bg_setting_line" />
</LinearLayout> <TextView
android:id="@+id/id_setting_update_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingTop="20dp"
android:paddingRight="20dp"
android:paddingBottom="10dp"
android:text="检查更新"
android:textColor="#642D2D"
android:textSize="15sp"
android:visibility="visible" />
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:background="@drawable/bg_setting_line" />
<TextView
android:id="@+id/tv_setting_user_agreement"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingTop="20dp"
android:paddingRight="20dp"
android:paddingBottom="10dp"
android:text="@string/user_agreement"
android:textColor="#642D2D"
android:textSize="15sp" />
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:background="@drawable/bg_setting_line" />
<TextView
android:id="@+id/tv_setting_privacy_policy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingTop="20dp"
android:paddingRight="20dp"
android:paddingBottom="10dp"
android:text="@string/user_privacy_policy"
android:textColor="#642D2D"
android:textSize="15sp" />
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:background="@drawable/bg_setting_line" />
<TextView
android:id="@+id/tv_setting_about_us"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingTop="20dp"
android:paddingRight="20dp"
android:paddingBottom="40dp"
android:text="@string/user_about_us"
android:textColor="#642D2D"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</RelativeLayout> </RelativeLayout>
......
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