diff --git a/app/src/main/res/color/color_tabbar_title.xml b/app/src/main/res/color/color_tabbar_title.xml index b91c6c6..e6bf7b9 100644 --- a/app/src/main/res/color/color_tabbar_title.xml +++ b/app/src/main/res/color/color_tabbar_title.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable-xxhdpi/ic_coin_w.png b/app/src/main/res/drawable-xxhdpi/ic_coin_w.png index bbfaa89..0a89331 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_coin_w.png and b/app/src/main/res/drawable-xxhdpi/ic_coin_w.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tabbar_content_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tabbar_content_selected.png index 607dd45..af55946 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tabbar_content_selected.png and b/app/src/main/res/drawable-xxhdpi/ic_tabbar_content_selected.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_normal.png b/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_normal.png index db5b289..75d9c45 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_normal.png and b/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_normal.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_selected.png index aee34d2..4c85af2 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_selected.png and b/app/src/main/res/drawable-xxhdpi/ic_tabbar_explorer_selected.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tabbar_live_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tabbar_live_selected.png index a4529c1..bc5f2bf 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tabbar_live_selected.png and b/app/src/main/res/drawable-xxhdpi/ic_tabbar_live_selected.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tabbar_message_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tabbar_message_selected.png index 4ab6c90..cf979be 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tabbar_message_selected.png and b/app/src/main/res/drawable-xxhdpi/ic_tabbar_message_selected.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_tabbar_my_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tabbar_my_selected.png index 92ba532..586de53 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_tabbar_my_selected.png and b/app/src/main/res/drawable-xxhdpi/ic_tabbar_my_selected.png differ diff --git a/app/src/main/res/drawable/bg_round_corner_16_7_transparent_b38fff.xml b/app/src/main/res/drawable/bg_round_corner_16_7_transparent_b38fff.xml new file mode 100644 index 0000000..c98950d --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_16_7_transparent_b38fff.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_004b6c.xml b/app/src/main/res/drawable/bg_round_corner_6_7_004b6c.xml new file mode 100644 index 0000000..d8f5551 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_6_7_004b6c.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index d7fbb9f..7351098 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/app/src/main/res/layout/fragment_my.xml @@ -149,7 +149,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="26.7dp" - android:background="@drawable/bg_round_corner_6_7_352953_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="13.3dp" @@ -188,8 +188,8 @@ android:layout_height="wrap_content" android:layout_marginStart="5.3dp" android:layout_marginEnd="2.7dp" - android:gravity="center" android:contentDescription="@null" + android:gravity="center" android:src="@drawable/ic_can" /> @@ -237,7 +237,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="13.3dp" - android:background="@drawable/bg_round_corner_6_7_352953_9970ff" + android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" android:gravity="center" android:paddingVertical="13.3dp"> @@ -254,7 +254,7 @@ android:layout_marginEnd="4dp" android:fontFamily="@font/gmarket_sans_medium" android:text="라이브" - android:textColor="@color/color_eeeeee" + android:textColor="@color/color_80d8ff" android:textSize="14.7sp" /> @@ -313,7 +313,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:background="@drawable/bg_round_corner_6_7_664aab" + android:background="@drawable/bg_round_corner_6_7_13181b" android:paddingHorizontal="13.3dp" android:paddingVertical="20dp"> @@ -342,7 +342,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:background="@drawable/bg_round_corner_6_7_664aab" + android:background="@drawable/bg_round_corner_6_7_004b6c" android:fontFamily="@font/gmarket_sans_bold" android:paddingHorizontal="13.3dp" android:paddingVertical="20dp" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3c8fc0f..f5bc41a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -102,4 +102,6 @@ #2E6279 #CF5C37 #FFE500 + #B38FFF + #004B6C