diff --git a/.idea/misc.xml b/.idea/misc.xml index b516350..eb489d3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,10 @@ diff --git a/app/src/main/res/drawable/dark_round.xml b/app/src/main/res/drawable/dark_round.xml index d2095a4..ccc45c0 100755 --- a/app/src/main/res/drawable/dark_round.xml +++ b/app/src/main/res/drawable/dark_round.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/permotion_round.xml b/app/src/main/res/drawable/permotion_round.xml new file mode 100644 index 0000000..b7d8b2b --- /dev/null +++ b/app/src/main/res/drawable/permotion_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/red_round.xml b/app/src/main/res/drawable/red_round.xml new file mode 100755 index 0000000..2f8a503 --- /dev/null +++ b/app/src/main/res/drawable/red_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bf7d098..a3d2ef5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,8 +11,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/white" - android:elevation="5dp" - android:padding="15dp"> + android:elevation="0dp" + android:paddingLeft="15dp" + android:paddingTop="10dp" + android:paddingRight="15dp" + android:paddingBottom="10dp"> @@ -29,11 +32,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" - android:layout_marginTop="15dp" + android:layout_marginTop="10dp" android:layout_marginRight="15dp" android:layout_marginBottom="5dp" android:background="@drawable/dark_round" - android:elevation="3dp" + android:elevation="0dp" android:gravity="center"> + android:paddingLeft="20dp" + android:paddingTop="10dp" + android:paddingRight="20dp" + android:paddingBottom="10dp"> + + + + @@ -151,6 +188,22 @@ android:layout_marginEnd="5dp" android:src="@mipmap/wechat_icon" /> + + - - @@ -204,8 +247,39 @@ android:layout_marginLeft="15dp" android:layout_marginTop="10dp" android:layout_marginRight="15dp" - android:background="@drawable/white_round" - android:elevation="2dp" + android:background="@drawable/permotion_round" + android:elevation="0dp" + android:gravity="center" + android:orientation="horizontal" + android:padding="10dp"> + + + + + + + @@ -300,8 +374,8 @@ android:layout_marginLeft="15dp" android:layout_marginTop="15dp" android:layout_marginRight="15dp" - android:background="@drawable/white_round" - android:elevation="2dp" + android:background="@drawable/permotion_round" + android:elevation="0dp" android:gravity="center" android:orientation="vertical" android:paddingLeft="15dp" @@ -400,8 +474,8 @@ android:layout_marginLeft="15dp" android:layout_marginTop="15dp" android:layout_marginRight="15dp" - android:background="@drawable/white_round" - android:elevation="2dp" + android:background="@drawable/permotion_round" + android:elevation="0dp" android:gravity="center" android:orientation="vertical" android:paddingLeft="15dp" @@ -450,8 +524,8 @@ android:layout_marginTop="15dp" android:layout_marginRight="15dp" android:layout_marginBottom="10dp" - android:background="@drawable/white_round" - android:elevation="2dp" + android:background="@drawable/permotion_round" + android:elevation="0dp" android:gravity="center" android:orientation="vertical" android:paddingLeft="15dp"