Showing
7 changed files
with
30 additions
and
8 deletions
19.4 KB
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | + android:shape="rectangle"> | ||
| 4 | + <gradient | ||
| 5 | + android:startColor="@color/cos_green3" | ||
| 6 | + android:centerColor="@color/cos_cyan" | ||
| 7 | + android:type="linear"/> | ||
| 8 | +<!-- <corners--> | ||
| 9 | +<!-- android:radius="9dp"/>--> | ||
| 10 | + | ||
| 11 | +<!-- <stroke android:width="2dp"--> | ||
| 12 | +<!-- android:color="@color/white_tr"/>--> | ||
| 13 | +</shape> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | xmlns:app="http://schemas.android.com/apk/res-auto" | 3 | xmlns:app="http://schemas.android.com/apk/res-auto" |
| 4 | xmlns:tools="http://schemas.android.com/tools" | 4 | xmlns:tools="http://schemas.android.com/tools" |
| 5 | android:layout_width="@dimen/width_full" | 5 | android:layout_width="@dimen/width_full" |
| 6 | - android:layout_height="240dp" | 6 | + android:layout_height="@dimen/height_carousel" |
| 7 | android:layout_marginLeft="10dp" | 7 | android:layout_marginLeft="10dp" |
| 8 | android:background="@drawable/bottom_border"> | 8 | android:background="@drawable/bottom_border"> |
| 9 | 9 | ... | ... |
| ... | @@ -4,8 +4,7 @@ | ... | @@ -4,8 +4,7 @@ |
| 4 | xmlns:app="http://schemas.android.com/apk/res-auto" | 4 | xmlns:app="http://schemas.android.com/apk/res-auto" |
| 5 | xmlns:tools="http://schemas.android.com/tools" | 5 | xmlns:tools="http://schemas.android.com/tools" |
| 6 | android:layout_width="match_parent" | 6 | android:layout_width="match_parent" |
| 7 | - android:layout_height="match_parent" | 7 | + android:layout_height="match_parent"> |
| 8 | - android:background="@color/cos_cyan"> | ||
| 9 | 8 | ||
| 10 | <RelativeLayout | 9 | <RelativeLayout |
| 11 | android:layout_width="match_parent" | 10 | android:layout_width="match_parent" |
| ... | @@ -18,7 +17,7 @@ | ... | @@ -18,7 +17,7 @@ |
| 18 | android:layout_height="wrap_content" | 17 | android:layout_height="wrap_content" |
| 19 | android:background="@android:color/white" | 18 | android:background="@android:color/white" |
| 20 | android:paddingHorizontal="16dp" | 19 | android:paddingHorizontal="16dp" |
| 21 | - android:paddingVertical="16dp"> | 20 | + android:paddingTop="16dp"> |
| 22 | 21 | ||
| 23 | <de.hdodenhof.circleimageview.CircleImageView | 22 | <de.hdodenhof.circleimageview.CircleImageView |
| 24 | android:id="@+id/user_img" | 23 | android:id="@+id/user_img" |
| ... | @@ -94,19 +93,26 @@ | ... | @@ -94,19 +93,26 @@ |
| 94 | </androidx.constraintlayout.widget.ConstraintLayout> | 93 | </androidx.constraintlayout.widget.ConstraintLayout> |
| 95 | 94 | ||
| 96 | <RelativeLayout | 95 | <RelativeLayout |
| 96 | + android:layout_width="wrap_content" | ||
| 97 | + android:layout_height="wrap_content" | ||
| 98 | + android:layout_below="@+id/rl_header" | ||
| 99 | + android:background="@drawable/home_bg"> | ||
| 100 | + | ||
| 101 | + <RelativeLayout | ||
| 97 | android:id="@+id/rl_home_campaigns" | 102 | android:id="@+id/rl_home_campaigns" |
| 98 | android:layout_width="match_parent" | 103 | android:layout_width="match_parent" |
| 99 | android:layout_height="wrap_content" | 104 | android:layout_height="wrap_content" |
| 100 | - android:layout_below="@id/rl_header" | 105 | + android:layout_marginTop="50dp"> |
| 101 | - android:layout_marginTop="16dp"> | ||
| 102 | 106 | ||
| 103 | <androidx.recyclerview.widget.RecyclerView | 107 | <androidx.recyclerview.widget.RecyclerView |
| 104 | android:id="@+id/rv_home_campaigns" | 108 | android:id="@+id/rv_home_campaigns" |
| 105 | android:layout_width="match_parent" | 109 | android:layout_width="match_parent" |
| 106 | android:layout_height="wrap_content" | 110 | android:layout_height="wrap_content" |
| 107 | android:layout_marginBottom="8dp" | 111 | android:layout_marginBottom="8dp" |
| 112 | + android:background="#80FFFFFF" | ||
| 108 | android:clipToPadding="false" | 113 | android:clipToPadding="false" |
| 109 | android:orientation="horizontal" | 114 | android:orientation="horizontal" |
| 115 | + android:paddingVertical="15dp" | ||
| 110 | android:paddingStart="10dp" | 116 | android:paddingStart="10dp" |
| 111 | android:paddingEnd="10dp" /> | 117 | android:paddingEnd="10dp" /> |
| 112 | </RelativeLayout> | 118 | </RelativeLayout> |
| ... | @@ -121,7 +127,6 @@ | ... | @@ -121,7 +127,6 @@ |
| 121 | android:id="@+id/rv_home_coupons" | 127 | android:id="@+id/rv_home_coupons" |
| 122 | android:layout_width="match_parent" | 128 | android:layout_width="match_parent" |
| 123 | android:layout_height="wrap_content" | 129 | android:layout_height="wrap_content" |
| 124 | - android:layout_marginBottom="8dp" | ||
| 125 | android:clipToPadding="false" | 130 | android:clipToPadding="false" |
| 126 | android:orientation="horizontal" | 131 | android:orientation="horizontal" |
| 127 | android:paddingStart="10dp" | 132 | android:paddingStart="10dp" |
| ... | @@ -141,7 +146,7 @@ | ... | @@ -141,7 +146,7 @@ |
| 141 | android:layout_width="match_parent" | 146 | android:layout_width="match_parent" |
| 142 | android:layout_height="40dp" | 147 | android:layout_height="40dp" |
| 143 | android:layout_below="@+id/rl_home_info_widget" | 148 | android:layout_below="@+id/rl_home_info_widget" |
| 144 | - android:layout_marginTop="20dp" | 149 | + android:layout_marginTop="25dp" |
| 145 | android:background="@android:color/white" | 150 | android:background="@android:color/white" |
| 146 | android:paddingHorizontal="25dp" | 151 | android:paddingHorizontal="25dp" |
| 147 | android:paddingTop="10dp" | 152 | android:paddingTop="10dp" |
| ... | @@ -232,4 +237,5 @@ | ... | @@ -232,4 +237,5 @@ |
| 232 | </LinearLayout> | 237 | </LinearLayout> |
| 233 | </HorizontalScrollView> | 238 | </HorizontalScrollView> |
| 234 | </RelativeLayout> | 239 | </RelativeLayout> |
| 240 | + </RelativeLayout> | ||
| 235 | </ScrollView> | 241 | </ScrollView> | ... | ... |
| ... | @@ -13,6 +13,7 @@ | ... | @@ -13,6 +13,7 @@ |
| 13 | <color name="cos_cyan">#A3F2DA</color> | 13 | <color name="cos_cyan">#A3F2DA</color> |
| 14 | <color name="grey_light">#f1f1f2</color> | 14 | <color name="grey_light">#f1f1f2</color> |
| 15 | <color name="cos_green2">#52DF5A</color> | 15 | <color name="cos_green2">#52DF5A</color> |
| 16 | + <color name="cos_green3">#68BB7E</color> | ||
| 16 | <color name="green_dark">#1DA87A</color> | 17 | <color name="green_dark">#1DA87A</color> |
| 17 | <color name="cos_blue2">#0478BE</color> | 18 | <color name="cos_blue2">#0478BE</color> |
| 18 | <color name="white_tr2">#77FFFFFF</color> | 19 | <color name="white_tr2">#77FFFFFF</color> | ... | ... |
-
Please register or login to post a comment