Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

week 1 #9

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

week 1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0547ffb
week 1
JJJoonngg Aug 4, 2022
66cfd50
Merge branch 'main' into yesxon_week1
JJJoonngg Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added summer_coding_android/app/src/main/res/drawable/banner.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/barcode.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions summer_coding_android/app/src/main/res/drawable/cake_round.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
>
<corners
android:topLeftRadius="50dp"
android:bottomLeftRadius="50dp"
/>
</shape>
Binary file added summer_coding_android/app/src/main/res/drawable/cake_rsv.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/coupon.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/delivery.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/hollys_card.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/hollys_mall.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/menu.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions summer_coding_android/app/src/main/res/drawable/menu_round.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
>
<corners
android:bottomLeftRadius="25dp"/>
</shape>
8 changes: 8 additions & 0 deletions summer_coding_android/app/src/main/res/drawable/round.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:padding="10dp"
android:shape="rectangle">

<corners android:radius="25dp"/>
<solid android:color="@color/hollys_red" />
</shape>
Binary file added summer_coding_android/app/src/main/res/drawable/smart_order.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/stamp.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added summer_coding_android/app/src/main/res/drawable/store.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
307 changes: 305 additions & 2 deletions summer_coding_android/app/src/main/res/layout/activity_yesxon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,312 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"

<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".yesxon.YesxonActivity">
tools:context=".yesxon.YesxonActivity"
android:background="@color/white">

<TextView
android:id="@+id/grade"
android:layout_width="120dp"
android:layout_height="30dp"
android:background="@drawable/round"
android:layout_marginTop="20dp"
android:text=" SILVER"
android:textStyle="bold"
android:textSize="16sp"
android:textColor="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
Comment on lines +12 to +25
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<TextView
android:id="@+id/grade"
android:layout_width="120dp"
android:layout_height="30dp"
android:background="@drawable/round"
android:layout_marginTop="20dp"
android:text=" SILVER"
android:textStyle="bold"
android:textSize="16sp"
android:textColor="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
<TextView
android:id="@+id/grade"
android:layout_width="120dp"
android:layout_height="30dp"
android:background="@drawable/round"
android:layout_marginTop="20dp"
android:text="SILVER"
android:textStyle="bold"
android:textSize="16sp"
android:textColor="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:drawableEndCompat="@drawable/barcode_resize"
android:paddingHorizontal="10dp"
android:gravity="center_vertical"
android:includeFontPadding="false"/>

TextView에 이미지 넣는 속성값 있으니까 이거 사용해보는 것도 좋아
" SILVER" 이런거는 마진이나 패딩 사용하기

drawble/barcode_resize

<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item
        android:drawable="@drawable/barcode"
        android:width="30dp"
        android:height="20dp" />
</layer-list>

image


<ImageView
android:id="@+id/barcodeImage"
android:layout_width="40dp"
android:layout_height="30dp"
android:src="@drawable/barcode"
app:layout_constraintTop_toTopOf="@id/grade"
app:layout_constraintRight_toRightOf="@id/grade"
android:layout_marginEnd="5dp"
/>

<ImageView
android:id="@+id/menuImage"
android:layout_width="40dp"
android:layout_height="30dp"
android:src="@drawable/menu"
app:layout_constraintTop_toTopOf="@id/grade"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="15dp"
/>

<TextView
android:id="@+id/recommend"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:text="박예선님, 상큼달콤한 여름 스무디를 즐겨보세요"
android:textSize="14sp"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TextView마다 textSize를 어떤애는 sp를 쓰고, 또 다른애는 dp를 쓰는데 sp와 dp의 차이 공부해보면 좋을 것 같아

android:textColor="@color/black"
android:layout_marginTop="8sp"
app:layout_constraintTop_toBottomOf="@id/grade"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
/>
//회색 레이아웃
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="510dp"
android:background="@color/hollys_gray"
app:layout_constraintTop_toBottomOf="@id/delivery"
>

//할리스몰
<TextView
android:id="@+id/hollysMallText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16dp"
android:text="할리스 몰"
app:layout_constraintBottom_toTopOf="@id/banner"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="70dp"
android:layout_marginBottom="40dp"
/>
<ImageView
android:id="@+id/hollysMallImage"
android:layout_width="50dp"
android:layout_height="48dp"
android:src="@drawable/hollys_mall"
app:layout_constraintBottom_toTopOf="@id/hollysMallText"
app:layout_constraintStart_toStartOf="@id/hollysMallText"
app:layout_constraintEnd_toEndOf="@id/hollysMallText"
android:layout_marginBottom="5dp"
/>

//스탬프
<TextView
android:id="@+id/stampText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16dp"
android:text="3/12"
app:layout_constraintBottom_toTopOf="@id/hollysMallImage"
app:layout_constraintStart_toStartOf="@id/hollysMallImage"
app:layout_constraintEnd_toEndOf="@id/hollysMallImage"
android:layout_marginBottom="40dp"
/>
<ImageView
android:id="@+id/stampImage"
android:layout_width="75dp"
android:layout_height="70dp"
android:src="@drawable/stamp"
app:layout_constraintBottom_toTopOf="@id/stampText"
app:layout_constraintStart_toStartOf="@id/stampText"
app:layout_constraintEnd_toEndOf="@id/stampText"
/>

