Skip to content

Commit 2822c0d

Browse files
authored
Saved page fix (#74)
* Adding saved page. Fixes #20 * Adding to bottom bar.
1 parent 2ab21ab commit 2822c0d

File tree

5 files changed

+65
-0
lines changed

5 files changed

+65
-0
lines changed

app/src/main/java/com/jerboa/ui/components/common/AppBars.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ fun SimpleTopAppBar(
5454
fun BottomAppBarAll(
5555
navController: NavController = rememberNavController(),
5656
unreadCounts: GetUnreadCountResponse? = null,
57+
onClickSaved: () -> Unit,
5758
onClickProfile: () -> Unit,
5859
onClickInbox: () -> Unit,
5960
) {
@@ -115,6 +116,21 @@ fun BottomAppBarAll(
115116
},
116117
selected = selectedState == "inbox"
117118
)
119+
BottomNavigationItem(
120+
icon = {
121+
Icon(
122+
imageVector = Icons.Default.Star,
123+
contentDescription = "TODO",
124+
)
125+
},
126+
selectedContentColor = MaterialTheme.colors.primary,
127+
unselectedContentColor = Muted,
128+
onClick = {
129+
selectedState = "saved"
130+
onClickSaved()
131+
},
132+
selected = selectedState == "saved"
133+
)
118134
BottomNavigationItem(
119135
icon = {
120136
Icon(
@@ -139,6 +155,7 @@ fun BottomAppBarAllPreview() {
139155
BottomAppBarAll(
140156
onClickInbox = {},
141157
onClickProfile = {},
158+
onClickSaved = {},
142159
)
143160
}
144161

app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,18 @@ fun CommunityActivity(
197197
onClickInbox = {
198198
inboxClickWrapper(inboxViewModel, account, navController, ctx)
199199
},
200+
onClickSaved = {
201+
account?.id?.also {
202+
personClickWrapper(
203+
personProfileViewModel = personProfileViewModel,
204+
personId = it,
205+
account = account,
206+
navController = navController,
207+
ctx = ctx,
208+
saved = true,
209+
)
210+
}
211+
},
200212
navController = navController,
201213
)
202214
}

app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,18 @@ fun HomeActivity(
135135
onClickInbox = {
136136
inboxClickWrapper(inboxViewModel, account, navController, ctx)
137137
},
138+
onClickSaved = {
139+
account?.id?.also {
140+
personClickWrapper(
141+
personProfileViewModel = personProfileViewModel,
142+
personId = it,
143+
account = account,
144+
navController = navController,
145+
ctx = ctx,
146+
saved = true,
147+
)
148+
}
149+
},
138150
navController = navController,
139151
)
140152
}

app/src/main/java/com/jerboa/ui/components/inbox/InboxActivity.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,18 @@ fun InboxActivity(
140140
onClickInbox = {
141141
inboxClickWrapper(inboxViewModel, account, navController, ctx)
142142
},
143+
onClickSaved = {
144+
account?.id?.also {
145+
personClickWrapper(
146+
personProfileViewModel = personProfileViewModel,
147+
personId = it,
148+
account = account,
149+
navController = navController,
150+
ctx = ctx,
151+
saved = true,
152+
)
153+
}
154+
},
143155
navController = navController,
144156
)
145157
}

app/src/main/java/com/jerboa/ui/components/person/PersonProfileActivity.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,18 @@ fun PersonProfileActivity(
134134
onClickInbox = {
135135
inboxClickWrapper(inboxViewModel, account, navController, ctx)
136136
},
137+
onClickSaved = {
138+
account?.id?.also {
139+
personClickWrapper(
140+
personProfileViewModel = personProfileViewModel,
141+
personId = it,
142+
account = account,
143+
navController = navController,
144+
ctx = ctx,
145+
saved = true,
146+
)
147+
}
148+
},
137149
navController = navController,
138150
)
139151
}

0 commit comments

Comments
 (0)