Skip to content

Commit

Permalink
[FEATURE] #48 hackerton (#51)
Browse files Browse the repository at this point in the history
* [feature] isRegistered에 따른 로직 분기 구현

* [feature] 자동 로그인 구현

* [feature] 공지사항 등 url 링크 이동

* [feature] 회원탈퇴 구현

* [base] 아이콘 등록

* [chore] 코딩 컨벤션 수정

* [chore] 미사용 리소스 제거

* [feature] noRippleClickable 구현 및 적용

* [base] 로고 수정 및 앱 이름 수정 반영

* [chore] 코딩 컨벤션 반영

* [feature] 설정화면 기능 구현

* [chore] 코딩 컨벤션 반영

* [chore] 로그 제거
  • Loading branch information
jiwon2724 authored Aug 25, 2024
1 parent bc063ac commit 47204d8
Show file tree
Hide file tree
Showing 62 changed files with 377 additions and 92 deletions.
6 changes: 6 additions & 0 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
android:name=".PokitApplication"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/ic_launcher_pooki"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@mipmap/ic_launcher_pooki_round"
android:supportsRtl="true"
android:theme="@style/Theme.Pokit"
tools:targetApi="34">
Expand Down
Binary file added app/src/main/ic_launcher_pooki-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 22 additions & 3 deletions app/src/main/java/pokitmons/pokit/navigation/RootNavHost.kt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ fun RootNavHost(
LoginScreen(
loginViewModel = viewModel,
onNavigateToTermsOfServiceScreen = { navHostController.navigate(TermOfService.route) },
onNavigateToHomeScreen = { navHostController.navigate(Home.route) }
onNavigateToHomeScreen = {
navHostController.navigate(Home.route) {
popUpTo(navHostController.graph.startDestinationId) {
inclusive = true
}
}
}
)
}

