Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Save messages for later #259

Merged
merged 63 commits into from
Jan 23, 2025
Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
00f6c1d
Use tum artemis server url as default for unrestricted build flavor
FelberMartin Dec 27, 2024
e09dfd0
Adapt ServerConfigurationService to use default implementations
FelberMartin Dec 27, 2024
785b68f
Adapt code to no longer rely on InstanceSelection
FelberMartin Dec 27, 2024
96c95c7
Implemented new service
FelberMartin Dec 28, 2024
fbef9c2
Displaying saved message categories
FelberMartin Dec 28, 2024
d9b3436
Enabled navigation to saved posts
FelberMartin Dec 28, 2024
beef456
Extended service to call post status apis
FelberMartin Dec 28, 2024
69d3f3a
Pass onSavePost down in UI to ViewModel
FelberMartin Dec 30, 2024
19df8fd
Update data objects to include isSaved
FelberMartin Dec 30, 2024
097ce4d
Minor fixes
FelberMartin Dec 30, 2024
1edb2a7
Adapted tests; added PostActionBarUITest for savePost
FelberMartin Dec 30, 2024
7343037
Added UI tests
FelberMartin Dec 30, 2024
1d89bd6
Fixed test
FelberMartin Dec 30, 2024
67f8965
Moving SavedPostService to conversation sub module
FelberMartin Dec 30, 2024
a4fc896
WIP Add tests; noticed deserialization issue
FelberMartin Dec 30, 2024
f8f748f
Created new dataClass SavedPost to deal with different serialization …
FelberMartin Dec 31, 2024
dd62735
Fixing tests; WIP 3rd test still failing
FelberMartin Dec 31, 2024
ab28f66
Fix changeSavePostStatus call
FelberMartin Jan 2, 2025
e975715
Created drafts for screens and SavedPostItem
FelberMartin Jan 2, 2025
1e06dab
Navigation to SavedPostsScreen
FelberMartin Jan 2, 2025
bdbd509
Added bottomSheet to change SavedPostStatus
FelberMartin Jan 2, 2025
bd885cb
Fix reload stuttering
FelberMartin Jan 2, 2025
399a082
Show failure dialog
FelberMartin Jan 2, 2025
911529b
Add button in IN_PROGRESS
FelberMartin Jan 2, 2025
83197f0
Fix key to work with standalone and answer posts
FelberMartin Jan 2, 2025
4bd47c0
Added animations
FelberMartin Jan 2, 2025
4e43dd6
Update TS2
FelberMartin Jan 3, 2025
5841616
Navigate to thread after savedPost click
FelberMartin Jan 3, 2025
d4aa22c
Fix flickering when re-entering savedPosts
FelberMartin Jan 3, 2025
ffe9c06
Added tests for the SavedPostsScreenUi
FelberMartin Jan 4, 2025
43058f4
Merge branch 'develop' into feature/communication/save-messages-for-l…
FelberMartin Jan 4, 2025
7f8510f
Fix module tests
FelberMartin Jan 4, 2025
5673ca1
Fix test compilation
FelberMartin Jan 4, 2025
de80192
Merge remote-tracking branch 'origin/develop' into feature/communicat…
FelberMartin Jan 4, 2025
d2f4a78
Adapt to ConversationOverview redesign
FelberMartin Jan 4, 2025
6a1220e
Fix E2e test
FelberMartin Jan 4, 2025
ca5faf6
Merge branch 'develop' into feature/communication/save-messages-for-l…
FelberMartin Jan 10, 2025
cec0dfa
Fix merge issue
FelberMartin Jan 10, 2025
e79f6c0
Refactor PostItem to be re-used
FelberMartin Jan 10, 2025
0ea6617
Use PostMainContent in SavedPostItem
FelberMartin Jan 10, 2025
d3e8188
Introduce InfoMessageCard
FelberMartin Jan 10, 2025
3f401ae
Add isSaved indicators
FelberMartin Jan 10, 2025
04ea798
Fix bug with markdown rendering
FelberMartin Jan 10, 2025
6d9b866
Fix warnings
FelberMartin Jan 10, 2025
59762ce
Merge branch 'develop' into feature/communication/save-messages-for-l…
FelberMartin Jan 10, 2025
91fe82a
Use spacings
FelberMartin Jan 11, 2025
5194307
Fixed paddings
FelberMartin Jan 16, 2025
8630711
Merge branch 'develop' into feature/communication/save-messages-for-l…
FelberMartin Jan 16, 2025
720835f
Fix spamming save button bug
FelberMartin Jan 16, 2025
f4a4d9d
Fix display of non-distinct post items
FelberMartin Jan 17, 2025
94697dc
Increase db version
FelberMartin Jan 22, 2025
4935749
Fix crash when saving answer post
FelberMartin Jan 22, 2025
b09308e
Move completeButton into card
FelberMartin Jan 22, 2025
8f382a3
Merge remote-tracking branch 'origin/develop' into feature/communicat…
FelberMartin Jan 22, 2025
6dcfddb
Fix CompleteButton padding
FelberMartin Jan 22, 2025
535c7f0
Fix display of duplicated savedPosts created by bug
FelberMartin Jan 22, 2025
cd23dd1
Fix navigation
FelberMartin Jan 22, 2025
cc79f22
Fix test after merge
FelberMartin Jan 22, 2025
db59e84
Display images in savedPosts
FelberMartin Jan 22, 2025
269a99f
Merge branch 'develop' into feature/communication/save-messages-for-l…
FelberMartin Jan 23, 2025
9e1225b
Fix merge issues
FelberMartin Jan 23, 2025
d9b65dc
Fix spacings
FelberMartin Jan 23, 2025
99e7d5c
Ignore flaky test
FelberMartin Jan 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix navigation
FelberMartin committed Jan 22, 2025
commit cd23dd1df7ad6b894f6c70d02988f9bb6cf0ae0a
Original file line number Diff line number Diff line change
@@ -33,8 +33,8 @@ import de.tum.informatics.www1.artemis.native_app.feature.metis.manageconversati
import de.tum.informatics.www1.artemis.native_app.feature.metis.manageconversations.ui.conversation.settings.add_members.ConversationAddMembersScreen
import de.tum.informatics.www1.artemis.native_app.feature.metis.manageconversations.ui.conversation.settings.members.ConversationMembersScreen
import de.tum.informatics.www1.artemis.native_app.feature.metis.manageconversations.ui.conversation.settings.overview.ConversationSettingsScreen
import de.tum.informatics.www1.artemis.native_app.feature.metis.ui.user_conversation.NavigateToUserConversationUi
import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.StandalonePostId
import de.tum.informatics.www1.artemis.native_app.feature.metis.ui.user_conversation.NavigateToUserConversationUi

