diff --git a/android/HowAboutTrip/app/build.gradle.kts b/android/HowAboutTrip/app/build.gradle.kts index 8d2d6e2c..6ef309aa 100644 --- 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/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/AiScheduleAdapter.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/AiScheduleAdapter.kt index 352e34bf..1daa00ca 100644 --- a/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/AiScheduleAdapter.kt +++ b/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/AiScheduleAdapter.kt @@ -82,7 +82,7 @@ class AiScheduleAdapter(private val context: Context, data : List, 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/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/OneWayAirplaneListAdapter.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/OneWayAirplaneListAdapter.kt index 90169b05..4fc755e2 100644 --- a/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/OneWayAirplaneListAdapter.kt +++ b/android/HowAboutTrip/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/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/RoundTripAirplaneListAdapter.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/RoundTripAirplaneListAdapter.kt index 915bf724..ac0510bc 100644 --- a/android/HowAboutTrip/app/src/main/java/com/project/how/adapter/recyclerview/RoundTripAirplaneListAdapter.kt +++ b/android/HowAboutTrip/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/android/HowAboutTrip/app/src/main/java/com/project/how/view/activity/calendar/CalendarEditActivity.kt b/android/HowAboutTrip/app/src/main/java/com/project/how/view/activity/calendar/CalendarEditActivity.kt index 35402156..ba170ac3 100644 --- a/android/HowAboutTrip/app/src/main/java/com/project/how/view/activity/calendar/CalendarEditActivity.kt +++ b/android/HowAboutTrip/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 index 3cca85b6..e51606ec 100644 --- 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 } } \ No newline at end of file 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 index bdb5eb45..e04dd582 100644 --- 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>() for (i in createScheduleResponse.schedules.indices){ val oneDaySchedule = mutableListOf() 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 index 85cd21fa..89910454 100644 --- 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 @@ - + \ No newline at end of file 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 index 0ab1b610..7690646c 100644 --- 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 @@ - + \ No newline at end of file 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 index 1e117dd7..f76616bd 100644 --- 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 @@ - + \ No newline at end of file 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 index 7d229b13..30089b81 100644 --- 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 @@ - + \ No newline at end of file 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 index 76ef59ea..95c9f5ea 100644 --- 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 @@ - + 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 index bb7f3008..b145651e 100644 --- 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 @@ - + \ No newline at end of file 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 index aaecd296..9c387159 100644 --- 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 @@ - + \ No newline at end of file diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard.xml b/android/HowAboutTrip/app/src/main/res/font/pretendard.xml new file mode 100644 index 00000000..e290681d --- /dev/null +++ b/android/HowAboutTrip/app/src/main/res/font/pretendard.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_black.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_black.otf new file mode 100644 index 00000000..a0d849e7 Binary files /dev/null and b/android/HowAboutTrip/app/src/main/res/font/pretendard_black.otf differ diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_bold.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_bold.otf new file mode 100644 index 00000000..8e5e30a2 Binary files /dev/null and b/android/HowAboutTrip/app/src/main/res/font/pretendard_bold.otf differ diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_medium.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_medium.otf new file mode 100644 index 00000000..05750698 Binary files /dev/null and b/android/HowAboutTrip/app/src/main/res/font/pretendard_medium.otf differ diff --git a/android/HowAboutTrip/app/src/main/res/font/pretendard_regular.otf b/android/HowAboutTrip/app/src/main/res/font/pretendard_regular.otf new file mode 100644 index 00000000..08bf4cfc Binary files /dev/null and b/android/HowAboutTrip/app/src/main/res/font/pretendard_regular.otf differ 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 new file mode 100644 index 00000000..e7e36abc Binary files /dev/null and b/android/HowAboutTrip/app/src/main/res/font/pretendard_semi_bold.otf differ diff --git a/android/HowAboutTrip/app/src/main/res/layout/activity_login.xml b/android/HowAboutTrip/app/src/main/res/layout/activity_login.xml index 038709f2..e836075e 100644 --- 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" /> 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 index 9a1004de..4585faaa 100644 --- 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 index df837982..8fe06668 100644 --- 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 index a0a38286..0962dc3c 100644 --- 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 @@ @color/white @color/white true + @font/pretendard @style/ThemeOverlay.App.DatePicker + + - - e> \ No newline at end of file diff --git a/android/HowAboutTrip/app/src/main/res/values/font_style.xml b/android/HowAboutTrip/app/src/main/res/values/font_style.xml new file mode 100644 index 00000000..78554f9e --- /dev/null +++ b/android/HowAboutTrip/app/src/main/res/values/font_style.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/HowAboutTrip/app/src/main/res/values/strings.xml b/android/HowAboutTrip/app/src/main/res/values/strings.xml index 48ec1e94..82559aed 100644 --- a/android/HowAboutTrip/app/src/main/res/values/strings.xml +++ b/android/HowAboutTrip/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ HowAboutTrip - HowAboutTrip에서\n여행 계획을 세우는 건 어떤가요? + HowAboutTrip에서 여행 계획을\n세우는 건 어떤가요? google login How About Trip 입력 완료 @@ -292,7 +292,7 @@ RoundTripFlightOffers 직항 %1$s-%2$s - %1$s → %2$s + %1$s → %2$s, %3$s 경유%1$s회 %1$s시간 %2$s분 예상가격 : %1$s 원 diff --git a/android/HowAboutTrip/app/src/main/res/values/themes.xml b/android/HowAboutTrip/app/src/main/res/values/themes.xml index ffce0502..ab002eba 100644 --- a/android/HowAboutTrip/app/src/main/res/values/themes.xml +++ b/android/HowAboutTrip/app/src/main/res/values/themes.xml @@ -4,13 +4,16 @@ @color/white true @color/white + @font/pretendard @style/ThemeOverlay.App.DatePicker diff --git a/android/HowAboutTrip/build.gradle.kts b/android/HowAboutTrip/build.gradle.kts index 853c3691..0618ed68 100644 --- a/android/HowAboutTrip/build.gradle.kts +++ b/android/HowAboutTrip/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.4.0" apply false + id("com.android.application") version "8.4.1" apply false id("org.jetbrains.kotlin.android") version "1.9.10" apply false id("com.google.gms.google-services") version "4.4.0" apply false kotlin("kapt") version "1.9.22"