Skip to content

Commit fe3b486

Browse files
eshc123eshc123
authored
Merge pull request #98 from eshc123/dev
[RELEASE]
2 parents e66070a + 932066b commit fe3b486

File tree

32 files changed

+1623
-487
lines changed

32 files changed

+1623
-487
lines changed

‎app/src/main/java/com/eshc/goonersapp/navigation/GnrNavHost.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.eshc.goonersapp.feature.chat.navigation.navigateToChatRoom
1010
import com.eshc.goonersapp.feature.home.navigation.homeNavigationRoute
1111
import com.eshc.goonersapp.feature.home.navigation.homeScreen
1212
import com.eshc.goonersapp.feature.login.navigation.loginScreen
13+
import com.eshc.goonersapp.feature.login.navigation.navigateToLogin
1314
import com.eshc.goonersapp.feature.login.navigation.navigateToSignUp
1415
import com.eshc.goonersapp.feature.login.navigation.signUpScreen
1516
import com.eshc.goonersapp.feature.match.model.toUiModel
@@ -59,13 +60,13 @@ fun GnrNavHost(
5960
onShowSnackbar = onShowSnackbar
6061
)
6162
matchScreen(
62-
topBar = {
63-
topBar(TopLevelDestination.MATCH)
64-
},
6563
bottomBar = bottomBar,
6664
onClickDetail = {
6765
navController.navigateToMatchDetail(it.toUiModel())
6866
},
67+
onClickUser = {
68+
navController.navigateToLogin()
69+
},
6970
onShowSnackbar = onShowSnackbar
7071
)
7172
}

‎app/src/main/java/com/eshc/goonersapp/ui/GnrApp.kt