Expand Down Expand Up @@ -77,7 +83,13 @@ fun RootNavHost(

composable(SignUpSuccess.route) {
SignUpSuccessScreen(
onNavigateToMainScreen = { navHostController.navigate(Home.route) }
onNavigateToMainScreen = {
navHostController.navigate(Home.route) {
popUpTo(navHostController.graph.startDestinationId) {
inclusive = true
}
}
}
)
}

Expand Down Expand Up @@ -144,7 +156,14 @@ fun RootNavHost(
val viewModel: SettingViewModel = hiltViewModel()
SettingsScreen(
settingViewModel = viewModel,
onNavigateToEditNickname = { navHostController.navigate(EditNickname.route) }
onNavigateToEditNickname = { navHostController.navigate(EditNickname.route) },
onNavigateToLogin = {
navHostController.navigate(Login.route) {
popUpTo(navHostController.graph.startDestinationId) {
inclusive = true
}
}
}
)
}

Expand Down
74 changes: 74 additions & 0 deletions app/src/main/res/drawable/ic_launcher_pooki_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<vector
android:height="108dp"
android:width="108dp"
android:viewportHeight="108"
android:viewportWidth="108"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z"/>
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_pooki.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_pooki_background"/>
<foreground android:drawable="@mipmap/ic_launcher_pooki_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_pooki_background"/>
<foreground android:drawable="@mipmap/ic_launcher_pooki_foreground"/>
</adaptive-icon>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">pokit</string>
<string name="app_name">Pokit</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package pokitmons.pokit.core.ui.components.atom.button.subcomponents.container
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
Expand Down Expand Up @@ -44,7 +46,9 @@ internal fun Modifier.pokitButtonContainerModifier(
)
.clickable(
enabled = (state != PokitButtonState.DISABLE),
onClick = onClick
onClick = onClick,
indication = null,
interactionSource = remember { MutableInteractionSource() }
)
.background(
shape = buttonShape,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package pokitmons.pokit.core.ui.components.atom.chip.subcomponents.container
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
Expand Down Expand Up @@ -35,7 +37,9 @@ internal fun Modifier.pokitChipContainerModifier(
)
.clickable(
enabled = (onClick != null && state != PokitChipState.DISABLED),
onClick = onClick ?: {}
onClick = onClick ?: {},
interactionSource = remember { MutableInteractionSource() },
indication = null
)
.background(
shape = RoundedCornerShape(9999.dp),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package pokitmons.pokit.core.ui.components.block.linkcard
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -32,6 +31,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import pokitmons.pokit.core.ui.R
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.core.ui.utils.noRippleClickable

@Composable
fun<T> LinkCard(
Expand All @@ -49,7 +49,7 @@ fun<T> LinkCard(
Row(
modifier = Modifier
.clip(RoundedCornerShape(8.dp))
.clickable { onClickItem(item) }
.noRippleClickable { onClickItem(item) }
) {
Box(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package pokitmons.pokit.core.ui.components.block.pokitcard

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -27,6 +26,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import pokitmons.pokit.core.ui.R
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.core.ui.utils.noRippleClickable

@Composable
fun PokitCard(
Expand All @@ -46,7 +46,7 @@ fun PokitCard(
color = PokitTheme.colors.backgroundPrimary,
shape = RoundedCornerShape(8.dp)
)
.clickable(onClick = onClick)
.noRippleClickable { onClick() }
.padding(top = 12.dp, start = 12.dp, bottom = 8.dp, end = 8.dp)
) {
Row(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package pokitmons.pokit.core.ui.components.block.pokitlist

import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
Expand All @@ -9,6 +10,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand All @@ -33,7 +35,9 @@ fun <T> PokitList(
modifier = modifier
.clickable(
enabled = state != PokitListState.DISABLE,
onClick = { onClickItem(item) }
onClick = { onClickItem(item) },
indication = null,
interactionSource = remember { MutableInteractionSource() }
)
.padding(horizontal = 20.dp, vertical = 12.dp),
verticalAlignment = Alignment.CenterVertically
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package pokitmons.pokit.core.ui.components.block.pushcard

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -21,6 +20,7 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.core.ui.utils.noRippleClickable

@Composable
fun PushCard(
Expand All @@ -36,7 +36,7 @@ fun PushCard(

Row(
modifier = modifier
.clickable(onClick = onClick)
.noRippleClickable { onClick() }
.padding(all = 20.dp),
horizontalArrangement = Arrangement.spacedBy(16.dp),
verticalAlignment = Alignment.CenterVertically
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package pokitmons.pokit.core.ui.components.block.select

import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
Expand Down Expand Up @@ -56,7 +57,9 @@ fun PokitSelect(
.clip(RoundedCornerShape(8.dp))
.clickable(
onClick = onClick,
enabled = (state != PokitSelectState.DISABLE) && (state != PokitSelectState.READ_ONLY)
enabled = (state != PokitSelectState.DISABLE) && (state != PokitSelectState.READ_ONLY),
indication = null,
interactionSource = remember { MutableInteractionSource() }
)
.padding(all = 12.dp),
verticalAlignment = Alignment.CenterVertically
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package pokitmons.pokit.core.ui.components.block.tap

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
Expand All @@ -12,6 +11,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.dp
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.core.ui.utils.noRippleClickable

@Composable
fun <T> PokitTap(
Expand All @@ -25,7 +25,7 @@ fun <T> PokitTap(

Box(
modifier = modifier
.clickable {
.noRippleClickable {
onClick(data)
}
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package pokitmons.pokit.core.ui.components.template.bottomsheet.subcomponents

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -15,6 +14,7 @@ import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.core.ui.utils.noRippleClickable

@Composable
fun <T> PokitBottomSheetItem(
Expand All @@ -25,7 +25,7 @@ fun <T> PokitBottomSheetItem(
) {
Row(
modifier = Modifier
.clickable {
.noRippleClickable {
onClick(data)
}
.padding(horizontal = 24.dp, vertical = 20.dp)
Expand Down
Loading

0 comments on commit 47204d8

Please sign in to comment.