//매장
<TextView
android:id="@+id/storeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16dp"
android:text="매장"
app:layout_constraintBottom_toBottomOf="@id/hollysMallText"
app:layout_constraintStart_toEndOf="@id/hollysMallText"
android:layout_marginStart="50dp"
/>
<ImageView
android:id="@+id/storeImage"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/store"
app:layout_constraintBottom_toTopOf="@id/storeText"
app:layout_constraintStart_toStartOf="@id/storeText"
app:layout_constraintEnd_toEndOf="@id/storeText"
android:layout_marginBottom="5dp"
/>

//할리스 카드
<TextView
android:id="@+id/cardText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16dp"
android:text="할리스 카드"
app:layout_constraintBottom_toBottomOf="@id/stampText"
app:layout_constraintStart_toStartOf="@id/storeText"
app:layout_constraintEnd_toEndOf="@id/storeText"
/>
<ImageView
android:id="@+id/cardImage"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/hollys_card"
app:layout_constraintBottom_toTopOf="@id/cardText"
app:layout_constraintStart_toStartOf="@id/storeText"
app:layout_constraintEnd_toEndOf="@id/storeText"
android:layout_marginBottom="5dp"
/>

//쿠폰
<TextView
android:id="@+id/couponText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16dp"
android:text="쿠폰"
app:layout_constraintBottom_toBottomOf="@id/stampText"
app:layout_constraintStart_toStartOf="@id/cakeRsvText"
app:layout_constraintEnd_toEndOf="@id/cakeRsvText"
/>
<ImageView
android:id="@+id/couponImage"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/coupon"
app:layout_constraintBottom_toTopOf="@id/couponText"
app:layout_constraintStart_toStartOf="@id/cakeRsvText"
app:layout_constraintEnd_toEndOf="@id/cakeRsvText"
android:layout_marginBottom="5dp"
/>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="170dp"
android:layout_height="100dp"
android:background="@drawable/cake_round"
android:backgroundTint="@color/hollys_red"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/banner"
android:layout_marginBottom="35dp"
>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/cakeRsvText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="16dp"
android:text="홀케이크 예약"
app:layout_constraintBottom_toBottomOf="@id/hollysMallText"
app:layout_constraintStart_toEndOf="@id/storeText"
android:layout_marginStart="50dp"
/>
<ImageView
android:id="@+id/cakeRsvImage"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/cake_rsv"
app:layout_constraintBottom_toTopOf="@id/storeText"
app:layout_constraintStart_toStartOf="@id/cakeRsvText"
app:layout_constraintEnd_toEndOf="@id/cakeRsvText"
android:layout_marginBottom="5dp"
/>

<ImageView
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="112dp"
android:src="@drawable/banner"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/smartOrder"
android:layout_width="match_parent"
android:layout_height="220dp"
android:backgroundTint="@color/hollys_red"
android:background="@drawable/menu_round"
app:layout_constraintTop_toTopOf="@id/delivery"
>
<TextView
android:id="@+id/smartOrderText1"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginStart="30dp"
android:text="스마트오더"
android:textColor="@color/white"
android:textStyle="bold"
android:textSize="25sp"
app:layout_constraintBottom_toBottomOf="@id/smartOrderText2"
android:layout_marginBottom="30dp"
app:layout_constraintStart_toStartOf="@id/smartOrder"
/>
<TextView
android:id="@+id/smartOrderText2"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginStart="32dp"
android:text="줄서지 않고 주문하세요"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@id/smartOrder"
app:layout_constraintStart_toStartOf="@id/smartOrder"
android:layout_marginBottom="10dp"
/>
<ImageView
android:id="@+id/smartOrderImage"
android:layout_width="120dp"
android:layout_height="80dp"
android:src="@drawable/smart_order"
app:layout_constraintEnd_toEndOf="@id/smartOrder"
app:layout_constraintBottom_toBottomOf="@id/smartOrder"
android:layout_marginEnd="13dp"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/delivery"
android:layout_width="match_parent"
android:layout_height="110dp"
android:backgroundTint="@color/white"
android:background="@drawable/menu_round"
android:layout_marginTop="20dp"
app:layout_constraintTop_toBottomOf="@id/recommend"
>
<TextView
android:id="@+id/deliveryText1"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginStart="30dp"
android:text="딜리버리"
android:textColor="@color/black"
android:textStyle="bold"
android:textSize="25sp"
app:layout_constraintTop_toTopOf="@id/delivery"
android:layout_marginTop="30dp"
app:layout_constraintStart_toStartOf="@id/delivery"
/>
<TextView
android:id="@+id/deliveryText2"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginStart="32dp"
android:text="이제는 집에서 즐기는 할리스"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintTop_toTopOf="@id/deliveryText1"
app:layout_constraintBottom_toBottomOf="@id/delivery"
app:layout_constraintStart_toStartOf="@id/delivery"
android:layout_marginTop="20dp"
/>
<ImageView
android:id="@+id/deliveryImage"
android:layout_width="120dp"
android:layout_height="80dp"
android:src="@drawable/delivery"
app:layout_constraintEnd_toEndOf="@id/delivery"
app:layout_constraintBottom_toBottomOf="@id/delivery"
android:layout_marginEnd="20dp"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
6 changes: 6 additions & 0 deletions summer_coding_android/app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>


<color name="hollys_red">#BA000D</color>
<color name="hollys_gray">#F4F4F4</color>

<color name="white_gray">#696F7F</color>

<color name="kakao_yellow">#FEE300</color>
<color name="kakao_gray">#DEE8EF</color>
<color name="kakao_blue">#333A58</color>
<color name="kakao_dark_blue">#252A3F</color>
<color name="kakao_dark_gray">#8f949f</color>

</resources>
6 changes: 3 additions & 3 deletions summer_coding_android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down