+24-19
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
55
import androidx.compose.foundation.layout.heightIn
66
import androidx.compose.foundation.layout.padding
77
import androidx.compose.foundation.layout.size
8+
import androidx.compose.foundation.shape.RoundedCornerShape
89
import androidx.compose.material3.Icon
910
import androidx.compose.material3.Scaffold
1011
import androidx.compose.material3.SnackbarDuration
@@ -17,6 +18,7 @@ import androidx.compose.runtime.getValue
1718
import androidx.compose.runtime.remember
1819
import androidx.compose.runtime.rememberCoroutineScope
1920
import androidx.compose.ui.Modifier
21+
import androidx.compose.ui.draw.clip
2022
import androidx.compose.ui.res.stringResource
2123
import androidx.compose.ui.unit.dp
2224
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -31,6 +33,7 @@ import com.eshc.goonersapp.core.designsystem.IconPack
3133
import com.eshc.goonersapp.core.designsystem.component.GnrNavigationBar
3234
import com.eshc.goonersapp.core.designsystem.component.GnrNavigationBarItem
3335
import com.eshc.goonersapp.core.designsystem.component.GnrTopLevelTopBar
36+
import com.eshc.goonersapp.core.designsystem.iconpack.IcGridCalender
3437
import com.eshc.goonersapp.core.designsystem.iconpack.IcInfo
3538
import com.eshc.goonersapp.core.designsystem.iconpack.IcNotification
3639
import com.eshc.goonersapp.core.designsystem.iconpack.IcPeople
@@ -69,9 +72,7 @@ fun GnrApp(
6972

7073
Scaffold(
7174
modifier = Modifier,
72-
snackbarHost = {
73-
SnackbarHost(snackbarHostState)
74-
}
75+
snackbarHost = { SnackbarHost(snackbarHostState) }
7576
) { padding ->
7677
Column(
7778
modifier = Modifier.padding(padding)
@@ -80,44 +81,44 @@ fun GnrApp(
8081
navController = navController,
8182
onShowSnackbar = { message ->
8283
coroutineScope.launch {
83-
snackbarHostState.showSnackbar(
84-
message
85-
)
84+
snackbarHostState.showSnackbar(message)
8685
}
8786
},
8887
topBar = { topLevelDestination ->
8988
GnrTopLevelBar(
9089
topLevelDestination = topLevelDestination,
9190
icons = {
9291
when (topLevelDestination) {
93-
TopLevelDestination.TEAM -> {
92+
TopLevelDestination.HOME -> {
9493
Icon(
95-
imageVector = IconPack.IcInfo,
94+
imageVector = IconPack.IcNotification,
9695
contentDescription = null,
9796
modifier = Modifier
9897
.padding(horizontal = 8.dp)
9998
.size(24.dp)
100-
.clickable { navController.navigateToClubDetail() },
99+
.clip(RoundedCornerShape(3.dp)),
101100
tint = ColorFF777777
102101
)
103102
Icon(
104-
imageVector = IconPack.IcSearch,
103+
imageVector = IconPack.IcPeople,
105104
contentDescription = null,
106105
modifier = Modifier
107106
.padding(horizontal = 8.dp)
108107
.size(24.dp)
109-
.clickable { navController.navigateToSearch() },
108+
.clip(RoundedCornerShape(3.dp))
109+
.clickable { navController.navigateToLogin() },
110110
tint = ColorFF777777
111111
)
112112
}
113113

114-
TopLevelDestination.HOME -> {
114+
TopLevelDestination.MATCH -> {
115115
Icon(
116-
imageVector = IconPack.IcNotification,
116+
imageVector = IconPack.IcGridCalender,
117117
contentDescription = null,
118118
modifier = Modifier
119119
.padding(horizontal = 8.dp)
120-
.size(24.dp),
120+
.size(24.dp)
121+
.clip(RoundedCornerShape(3.dp)),
121122
tint = ColorFF777777
122123
)
123124
Icon(
@@ -126,27 +127,31 @@ fun GnrApp(
126127
modifier = Modifier
127128
.padding(horizontal = 8.dp)
128129
.size(24.dp)
130+
.clip(RoundedCornerShape(3.dp))
129131
.clickable { navController.navigateToLogin() },
130132
tint = ColorFF777777
131133
)
132134
}
133135

134-
else -> {
136+
TopLevelDestination.TEAM -> {
135137
Icon(
136-
imageVector = IconPack.IcNotification,
138+
imageVector = IconPack.IcInfo,
137139
contentDescription = null,
138140
modifier = Modifier
139141
.padding(horizontal = 8.dp)
140-
.size(24.dp),
142+
.size(24.dp)
143+
.clip(RoundedCornerShape(3.dp))
144+
.clickable { navController.navigateToClubDetail() },
141145
tint = ColorFF777777
142146
)
143147
Icon(
144-
imageVector = IconPack.IcPeople,
148+
imageVector = IconPack.IcSearch,
145149
contentDescription = null,
146150
modifier = Modifier
147151
.padding(horizontal = 8.dp)
148152
.size(24.dp)
149-
.clickable { navController.navigateToLogin() },
153+
.clip(RoundedCornerShape(3.dp))
154+
.clickable { navController.navigateToSearch() },
150155
tint = ColorFF777777
151156
)
152157
}

‎core/data/src/main/java/com/eshc/goonersapp/core/data/mapper/TeamMapper.kt

+13-9
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ fun RemoteTeamDetail.toModel() = TeamDetail(
1313
fun RemoteTeam.toModel() = Team(
1414
clubId = teamId ?: 0,
1515
clubName = teamName ?: "",
16-
officialName = "",
17-
foundationDate = (founded ?: 0).toString(),
18-
imageUrl = teamImageUrl ?: "",
19-
teamNickname = shortCode ?: "",
20-
managerId = 0,
21-
manager = "",
22-
captainId = 0,
23-
captain = "",
24-
stadiumName = venueName ?:""
16+
clubFoundedYear = founded ?: 0,
17+
clubImgUrl = teamImageUrl ?: "",
18+
clubShortCode = shortCode ?: "",
19+
manager = managerName ?: "",
20+
captain = captainName ?: "",
21+
stadiumName = venueName ?: "",
22+
clubHomeTown = cityName ?: "",
23+
clubNationality = nationality ?: "",
24+
clubNationImgUrl = nationalityImgUrl ?: "",
25+
officialWebUrl = officialWebUrl ?: "",
26+
snsFaceBook = snsFacebook ?: "",
27+
snsX = snsX ?: "",
28+
snsInstagram = snsInstagram ?: ""
2529
)

‎core/designsystem/src/main/java/com/eshc/goonersapp/core/designsystem/__IconPack.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.eshc.goonersapp.core.designsystem
22

33
import androidx.compose.ui.graphics.vector.ImageVector
4-
import com.eshc.goonersapp.core.designsystem.iconpack.IcBall
5-
import com.eshc.goonersapp.core.designsystem.iconpack.IcTrophy
4+
import com.eshc.goonersapp.core.designsystem.iconpack.IcGrid
5+
import com.eshc.goonersapp.core.designsystem.iconpack.IcList
66
import kotlin.collections.List as ____KtList
77

88
public object IconPack
@@ -14,6 +14,6 @@ public val IconPack.Icons: ____KtList<ImageVector>
1414
if (__Icons != null) {
1515
return __Icons!!
1616
}
17-
__Icons= listOf(IcBall, IcTrophy)
17+
__Icons= listOf(IcList, IcGrid)
1818
return __Icons!!
1919
}

‎core/designsystem/src/main/java/com/eshc/goonersapp/core/designsystem/component/Badge.kt

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.eshc.goonersapp.core.designsystem.component
2+
3+
import androidx.compose.foundation.layout.Box
4+
import androidx.compose.foundation.layout.fillMaxSize
5+
import androidx.compose.foundation.layout.height
6+
import androidx.compose.foundation.layout.width
7+
import androidx.compose.foundation.shape.RoundedCornerShape
8+
import androidx.compose.material3.Card
9+
import androidx.compose.material3.CardDefaults
10+
import androidx.compose.material3.Text
11+
import androidx.compose.runtime.Composable
12+
import androidx.compose.ui.Alignment
13+
import androidx.compose.ui.Modifier
14+
import androidx.compose.ui.graphics.Color
15+
import androidx.compose.ui.unit.dp
16+
import com.eshc.goonersapp.core.designsystem.theme.ColorFF000000
17+
import com.eshc.goonersapp.core.designsystem.theme.GnrTypography
18+
19+
@Composable
20+
fun MatchItemResultChip(
21+
result: String,
22+
color: Color,
23+
modifier: Modifier = Modifier
24+
) {
25+
Card(
26+
modifier = modifier,
27+
shape = RoundedCornerShape(3.dp),
28+
colors = CardDefaults.cardColors(
29+
containerColor = color,
30+
contentColor = ColorFF000000
31+
)
32+
) {
33+
Box(
34+
modifier = Modifier.fillMaxSize(),
35+
contentAlignment = Alignment.Center
36+
) {
37+
Text(
38+
text = result,
39+
style = GnrTypography.descriptionMedium
40+
)
41+
}
42+
}
43+
}

‎core/designsystem/src/main/java/com/eshc/goonersapp/core/designsystem/component/HorizontalDivider.kt

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.eshc.goonersapp.core.designsystem.component
2+
3+
import androidx.compose.material3.HorizontalDivider
4+
import androidx.compose.runtime.Composable
5+
import androidx.compose.ui.Modifier
6+
import androidx.compose.ui.graphics.Color
7+
import androidx.compose.ui.unit.Dp
8+
import androidx.compose.ui.unit.dp
9+
import com.eshc.goonersapp.core.designsystem.theme.ColorFFDCDCDC
10+
11+
@Composable
12+
fun GnrHorizontalDivider(
13+
modifier: Modifier = Modifier,
14+
color: Color = ColorFFDCDCDC,
15+
thickness: Dp = 1.dp
16+
) {
17+
HorizontalDivider(modifier, thickness, color)
18+
}

0 commit comments

Comments
 (0)