@Composable
internal fun SinglePageConversationBody(
@@ -71,11 +71,7 @@ internal fun SinglePageConversationBody(
}

BackHandler(useCustomBackHandling) {
when (val config = configuration) {
is OpenedConversation -> configuration =
if (config.openedThread != null) config.copy(openedThread = null) else NothingOpened
else -> navigateToPrevConfig()
}
navigateToPrevConfig()
}

val conversationOverview: @Composable (Modifier) -> Unit = { m ->
@@ -105,9 +101,9 @@ internal fun SinglePageConversationBody(
targetState = configuration,
transitionSpec = {
val navigationLevelDiff = targetState.navigationLevel - initialState.navigationLevel
when (navigationLevelDiff) {
1 -> DefaultTransition.navigateForward
-1 -> DefaultTransition.navigateBack
when {
navigationLevelDiff > 0 -> DefaultTransition.navigateForward
navigationLevelDiff < 0 -> DefaultTransition.navigateBack
else -> DefaultTransition.navigateNeutral
}
.using(
@@ -137,9 +133,7 @@ internal fun SinglePageConversationBody(
openedThread = OpenedThread(postId)
)
},
onCloseThread = {
configuration = config.copy(openedThread = null)
},
onCloseThread = navigateToPrevConfig,
onCloseConversation = {
configuration = NothingOpened
},