Skip to content

Commit

Permalink
Merge pull request #163 from Team-HMH/feat/mypage_ui
Browse files Browse the repository at this point in the history 
[feat/mypage_ui]: λ§ˆμ΄νŽ˜μ΄μ§€ ui μˆ˜μ •
  • Loading branch information
@jihyun0v0
jihyun0v0 authored Mar 30, 2024
2 parents 3035205 + 975875c commit e010bde
Show file tree
Hide file tree
Showing 76 changed files with 1,589 additions and 470 deletions.
1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dependencies {
implementation(projects.feature.mypage)
implementation(projects.feature.challenge)
implementation(projects.feature.lock)
implementation(projects.feature.store)

// Domain
implementation(projects.domain.usagestats)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
tools:ignore="QueryAllPackagesPermission" />

<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />

<application
android:name=".HMHApplication"
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/com/hmh/hamyeonham/navigation/DefaultNavigationProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.hmh.hamyeonham.feature.login.LoginActivity
import com.hmh.hamyeonham.feature.main.MainActivity
import com.hmh.hamyeonham.feature.onboarding.OnBoardingActivity
import com.hmh.hamyeonham.feature.onboarding.OnBoardingStoryActivity
import com.hmh.hamyeonham.feature.store.StoreActivity
import dagger.hilt.android.qualifiers.ApplicationContext
import javax.inject.Inject

Expand All @@ -21,6 +22,7 @@ class DefaultNavigationProvider @Inject constructor(
override fun toOnBoardingStory(): Intent {
return Intent(context, OnBoardingStoryActivity::class.java)
}

override fun toLogin(): Intent {
return Intent(context, LoginActivity::class.java)
}
Expand All @@ -32,4 +34,8 @@ class DefaultNavigationProvider @Inject constructor(
override fun toLock(packageName: String): Intent {
return LockActivity.getIntent(context, packageName)
}

override fun toStore(): Intent {
return Intent(context, StoreActivity::class.java)
}
}
1 change: 1 addition & 0 deletions core/common/src/main/java/com/hmh/hamyeonham/common/navigation/NavigationProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ interface NavigationProvider {
fun toLogin(): Intent
fun toMain(): Intent
fun toLock(packageName: String): Intent
fun toStore(): Intent
}
18 changes: 14 additions & 4 deletions core/common/src/main/java/com/hmh/hamyeonham/common/time/TimeExt.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ package com.hmh.hamyeonham.common.time
import android.content.Context
import android.text.format.DateUtils
import kotlinx.datetime.Clock
import kotlinx.datetime.DateTimeUnit
import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDate
import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.TimeZone
import kotlinx.datetime.minus
import kotlinx.datetime.toInstant
import kotlinx.datetime.toLocalDateTime

val defaultTimeZone: TimeZone = TimeZone.currentSystemDefault()
fun Instant.Companion.systemNow(): Instant = Clock.System.now()

fun Instant.toDefaultLocalDate(): LocalDate = toLocalDateTime(TimeZone.currentSystemDefault()).date
Expand Down Expand Up @@ -44,13 +47,20 @@ fun LocalDateTime.toEpochMilliseconds(timeZone: TimeZone): Long =

// ν˜„μž¬ λ‚ μ§œμ˜ μ‹œμž‘ μ‹œκ°„κ³Ό μ’…λ£Œ μ‹œκ°„μ„ Epoch λ°€λ¦¬μ΄ˆλ‘œ λ°˜ν™˜ν•˜λŠ” ν•¨μˆ˜
fun getCurrentDayStartEndEpochMillis(): Pair<Long, Long> {
val timeZone = TimeZone.currentSystemDefault()
val currentDate = Clock.System.now().toLocalDateTime(timeZone).date
val startOfDay = currentDate.toStartOfDay().toEpochMilliseconds(timeZone)
val endOfDay = currentDate.toEndOfDay().toEpochMilliseconds(timeZone)
val currentDate = getCurrentDateOfDefaulTimeZone()
val startOfDay = currentDate.toStartOfDay().toEpochMilliseconds(defaultTimeZone)
val endOfDay = currentDate.toEndOfDay().toEpochMilliseconds(defaultTimeZone)
return Pair(startOfDay, endOfDay)
}

fun getCurrentDateOfDefaulTimeZone(): LocalDate {
return Clock.System.now().toLocalDateTime(defaultTimeZone).date
}

fun minusDaysFromDate(date: LocalDate, daysToMinus: Int): LocalDate {
return date.minus(daysToMinus, DateTimeUnit.DAY)
}

fun convertTimeToString(time: Long): String {
val hours = (time / 60)
val minutes = time % 60
Expand Down
5 changes: 5 additions & 0 deletions core/common/src/main/java/com/hmh/hamyeonham/common/view/Binding.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,8 @@ class FragmentViewBindingDelegate<F : Fragment, T : ViewBinding>(

fun <T : ViewBinding> Fragment.viewBinding(viewBinder: (View) -> T) =
FragmentViewBindingDelegate(this, viewBinder)

fun Boolean.mapBooleanToVisibility(): Int = when (this) {
true -> View.VISIBLE
false -> View.INVISIBLE
}
94 changes: 94 additions & 0 deletions core/common/src/main/res/drawable/ic_chellenge_point_exist_24.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="24dp"
android:height="25dp"
android:viewportWidth="24"
android:viewportHeight="25">
<path
android:pathData="M22,2m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
android:fillColor="#D54455"/>
<path
android:pathData="M22.732,6.198V18.588L20.049,20.138V4.65L22.732,6.198Z"
android:fillColor="#2C16A3"/>
<path
android:pathData="M20.049,4.65V20.138L12.001,24.785L1.268,18.59V6.195L12.001,0L20.049,4.65Z"
android:fillColor="#3D17D3"/>
<path
android:pathData="M12.001,0L1.268,6.198V18.588L12.001,24.785V0Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="1.267"
android:startY="18.589"
android:endX="17.365"
android:endY="9.295"
android:type="linear">
<item android:offset="0" android:color="#FF3427EE"/>
<item android:offset="0.9" android:color="#003427EE"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M22.732,6.198V18.588L20.049,20.138V4.65L22.732,6.198Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="16.695"
android:startY="14.33"
android:endX="24.742"
android:endY="9.684"
android:type="linear">
<item android:offset="0" android:color="#FF3427EE"/>
<item android:offset="0.9" android:color="#003427EE"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M20.049,4.65L12.001,0L1.268,6.195V18.59L12.001,24.785L20.049,20.138L22.732,18.588V6.198L20.049,4.65Z"
android:strokeAlpha="0.2"
android:fillAlpha="0.2">
<aapt:attr name="android:fillColor">
<gradient
android:startX="0.436"
android:startY="9.294"
android:endX="23.56"
android:endY="15.491"
android:type="linear">
<item android:offset="0" android:color="#FFFFCDDD"/>
<item android:offset="0.56" android:color="#00FFCDDD"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M12.001,0L1.268,6.195V18.59L1.693,6.351L12.001,0Z"
android:strokeAlpha="0.2"
android:fillAlpha="0.2">
<aapt:attr name="android:fillColor">
<gradient
android:startX="0.853"
android:startY="7.746"
android:endX="9.315"
android:endY="10.013"
android:type="linear">
<item android:offset="0" android:color="#FFFFCDDD"/>
<item android:offset="0.56" android:color="#00FFCDDD"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M10.236,15.176V19.289H8.02V6.531H12.705C15.576,6.531 17.509,8.479 17.509,10.845C17.509,13.212 15.579,15.176 12.705,15.176H10.238H10.236ZM12.703,13.296C14.247,13.296 15.287,12.188 15.287,10.845C15.287,9.503 14.247,8.411 12.703,8.411H10.236V13.296H12.703Z"
android:fillColor="#EBECF4"/>
<path
android:pathData="M10.236,15.176V19.289H8.02V6.531H12.705C15.576,6.531 17.509,8.479 17.509,10.845C17.509,13.212 15.579,15.176 12.705,15.176H10.238H10.236ZM12.703,13.296C14.247,13.296 15.287,12.188 15.287,10.845C15.287,9.503 14.247,8.411 12.703,8.411H10.236V13.296H12.703Z"
android:fillAlpha="0.5">
<aapt:attr name="android:fillColor">
<gradient
android:startX="17.5"
android:startY="21.5"
android:endX="11"
android:endY="12"
android:type="linear">
<item android:offset="0.029" android:color="#FF3D17D3"/>
<item android:offset="1" android:color="#003D17D3"/>
</gradient>
</aapt:attr>
</path>
</vector>
91 changes: 91 additions & 0 deletions core/common/src/main/res/drawable/ic_chellenge_point_not_exist_24.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="24dp"
android:height="25dp"
android:viewportWidth="24"
android:viewportHeight="25">
<path
android:pathData="M22.732,6.198V18.588L20.049,20.138V4.65L22.732,6.198Z"
android:fillColor="#2C16A3"/>
<path
android:pathData="M20.049,4.65V20.138L12.001,24.785L1.268,18.59V6.195L12.001,0L20.049,4.65Z"
android:fillColor="#3D17D3"/>
<path
android:pathData="M12.001,0L1.268,6.198V18.588L12.001,24.785V0Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="1.267"
android:startY="18.589"
android:endX="17.365"
android:endY="9.295"
android:type="linear">
<item android:offset="0" android:color="#FF3427EE"/>
<item android:offset="0.9" android:color="#003427EE"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M22.732,6.198V18.588L20.049,20.138V4.65L22.732,6.198Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="16.695"
android:startY="14.33"
android:endX="24.742"
android:endY="9.684"
android:type="linear">
<item android:offset="0" android:color="#FF3427EE"/>
<item android:offset="0.9" android:color="#003427EE"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M20.049,4.65L12.001,0L1.268,6.195V18.59L12.001,24.785L20.049,20.138L22.732,18.588V6.198L20.049,4.65Z"
android:strokeAlpha="0.2"
android:fillAlpha="0.2">
<aapt:attr name="android:fillColor">
<gradient
android:startX="0.436"
android:startY="9.294"
android:endX="23.56"
android:endY="15.491"
android:type="linear">
<item android:offset="0" android:color="#FFFFCDDD"/>
<item android:offset="0.56" android:color="#00FFCDDD"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M12.001,0L1.268,6.195V18.59L1.693,6.351L12.001,0Z"
android:strokeAlpha="0.2"
android:fillAlpha="0.2">
<aapt:attr name="android:fillColor">
<gradient
android:startX="0.853"
android:startY="7.746"
android:endX="9.315"
android:endY="10.013"
android:type="linear">
<item android:offset="0" android:color="#FFFFCDDD"/>
<item android:offset="0.56" android:color="#00FFCDDD"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M10.236,15.176V19.289H8.02V6.531H12.705C15.576,6.531 17.508,8.479 17.508,10.845C17.508,13.212 15.579,15.176 12.705,15.176H10.238H10.236ZM12.703,13.296C14.247,13.296 15.287,12.188 15.287,10.845C15.287,9.503 14.247,8.411 12.703,8.411H10.236V13.296H12.703Z"
android:fillColor="#EBECF4"/>
<path
android:pathData="M10.236,15.176V19.289H8.02V6.531H12.705C15.576,6.531 17.508,8.479 17.508,10.845C17.508,13.212 15.579,15.176 12.705,15.176H10.238H10.236ZM12.703,13.296C14.247,13.296 15.287,12.188 15.287,10.845C15.287,9.503 14.247,8.411 12.703,8.411H10.236V13.296H12.703Z"
android:fillAlpha="0.5">
<aapt:attr name="android:fillColor">
<gradient
android:startX="17.5"
android:startY="21.5"
android:endX="11"
android:endY="12"
android:type="linear">
<item android:offset="0.029" android:color="#FF3D17D3"/>
<item android:offset="1" android:color="#003D17D3"/>
</gradient>
</aapt:attr>
</path>
</vector>
18 changes: 12 additions & 6 deletions core/common/src/main/res/drawable/shape_blue_purple_button_radius6.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/blue_purple_button" />
<corners android:radius="10dp" />

</shape>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="124dp"
android:height="51dp"
android:viewportWidth="124"
android:viewportHeight="51">
<group>
<clip-path android:pathData="M4 0H120C122.209 0 124 1.79086 124 4V47C124 49.2091 122.209 51 120 51H4C1.79086 51 0 49.2091 0 47V4C0 1.79086 1.79086 0 4 0Z" />
<path
android:fillColor="#3D17D3"
android:pathData="M0 0V51H124V0" />
</group>
</vector>
24 changes: 18 additions & 6 deletions core/common/src/main/res/drawable/shape_gray4_radius6.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/gray4" />
<corners android:radius="10dp" />

</shape>
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="124dp"
android:height="51dp"
android:viewportWidth="124"
android:viewportHeight="51"
>
<group>
<clip-path
android:pathData="M4 0H120C122.209 0 124 1.79086 124 4V47C124 49.2091 122.209 51 120 51H4C1.79086 51 0 49.2091 0 47V4C0 1.79086 1.79086 0 4 0Z"
/>
<path
android:pathData="M0 0V51H124V0"
android:fillColor="#272934"
/>
</group>
</vector>
6 changes: 3 additions & 3 deletions core/common/src/main/res/layout/dialog_common_two_button.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="?white_text"
android:textAppearance="?textAppearanceTitleLarge"
android:textColor="?white_text"
app:layout_constraintBottom_toTopOf="@+id/tv_confirm_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -30,16 +30,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
app:layout_constraintVertical_bias="0.2"
android:layout_marginTop="9dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:layout_marginTop="9dp"
android:textAppearance="?textAppearanceBodyMedium"
app:layout_constraintBottom_toTopOf="@+id/tv_confirm_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_dialog_title"
app:layout_constraintVertical_bias="0.2"
tools:text="μ±Œλ¦°μ§€λ₯Ό λ“±λ‘ν•˜λ©΄ 포인트λ₯Ό 얻을 수 μžˆμ–΄μš”" />

<TextView
Expand Down
5 changes: 5 additions & 0 deletions core/common/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="all_plus_img">λ§μ…ˆ 기호 이미지</string>
<string name="all_app_icon_img">μ•± μ•„μ΄μ½˜ 이미지</string>
</resources>
5 changes: 4 additions & 1 deletion core/designsystem/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
<string name="all_cancel">μ·¨μ†Œ</string>
<string name="all_delete">μ‚­μ œ</string>

<string name="all_edit">νŽΈμ§‘</string>
<string name="all_done">μ™„λ£Œ</string>

<string name="use_time_goal_title">μ„ νƒν•œ μ•±μ˜ λͺ©ν‘œ 이용 μ‹œκ°„μ„\nμ„€μ •ν•΄ μ£Όμ„Έμš”</string>
<string name="use_time_goal_description">λͺ©ν‘œ 이용 μ‹œκ°„μ€ μ΅œλŒ€ 1μ‹œκ°„ 59λΆ„κΉŒμ§€\nμ„€μ •ν•  수 μžˆμ–΄μš”</string>
<string name="delete_app_dialog_description">μ •λ§λ‘œ μ‚­μ œν•˜μ‹œκ² μ–΄μš”?\n쑰금만 νž˜μ„ 더 λ‚΄λ³΄μ•„μš”</string>
<string name="delete_app_dialog_description">μ§‘κ³„λ˜κ³  있던 μ•±μ˜ μ‚¬μš© μ‹œκ°„μ€\n총 μ‚¬μš© μ‹œκ°„μ—μ„œλ„ μ°¨κ°λΌμš”</string>
<string name="delete_app_dialog_title">정말 %1$s 을(λ₯Ό) μ‚­μ œν•˜μ‹œκ² μ–΄μš”?</string>

</resources>
Loading

0 comments on commit e010bde

Please sign in to comment.