Design : Change a font tukcomCD2024#85

From Nano Sans KR to pretendard
ksh-g001 · Jun 1, 2024 · 2617af6 · 2617af6
1 parent 2043932
commit 2617af6
Show file tree

Hide file tree

Showing 28 changed files with 103 additions and 57 deletions.
diff --git a/android/HowAboutTrip/app/build.gradle.kts b/android/HowAboutTrip/app/build.gradle.kts
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId = "com.project.how"
-        minSdk = 29
+        minSdk = 30
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"

diff --git a/.../HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/AiScheduleAdapter.kt b/.../HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/AiScheduleAdapter.kt
@@ -82,7 +82,7 @@ class AiScheduleAdapter(private val context: Context, data : List<AiSchedule>, p
 
     private fun getDaysTitle(data : AiSchedule, tabNum: Int): Any? {
         val startDate = LocalDate.parse(data.startDate, DateTimeFormatter.ISO_DATE)
-        val formatter = DateTimeFormatter.ofPattern("MM.dd")
+        val formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd")
         return startDate.plusDays(tabNum.toLong()).format(formatter)
     }
 

diff --git a/...tTrip/app/src/main/java/com/project/how/adapter/recyclerview/OneWayAirplaneListAdapter.kt b/...tTrip/app/src/main/java/com/project/how/adapter/recyclerview/OneWayAirplaneListAdapter.kt
@@ -35,7 +35,8 @@ class OneWayAirplaneListAdapter(private val context: Context, private val data :
             binding.abroadAirport.text = context.getString(
                 R.string.fligths_airport,
                 data.departureIataCode,
-                data.arrivalIataCode
+                data.arrivalIataCode,
+                data.carrierCode
             )
             binding.abroadNonStop.text = if (data.nonstop) context.getString(R.string.non_stop) else context.getString(R.string.stop, data.transferCount.toString())
             binding.abroadDuration.text = abroadDuration

diff --git a/...ip/app/src/main/java/com/project/how/adapter/recyclerview/RoundTripAirplaneListAdapter.kt b/...ip/app/src/main/java/com/project/how/adapter/recyclerview/RoundTripAirplaneListAdapter.kt
@@ -37,7 +37,8 @@ class RoundTripAirplaneListAdapter(private val context: Context, private val dat
             binding.abroadAirport.text = context.getString(
                 R.string.fligths_airport,
                 data.departureIataCode,
-                data.arrivalIataCode
+                data.arrivalIataCode,
+                data.carrierCode
             )
             binding.abroadNonStop.text = if (data.nonstop) context.getString(R.string.non_stop) else context.getString(R.string.stop, data.transferCount.toString())
             binding.abroadDuration.text = abroadDuration
@@ -51,7 +52,8 @@ class RoundTripAirplaneListAdapter(private val context: Context, private val dat
             binding.homeAirport.text = context.getString(
                 R.string.fligths_airport,
                 data.arrivalIataCode,
-                data.departureIataCode
+                data.departureIataCode,
+                data.carrierCode
             )
             binding.homeNonStop.text = if (data.nonstop) context.getString(R.string.non_stop) else context.getString(R.string.stop, data.transferCount.toString())
             binding.homeDuration.text = homeDuration

diff --git a/...boutTrip/app/src/main/java/com/project/how/view/activity/calendar/CalendarEditActivity.kt b/...boutTrip/app/src/main/java/com/project/how/view/activity/calendar/CalendarEditActivity.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.MotionEvent
+import android.view.View
 import android.view.ViewGroup
 import android.view.ViewParent
 import android.widget.LinearLayout
@@ -128,26 +129,26 @@ class CalendarEditActivity
 
             supportMapFragment.getMapAsync(this@CalendarEditActivity)
 
-            supportMapFragment.view?.setOnTouchListener { v, event ->
-                when (event.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        v.parent.requestDisallowInterceptTouchEvent(false)
-                    }
-                    MotionEvent.ACTION_UP -> {
-                        v.parent.requestDisallowInterceptTouchEvent(true)
-                    }
-                }
-                false
-            }
-
-            binding.scrollView.setOnTouchListener { v, event ->
-                when (event.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        v.parent.parent.requestDisallowInterceptTouchEvent(false)
-                    }
-                }
-                false
-            }
+//            supportMapFragment.view?.setOnTouchListener { v, event ->
+//                var parent : ViewParent? = v.parent
+//                while(v != null){
+//                    if (parent is NestedScrollView){
+//                        Log.d("CalendarEditActivity", "parent is NestedScrollView")
+//                        when (event.action) {
+//                            MotionEvent.ACTION_DOWN -> {
+//                                parent.requestDisallowInterceptTouchEvent(true)
+//                                Log.d("CalendarEditActivity", "MotionEvent.ACTION_DOWN\nparent.requestDisallowInterceptTouchEvent(true)")
+//                            }
+//                            MotionEvent.ACTION_UP -> {
+//                                parent.requestDisallowInterceptTouchEvent(false)
+//                                Log.d("CalendarEditActivity", "MotionEvent.ACTION_UP\nparent.requestDisallowInterceptTouchEvent(false)")
+//                            }
+//                        }
+//                    }
+//                    parent = parent?.parent
+//                }
+//                false
+//            }
 
             adapter.itemDragListener(object : ItemStartDragListener {
                 override fun onDropActivity(

diff --git a/android/HowAboutTrip/app/src/main/java/com/project/how/view/dialog/AiScheduleDialog.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/view/dialog/AiScheduleDialog.kt
@@ -139,6 +139,6 @@ class AiScheduleDialog(private val data : AiSchedule, private val onAddListener:
     companion object{
         const val TAB_ITEM_MARGIN = 8
         const val TAB_ITEM_WIDTH = 70
-        const val TAB_ITEM_HEIGHT = 22
+        const val TAB_ITEM_HEIGHT = 24
     }
 }
diff --git a/android/HowAboutTrip/app/src/main/java/com/project/how/view_model/AiScheduleViewModel.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/view_model/AiScheduleViewModel.kt
@@ -90,7 +90,7 @@ class AiScheduleViewModel : ViewModel() {
         val country = createScheduleListRequest.destination
         val startDate = createScheduleListRequest.departureDate
         val endDate = createScheduleListRequest.returnDate
-        val place = createScheduleResponse.schedules[0].scheduleDetail
+        val place = createScheduleResponse.schedules[0].scheduleDetail + createScheduleResponse.schedules[1].scheduleDetail
         val dailySchedule = mutableListOf<MutableList<AiDaysSchedule>>()
         for (i in createScheduleResponse.schedules.indices){
             val oneDaySchedule = mutableListOf<AiDaysSchedule>()

diff --git a/android/HowAboutTrip/app/src/main/res/drawable/black_bottom_round_rectangle.xml b/android/HowAboutTrip/app/src/main/res/drawable/black_bottom_round_rectangle.xml
@@ -1,7 +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="24dp" android:bottomRightRadius="24dp"/>
+    <corners android:bottomLeftRadius="14dp" android:bottomRightRadius="14dp"/>
     <solid android:color="@color/black"/>
 
 </shape>
diff --git a/android/HowAboutTrip/app/src/main/res/drawable/black_dialog_yes.xml b/android/HowAboutTrip/app/src/main/res/drawable/black_dialog_yes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:bottomRightRadius="24dp"/>
+    <corners android:bottomRightRadius="14dp"/>
     <solid android:color="@color/black"/>
 </shape>
diff --git a/android/HowAboutTrip/app/src/main/res/drawable/black_round_rectangle.xml b/android/HowAboutTrip/app/src/main/res/drawable/black_round_rectangle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="24dp"/>
+    <corners android:radius="14dp"/>
     <solid android:color="@color/black"/>
 </shape>
diff --git a/android/HowAboutTrip/app/src/main/res/drawable/gray_dialog_no.xml b/android/HowAboutTrip/app/src/main/res/drawable/gray_dialog_no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:bottomLeftRadius="24dp"/>
+    <corners android:bottomLeftRadius="14dp"/>
     <solid android:color="@color/gray"/>
 </shape>
diff --git a/android/HowAboutTrip/app/src/main/res/drawable/gray_round_rectangle.xml b/android/HowAboutTrip/app/src/main/res/drawable/gray_round_rectangle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="25dp"/>
+    <corners android:radius="14dp"/>
     <size android:width="41dp"
         android:height="19dp"/>
     <solid android:color="@color/gray"/>

diff --git a/android/HowAboutTrip/app/src/main/res/drawable/white_round_bottom_sheet_background.xml b/android/HowAboutTrip/app/src/main/res/drawable/white_round_bottom_sheet_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:topLeftRadius="24dp"
-        android:topRightRadius="24dp"/>
+    <corners android:topLeftRadius="14dp"
+        android:topRightRadius="14dp"/>
     <solid android:color="@color/white"/>
 </shape>
diff --git a/android/HowAboutTrip/app/src/main/res/drawable/white_round_rectangle.xml b/android/HowAboutTrip/app/src/main/res/drawable/white_round_rectangle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white"/>
-    <corners android:radius="24dp"/>
+    <corners android:radius="14dp"/>
 </shape>
diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard.xml b/android/HowAboutTrip/app/src/main/res/font/pretendard.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+
+    <font
+        android:font="@font/pretendard_regular"
+        android:fontStyle="normal"
+        android:fontWeight="250"
+        app:font="@font/pretendard_regular"
+        app:fontStyle="normal"
+        app:fontWeight="350"/>
+
+    <font
+        android:font="@font/pretendard_medium"
+        android:fontStyle="normal"
+        android:fontWeight="400"
+        app:font="@font/pretendard_medium"
+        app:fontStyle="normal"
+        app:fontWeight="500" />
+
+    <font
+        android:font="@font/pretendard_semi_bold"
+        android:fontStyle="normal"
+        android:fontWeight="550"
+        app:font="@font/pretendard_semi_bold"
+        app:fontStyle="normal"
+        app:fontWeight="650" />
+
+    <font
+        android:font="@font/pretendard_bold"
+        android:fontStyle="normal"
+        android:fontWeight="700"
+        app:font="@font/pretendard_bold"
+        app:fontStyle="normal"
+        app:fontWeight="1000" />
+
+
+</font-family>
diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_black.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_black.otf
diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_bold.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_bold.otf
diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_medium.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_medium.otf
diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_regular.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_regular.otf
diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_semi_bold.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_semi_bold.otf
diff --git a/android/HowAboutTrip/app/src/main/res/layout/activity_login.xml b/android/HowAboutTrip/app/src/main/res/layout/activity_login.xml
@@ -17,6 +17,7 @@
             android:id="@+id/lottie"
             android:layout_width="250dp"
             android:layout_height="200dp"
+            android:scaleType="fitEnd"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -35,7 +36,7 @@
             android:gravity="center"
             android:text="@string/login_under_text"
             android:textColor="@color/black"
-            android:textSize="16sp"
+            android:textSize="18sp"
             android:layout_marginTop="10dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -54,7 +55,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textView"
-            app:layout_constraintVertical_bias="0.2"
+            app:layout_constraintVertical_bias="0.8"
             android:contentDescription="@string/google_login_content_desciption" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/android/HowAboutTrip/app/src/main/res/layout/activity_sign_up.xml b/android/HowAboutTrip/app/src/main/res/layout/activity_sign_up.xml
@@ -49,7 +49,6 @@
             android:text="@string/sign_up_info_context"
             android:textSize="13sp"
             android:textColor="@color/black"
-            android:fontFamily="@font/noto_sans_kr_regular"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/info_title" />
@@ -80,7 +79,6 @@
             android:inputType="text"
             android:textColor="@color/black"
             android:hint="@string/sign_up_name_hint"
-            android:fontFamily="@font/noto_sans_kr_regular"
             android:background="@android:color/transparent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/info_name" />
@@ -110,7 +108,6 @@
             android:hint="@string/sign_up_info_phone_hint"
             android:textColor="@color/black"
             android:maxLength="13"
-            android:fontFamily="@font/noto_sans_kr_regular"
             android:background="@android:color/transparent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/info_phone" />
@@ -145,7 +142,6 @@
             android:id="@+id/birth"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/noto_sans_kr_regular"
             android:hint="YYYYMMDD"
             android:maxLength="8"
             android:background="@android:color/transparent"

diff --git a/android/HowAboutTrip/app/src/main/res/layout/calendar_bottom_sheet.xml b/android/HowAboutTrip/app/src/main/res/layout/calendar_bottom_sheet.xml
@@ -83,7 +83,6 @@
                 android:id="@+id/sun"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/noto_sans_kr_bold"
                 android:gravity="center"
                 android:text="@string/sunday"
                 android:textColor="@color/black"
@@ -99,7 +98,6 @@
                 android:id="@+id/mon"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/noto_sans_kr_bold"
                 android:gravity="center"
                 android:text="@string/monday"
                 android:textColor="@color/black"
@@ -115,7 +113,6 @@
                 android:id="@+id/tue"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/noto_sans_kr_bold"
                 android:gravity="center"
                 android:text="@string/tuesday"
                 android:textColor="@color/black"
@@ -131,7 +128,6 @@
                 android:id="@+id/wed"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/noto_sans_kr_bold"
                 android:gravity="center"
                 android:text="@string/wednesday"
                 android:textColor="@color/black"
@@ -147,7 +143,6 @@
                 android:id="@+id/thu"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/noto_sans_kr_bold"
                 android:gravity="center"
                 android:text="@string/thursday"
                 android:textColor="@color/black"
@@ -163,7 +158,6 @@
                 android:id="@+id/fri"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/noto_sans_kr_bold"
                 android:gravity="center"
                 android:text="@string/friday"
                 android:textColor="@color/black"
@@ -179,7 +173,6 @@
                 android:id="@+id/sat"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/noto_sans_kr_bold"
                 android:gravity="center"
                 android:text="@string/saturday"
                 android:textColor="@color/black"

diff --git a/android/HowAboutTrip/app/src/main/res/values-night/themes.xml b/android/HowAboutTrip/app/src/main/res/values-night/themes.xml
@@ -4,12 +4,14 @@
         <item name="android:statusBarColor" >@color/white</item>
         <item name="android:windowBackground">@color/white</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:fontFamily">@font/pretendard</item>
         <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.App.DatePicker</item>
     </style>
 
     <style name="Theme.HowAboutTrip.BlackStatusBar" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="android:statusBarColor" >@color/black</item>
         <item name="android:windowBackground">@color/white</item>
+        <item name="android:fontFamily">@font/pretendard</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
     <style name="Base.Widget.AppCompat.Button.BlackRound" parent="Widget.AppCompat.Button">
@@ -21,6 +23,12 @@
         <item name="android:gravity">center</item>
     </style>
 
+    <style name="SimpleTimePicker">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/black</item>
+    </style>
+
     <style name="WhiteTopShadowBottomAppBar" parent="Widget.MaterialComponents.BottomAppBar">
         <item name="android:background">@color/white</item>
         <item name="android:backgroundTint">@android:color/transparent</item>
@@ -29,11 +37,6 @@
         <item name="android:itemBackground">@color/white</item>
         <item name="android:background">@android:color/transparent</item>
     </style>
-    <style name="SimpleTimePicker">
-        <item name="android:textSize">20sp</item>
-        <item name="android:fontFamily">@font/noto_sans_kr_bold</item>
-        <item name="android:textColor">@color/black</item>
-    </style>
 
     <style name="TabItemTextSize" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">13sp</item>
@@ -68,9 +71,9 @@
         <item name="background">@color/white</item>
         <item name="android:textColor">@color/black</item>
         <item name="rangeFillColor">@color/black</item>
+        <item name="colorSurface">@color/white</item>
         <item name="daySelectedStyle">@style/daySelected</item>
         <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.App.SmallComponent</item>
         <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>
     </style>
-    e>
 </resources>
diff --git a/android/HowAboutTrip/app/src/main/res/values/font_style.xml b/android/HowAboutTrip/app/src/main/res/values/font_style.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+</resources>