Skip to content

Commit 414f0ad

Browse files
LaurentTreguierLaurentTreguier
committed
List emails
1 parent a2467d0 commit 414f0ad

File tree

12 files changed

+317
-75
lines changed

12 files changed

+317
-75
lines changed

‎app/src/main/kotlin/app/fyreplace/fyreplace/api/ApiResolver.kt

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package app.fyreplace.fyreplace.api
22

33
import android.content.Context
4+
import app.fyreplace.api.EmailsEndpointApi
45
import app.fyreplace.api.TokensEndpointApi
56
import app.fyreplace.api.UsersEndpointApi
67
import app.fyreplace.fyreplace.R
@@ -32,6 +33,8 @@ interface ApiResolver {
3233
suspend fun tokens(): TokensEndpointApi
3334

3435
suspend fun users(): UsersEndpointApi
36+
37+
suspend fun emails(): EmailsEndpointApi
3538
}
3639

3740
class RemoteApiResolver @Inject constructor(
@@ -43,6 +46,8 @@ class RemoteApiResolver @Inject constructor(
4346

4447
override suspend fun users() = get(UsersEndpointApi::class.java)
4548

49+
override suspend fun emails() = get(EmailsEndpointApi::class.java)
50+
4651
private suspend fun <T> get(clazz: Class<T>) = resolver.connectionStore
4752
.data
4853
.map {

‎app/src/main/kotlin/app/fyreplace/fyreplace/fakes/FakeApiResolver.kt

+3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package app.fyreplace.fyreplace.fakes
22

33
import app.fyreplace.fyreplace.api.ApiResolver
4+
import app.fyreplace.fyreplace.fakes.api.FakeEmailsEndpointApi
45
import app.fyreplace.fyreplace.fakes.api.FakeTokensEndpointApi
56
import app.fyreplace.fyreplace.fakes.api.FakeUsersEndpointApi
67

78
class FakeApiResolver : ApiResolver {
89
override suspend fun tokens() = FakeTokensEndpointApi()
910

1011
override suspend fun users() = FakeUsersEndpointApi()
12+
13+
override suspend fun emails() = FakeEmailsEndpointApi()
1114
}

‎app/src/main/kotlin/app/fyreplace/fyreplace/fakes/Placeholders.kt

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package app.fyreplace.fyreplace.fakes
22

33
import app.fyreplace.api.data.Color
4+
import app.fyreplace.api.data.Email
45
import app.fyreplace.api.data.Rank
56
import app.fyreplace.api.data.User
67
import java.time.OffsetDateTime
@@ -20,3 +21,13 @@ fun User.Companion.make(username: String) = User(
2021
blocked = false,
2122
tint = Color(0x7F, 0x7F, 0x7F)
2223
)
24+
25+
fun Email.Companion.make(main: Boolean = false, verified: Boolean = true): Email {
26+
val id = UUID.randomUUID()
27+
return Email(
28+
id = id,
29+
email = "$id@example.org",
30+
main = main,
31+
verified = verified
32+
)
33+
}

‎app/src/main/kotlin/app/fyreplace/fyreplace/fakes/api/FakeEmailsEndpointApi.kt

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package app.fyreplace.fyreplace.fakes.api
2+
3+
import app.fyreplace.api.EmailsEndpointApi
4+
import app.fyreplace.api.data.Email
5+
import app.fyreplace.api.data.EmailActivation
6+
import app.fyreplace.api.data.EmailCreation
7+
import app.fyreplace.fyreplace.fakes.make
8+
import app.fyreplace.fyreplace.fakes.ok
9+
import retrofit2.Response
10+
import java.util.UUID
11+
12+
class FakeEmailsEndpointApi : EmailsEndpointApi {
13+
override suspend fun activateEmail(emailActivation: EmailActivation): Response<Unit> =
14+
throw NotImplementedError()
15+
16+
override suspend fun countEmails() = ok(listEmails(null).body()!!.size.toLong())
17+
18+
override suspend fun createEmail(
19+
emailCreation: EmailCreation,
20+
customDeepLinks: Boolean?
21+
): Response<Email> =
22+
throw NotImplementedError()
23+
24+
override suspend fun deleteEmail(id: UUID): Response<Unit> =
25+
throw NotImplementedError()
26+
27+
override suspend fun listEmails(page: Int?) = when (page) {
28+
null, 0 -> ok(listOf(Email.make(main = true), Email.make(), Email.make()))
29+
else -> ok(emptyList())
30+
}
31+
32+
override suspend fun setMainEmail(id: UUID): Response<Unit> =
33+
throw NotImplementedError()
34+
}

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/MainContent.kt

+44-22
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ import androidx.compose.runtime.Composable
1818
import androidx.compose.runtime.LaunchedEffect
1919
import androidx.compose.runtime.derivedStateOf
2020
import androidx.compose.runtime.getValue
21+
import androidx.compose.runtime.mutableStateOf
2122
import androidx.compose.runtime.remember
2223
import androidx.compose.runtime.rememberCoroutineScope
24+
import androidx.compose.runtime.setValue
2325
import androidx.compose.ui.Modifier
2426
import androidx.compose.ui.input.key.KeyEventType
2527
import androidx.compose.ui.input.key.onKeyEvent
@@ -42,6 +44,7 @@ import app.fyreplace.fyreplace.input.DestinationKeyboardShortcut
4244
import app.fyreplace.fyreplace.input.getShortcut
4345
import app.fyreplace.fyreplace.ui.screens.ArchiveScreen
4446
import app.fyreplace.fyreplace.ui.screens.DraftsScreen
47+
import app.fyreplace.fyreplace.ui.screens.EmailsScreen
4548
import app.fyreplace.fyreplace.ui.screens.FeedScreen
4649
import app.fyreplace.fyreplace.ui.screens.LoginScreen
4750
import app.fyreplace.fyreplace.ui.screens.NotificationsScreen
@@ -54,7 +57,7 @@ import app.fyreplace.fyreplace.ui.views.navigation.BottomNavigation
5457
import app.fyreplace.fyreplace.ui.views.navigation.Destination
5558
import app.fyreplace.fyreplace.ui.views.navigation.SideNavigation
5659
import app.fyreplace.fyreplace.ui.views.navigation.navigatePoppingBackStack
57-
import app.fyreplace.fyreplace.ui.views.navigation.toSingletonDestination
60+
import app.fyreplace.fyreplace.ui.views.navigation.toDestination
5861
import app.fyreplace.fyreplace.viewmodels.MainViewModel
5962
import kotlinx.coroutines.launch
6063

@@ -75,28 +78,34 @@ fun MainContent() {
7578
val snackbarHostState = remember { SnackbarHostState() }
7679
val navController = rememberNavController()
7780
val entry by navController.currentBackStackEntryAsState()
78-
val currentDestination = entry?.toSingletonDestination()
79-
val destinationGroups by remember {
81+
val currentDestination = entry?.toDestination()
82+
val singletonDestinationGroups by remember {
8083
derivedStateOf {
8184
topLevelDestinationGroups(expanded = !compact, userAuthenticated = isAuthenticated)
8285
}
8386
}
84-
val currentDestinationGroup =
85-
destinationGroups.find { (it.choices + it.root).contains(currentDestination) }
86-
val savedDestinations =
87-
remember { mutableMapOf<Destination.Singleton, Destination.Singleton>() }
87+
val currentSingletonDestinationGroup = singletonDestinationGroups
88+
.find { (it.choices + it.root).contains(currentDestination) }
89+
var selectedSingletonDestination by remember {
90+
mutableStateOf<Destination.Singleton>(Destination.Feed)
91+
}
92+
val savedDestinations = remember {
93+
mutableMapOf<Destination.Singleton, Destination.Singleton>()
94+
}
95+
96+
fun navigate(destination: Destination) {
97+
navController.navigatePoppingBackStack(destination)
98+
}
8899

89100
fun onClickDestination(destination: Destination.Singleton) {
90101
val actualDestination = when {
91102
!isAuthenticated && isRegistering && destination == Destination.Settings -> Destination.Register()
92-
else -> destinationGroups.find { it.root == destination }
103+
else -> singletonDestinationGroups.find { it.root == destination }
93104
?.choices
94105
?.firstOrNull()
95106
?: destination
96107
}
97-
navController.navigatePoppingBackStack(
98-
savedDestinations[actualDestination] ?: actualDestination
99-
)
108+
navigate(savedDestinations[actualDestination] ?: actualDestination)
100109
}
101110

102111
val keyboardHandler = Modifier.onKeyEvent { event ->
@@ -131,7 +140,10 @@ fun MainContent() {
131140
composable<Destination.Archive> { ArchiveScreen() }
132141
composable<Destination.Drafts> { DraftsScreen() }
133142
composable<Destination.Published> { PublishedScreen() }
134-
composable<Destination.Settings> { SettingsScreen() }
143+
composable<Destination.Settings> {
144+
SettingsScreen { navigate(Destination.Emails) }
145+
}
146+
composable<Destination.Emails> { EmailsScreen() }
135147

136148
composable<Destination.Login>(
137149
deepLinks = context.makeDeepLinks(context.getString(R.string.deep_link_path_login))
@@ -158,15 +170,19 @@ fun MainContent() {
158170
@Composable
159171
fun Top() {
160172
TopBar(
161-
destinations = currentDestinationGroup?.choices ?: emptyList(),
173+
destinations = currentSingletonDestinationGroup?.choices ?: emptyList(),
162174
selectedDestination = currentDestination,
163175
enabled = !isWaitingForRandomCode,
164176
onClickDestination = {
165-
navController.navigatePoppingBackStack(it)
177+
navigate(it)
166178

167-
if (currentDestinationGroup?.defaultDestination != null) {
168-
savedDestinations[currentDestinationGroup.defaultDestination] = it
179+
if (currentSingletonDestinationGroup?.defaultDestination != null) {
180+
savedDestinations[currentSingletonDestinationGroup.defaultDestination] = it
169181
}
182+
},
183+
onBack = when (currentDestination) {
184+
null, is Destination.Singleton -> null
185+
else -> { -> navController.navigateUp() }
170186
}
171187
)
172188
}
@@ -180,9 +196,10 @@ fun MainContent() {
180196
Top()
181197
},
182198
bottomBar = {
199+
val destinations = singletonDestinationGroups.map(Destination.Singleton.Group::root)
183200
BottomNavigation(
184-
destinations = destinationGroups.map(Destination.Singleton.Group::root),
185-
selectedDestination = currentDestinationGroup?.root,
201+
destinations = destinations,
202+
selectedDestination = selectedSingletonDestination,
186203
isAuthenticated = isAuthenticated,
187204
onClickDestination = ::onClickDestination
188205
)
@@ -197,8 +214,8 @@ fun MainContent() {
197214
}
198215
) {
199216
SideNavigation(
200-
destinations = destinationGroups.map(Destination.Singleton.Group::root),
201-
selectedDestination = currentDestinationGroup?.root,
217+
destinations = singletonDestinationGroups.map(Destination.Singleton.Group::root),
218+
selectedDestination = selectedSingletonDestination,
202219
isAuthenticated = isAuthenticated,
203220
windowPadding = it,
204221
onClickDestination = ::onClickDestination,
@@ -216,17 +233,22 @@ fun MainContent() {
216233

217234
LaunchedEffect(isAuthenticated) {
218235
val accountEntryDestinations = setOf(Destination.Login(), Destination.Register())
219-
navController.navigatePoppingBackStack(
236+
navigate(
220237
when {
221238
isAuthenticated && currentDestination in accountEntryDestinations -> Destination.Settings
222239
isAuthenticated -> return@LaunchedEffect
223240
currentDestination == Destination.Settings -> Destination.Login()
224-
currentDestination?.requiresAuthentication == true -> Destination.Feed
241+
currentDestination is Destination.Singleton && currentDestination.requiresAuthentication == true -> Destination.Feed
225242
else -> return@LaunchedEffect
226243
}
227244
)
228245
}
229246

247+
LaunchedEffect(currentSingletonDestinationGroup?.root) {
248+
selectedSingletonDestination =
249+
currentSingletonDestinationGroup?.root ?: return@LaunchedEffect
250+
}
251+
230252
val scope = rememberCoroutineScope()
231253

232254
LaunchedEffect(scope) {

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/EmailsScreen.kt

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package app.fyreplace.fyreplace.ui.screens
2+
3+
import androidx.compose.foundation.lazy.LazyColumn
4+
import androidx.compose.foundation.lazy.items
5+
import androidx.compose.material3.ListItem
6+
import androidx.compose.material3.Text
7+
import androidx.compose.runtime.Composable
8+
import androidx.compose.runtime.LaunchedEffect
9+
import androidx.compose.runtime.remember
10+
import androidx.compose.ui.res.stringResource
11+
import androidx.compose.ui.tooling.preview.Preview
12+
import androidx.hilt.navigation.compose.hiltViewModel
13+
import app.fyreplace.fyreplace.R
14+
import app.fyreplace.fyreplace.fakes.FakeApiResolver
15+
import app.fyreplace.fyreplace.fakes.FakeEventBus
16+
import app.fyreplace.fyreplace.fakes.FakeStoreResolver
17+
import app.fyreplace.fyreplace.viewmodels.screens.EmailsViewModel
18+
19+
@Composable
20+
fun EmailsScreen(viewModel: EmailsViewModel = hiltViewModel()) {
21+
val emails = remember { viewModel.emails }
22+
23+
LazyColumn {
24+
items(emails) { email ->
25+
ListItem(
26+
headlineContent = { Text(email.email) },
27+
supportingContent = {
28+
if (email.main) {
29+
Text(stringResource(R.string.emails_main))
30+
}
31+
}
32+
)
33+
}
34+
}
35+
36+
LaunchedEffect(viewModel) {
37+
viewModel.loadEmails()
38+
}
39+
}
40+
41+
@Preview(showSystemUi = true, showBackground = true)
42+
@Composable
43+
fun EmailsScreenPreview() {
44+
EmailsScreen(
45+
viewModel = EmailsViewModel(
46+
eventBus = FakeEventBus(),
47+
storeResolver = FakeStoreResolver(),
48+
apiResolver = FakeApiResolver()
49+
)
50+
)
51+
}

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/SettingsScreen.kt

+13-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.compose.foundation.rememberScrollState
1111
import androidx.compose.foundation.verticalScroll
1212
import androidx.compose.material.icons.Icons
1313
import androidx.compose.material.icons.automirrored.outlined.Logout
14+
import androidx.compose.material.icons.outlined.AlternateEmail
1415
import androidx.compose.material.icons.outlined.Code
1516
import androidx.compose.material.icons.outlined.Info
1617
import androidx.compose.material.icons.outlined.Lock
@@ -44,7 +45,7 @@ import app.fyreplace.fyreplace.ui.views.settings.Section
4445
import app.fyreplace.fyreplace.viewmodels.screens.SettingsViewModel
4546

4647
@Composable
47-
fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel()) {
48+
fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), navigateToEmails: () -> Unit) {
4849
Column(
4950
verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing_medium)),
5051
modifier = Modifier
@@ -109,6 +110,15 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel()) {
109110
}
110111
}
111112

113+
Section(stringResource(R.string.settings_connection_header)) {
114+
ListItem(
115+
headlineContent = { Text(stringResource(R.string.settings_connection_emails)) },
116+
supportingContent = { Text(stringResource(R.string.settings_connection_emails_summary)) },
117+
leadingContent = { Icon(Icons.Outlined.AlternateEmail, null) },
118+
modifier = Modifier.clickable(onClick = navigateToEmails)
119+
)
120+
}
121+
112122
Section(stringResource(R.string.settings_about_header)) {
113123
LinkListItem(
114124
title = stringResource(R.string.settings_about_website),
@@ -152,7 +162,8 @@ fun SettingsScreenPreview() {
152162
FakeResourceResolver(mapOf(R.integer.bio_max_length to 100)),
153163
FakeStoreResolver(),
154164
FakeApiResolver()
155-
)
165+
),
166+
navigateToEmails = {}
156167
)
157168
}
158169
}

0 commit comments

Comments
 (0)