diff --git a/summer_coding_android/app/src/main/res/drawable/banner.jpg b/summer_coding_android/app/src/main/res/drawable/banner.jpg new file mode 100644 index 0000000..7f3bdcf Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/banner.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/barcode.jpg b/summer_coding_android/app/src/main/res/drawable/barcode.jpg new file mode 100644 index 0000000..0261231 Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/barcode.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/cake_round.xml b/summer_coding_android/app/src/main/res/drawable/cake_round.xml new file mode 100644 index 0000000..84f5ff0 --- /dev/null +++ b/summer_coding_android/app/src/main/res/drawable/cake_round.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/summer_coding_android/app/src/main/res/drawable/cake_rsv.jpg b/summer_coding_android/app/src/main/res/drawable/cake_rsv.jpg new file mode 100644 index 0000000..1466428 Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/cake_rsv.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/coupon.jpg b/summer_coding_android/app/src/main/res/drawable/coupon.jpg new file mode 100644 index 0000000..fcc1c0b Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/coupon.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/delivery.jpg b/summer_coding_android/app/src/main/res/drawable/delivery.jpg new file mode 100644 index 0000000..7be7979 Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/delivery.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/hollys_card.jpg b/summer_coding_android/app/src/main/res/drawable/hollys_card.jpg new file mode 100644 index 0000000..4efdfe9 Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/hollys_card.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/hollys_mall.jpg b/summer_coding_android/app/src/main/res/drawable/hollys_mall.jpg new file mode 100644 index 0000000..b7e9d26 Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/hollys_mall.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/menu.jpg b/summer_coding_android/app/src/main/res/drawable/menu.jpg new file mode 100644 index 0000000..9e6186d Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/menu.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/menu_round.xml b/summer_coding_android/app/src/main/res/drawable/menu_round.xml new file mode 100644 index 0000000..8d1231d --- /dev/null +++ b/summer_coding_android/app/src/main/res/drawable/menu_round.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/summer_coding_android/app/src/main/res/drawable/round.xml b/summer_coding_android/app/src/main/res/drawable/round.xml new file mode 100644 index 0000000..49284fc --- /dev/null +++ b/summer_coding_android/app/src/main/res/drawable/round.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/summer_coding_android/app/src/main/res/drawable/smart_order.jpg b/summer_coding_android/app/src/main/res/drawable/smart_order.jpg new file mode 100644 index 0000000..9cbd358 Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/smart_order.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/stamp.jpg b/summer_coding_android/app/src/main/res/drawable/stamp.jpg new file mode 100644 index 0000000..8a8b1b1 Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/stamp.jpg differ diff --git a/summer_coding_android/app/src/main/res/drawable/store.jpg b/summer_coding_android/app/src/main/res/drawable/store.jpg new file mode 100644 index 0000000..3e4470f Binary files /dev/null and b/summer_coding_android/app/src/main/res/drawable/store.jpg differ diff --git a/summer_coding_android/app/src/main/res/layout/activity_yesxon.xml b/summer_coding_android/app/src/main/res/layout/activity_yesxon.xml index 9dfaf69..b4272ca 100644 --- a/summer_coding_android/app/src/main/res/layout/activity_yesxon.xml +++ b/summer_coding_android/app/src/main/res/layout/activity_yesxon.xml @@ -1,9 +1,312 @@ - + tools:context=".yesxon.YesxonActivity" + android:background="@color/white"> + + + + + + + + + //회색 레이아웃 + + + //할리스몰 + + + + //스탬프 + + + + //매장 + + + + //할리스 카드 + + + + //쿠폰 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/summer_coding_android/app/src/main/res/values/colors.xml b/summer_coding_android/app/src/main/res/values/colors.xml index 5e62036..10de4d0 100644 --- a/summer_coding_android/app/src/main/res/values/colors.xml +++ b/summer_coding_android/app/src/main/res/values/colors.xml @@ -7,6 +7,11 @@ #FF018786 #FF000000 #FFFFFFFF + + + #BA000D + #F4F4F4 + #696F7F #FEE300 @@ -14,4 +19,5 @@ #333A58 #252A3F #8f949f + \ No newline at end of file diff --git a/summer_coding_android/build.gradle b/summer_coding_android/build.gradle index f0335fb..17f0646 100644 --- a/summer_coding_android/build.gradle +++ b/summer_coding_android/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.1.0' apply false - id 'com.android.library' version '7.1.0' apply false - id 'org.jetbrains.kotlin.android' version '1.6.10' apply false + id 'com.android.application' version '7.1.3' apply false + id 'com.android.library' version '7.1.3' apply false + id 'org.jetbrains.kotlin.android' version '1.5.30' apply false } task clean(type: Delete) {