Bookmark (Lesson / Playlist)

.maestro/flows/001_001_invite_users_using_qr_code_or_link_test.yaml

@@ -21,7 +21,7 @@ onFlowComplete:
 - runFlow: "subflows/school_admin_login_flow.yaml"
 - assertVisible:
     id: "app_title"
-    text: "Apps"
+    text: "Home"
 - tapOn: "People"
 - tapOn:
     id: "ExpandableFab"   #  +Person button
@@ -98,8 +98,8 @@ onFlowComplete:
 - tapOn: "Sign-up"
 - assertVisible:
     id: "app_title"
-    text: "Apps"
-- assertVisible: "Apps"
+    text: "Home"
+- assertVisible: "Home"
 - assertVisible: "Assignments"
 - assertVisible: "People"
 - runFlow:
@@ -190,7 +190,7 @@ onFlowComplete:
     id : "password"
 - inputText: "test123"
 - tapOn: "Login"
-- assertVisible: "Apps"
+- assertVisible: "Home"
 - tapOn: "Classes"
 - assertVisible:
     id: "app_title"

.maestro/flows/001_002_add_user_direct_test.yaml

@@ -363,7 +363,7 @@ onFlowComplete:
 - assertVisible:
     id: "app_title"
     text: "Assignments"
-- assertVisible: "Apps"
+- assertVisible: "Home"
 - assertNotVisible: "Classes"
 - assertNotVisible: "People"
 
@@ -382,10 +382,10 @@ onFlowComplete:
 - tapOn: "Url"
 - inputText:  ${output.SCHOOL_URL}respect_school_link/personqrbadge/id/12312
 - tapOn: "OK"
-- assertVisible: "Apps"
+- assertVisible: "Home"
 - assertVisible:
     id: "app_title"
-    text: "Apps"
+    text: "Home"
 - assertVisible: "Assignments"
 - assertVisible: "Classes"
 - assertVisible: "People"

.maestro/flows/001_003_login_using_school_link_test.yaml

@@ -48,5 +48,5 @@ onFlowComplete:
     when:
       visible: "Save password for Respect?"
     file: "subflows/save_password_prompt_cancel.yaml"
-- assertVisible: "Apps"
+- assertVisible: "Home"
 

.maestro/flows/001_005_add_school_self_registration_test.yaml

@@ -84,7 +84,7 @@ onFlowComplete:
 - tapOn: "Sign-up"
 - assertVisible:
     id: "app_title"
-    text: "Apps"
+    text: "Home"
 - tapOn:
     id: "user_account_icon"
 - assertVisible: "Profile"
@@ -106,4 +106,4 @@ onFlowComplete:
     when:
       visible: "Save password for Respect?"
     file: "subflows/save_password_prompt_cancel.yaml"
-- assertVisible: "Apps"
+- assertVisible: "Home"

.maestro/flows/002_browse_lessons_test.yaml

@@ -17,8 +17,13 @@ onFlowComplete:
       file: "scripts/teardown.js"
 ---
 - runFlow: "subflows/school_admin_login_flow.yaml"
+- assertVisible: "Home"
+- assertVisible:
+    id: "app_title"
+    text: "Home"
+- tapOn: "Apps"
 - tapOn:
-    id: "floating_action_button"
+    id: "floating_action_button"  # +Add App
 - tapOn: "Add from Link"
 - tapOn: "Link*"
 - inputText: ${output.SCHOOL_URL}static-resources/respect-ds/case_valid/appmanifest.json
@@ -30,23 +35,48 @@ onFlowComplete:
 - assertVisible: "Add App"
 # verify App got added to Apps section
 - tapOn: "Add App"
-- tapOn: "Apps"
+- tapOn: "Home"
 - assertVisible:
     id: "app_title"
-    text: "Apps"
-- assertVisible: "My app"
+    text: "Home"
+- tapOn: "Bookmarks"
+- assertVisible: "No bookmarks yet"
+- assertVisible: "Bookmark a lesson or a playlist to see it here."
+- tapOn: "Apps"
 - tapOn: "My app"
-- assertVisible: "Lessons"
-- tapOn: "Lessons"
 - tapOn: "Grade 1"
 - tapOn: "Lesson 001"
 - assertVisible: "Lesson 001"
-- assertVisible: "App name"
+- assertVisible: "My App"
 - tapOn: "Open"
 - extendedWaitUntil:
     visible: "Lesson 001"
     timeout: 1000
 - assertVisible: "Hello World Lesson"
 - tapOn: "Close"
+- assertVisible: "Download"
+- assertVisible: "Assign"
+- tapOn: "Bookmark"
+- back
+- assertVisible: "Lesson 002"
+- tapOn: "Lesson 002"
+- tapOn: "Bookmark"
+- tapOn: "Home"
+- tapOn: "Bookmarks"
+- assertVisible: "Lesson 001"
+- assertVisible: "Lesson 002"
 
-
+- clearState: world.respect.app
+- runFlow: "subflows/school_admin_login_flow.yaml"
+- assertVisible: "Home"
+- assertVisible:
+    id: "app_title"
+    text: "Home"
+- tapOn: "Bookmarks"
+- assertVisible: "Lesson 001"
+- assertVisible: "Lesson 002"
+- tapOn:                       #Remove bookmark
+    text: "Bookmark"
+    index: 0
+- assertNotVisible: "Lesson 001"
+- assertVisible: "Lesson 002"

.maestro/flows/003_admin_user_assigns_assignment_to_a_class_test.yaml

@@ -41,7 +41,7 @@ onFlowComplete:
     when:
       visible: "Save password for Respect?"
     file: "subflows/save_password_prompt_cancel.yaml"
-- assertVisible: "Apps"
+- assertVisible: "Home"
 - tapOn: "Classes"
 - assertVisible:
     id: "app_title"
@@ -68,8 +68,6 @@ onFlowComplete:
     file: "scripts/setDate.js"
 - inputText: ${output.currentTime}
 - tapOn: "Lesson/assessment"
-- assertVisible:
-    id: "app_title"
 - tapOn: "My app"
 - tapOn: "Grade 1"
 - tapOn: "Lesson 001"

.maestro/flows/subflows/admin_add_app.yaml

@@ -3,7 +3,8 @@ appId: world.respect.app
 ---
 - assertVisible:
     id: "app_title"
-    text: "Apps"
+    text: "Home"
+- tapOn: "Apps"
 - tapOn:
     id: "floating_action_button"
 - tapOn: "Add from Link"

.maestro/flows/subflows/admin_add_app_and_teacher.yaml

@@ -5,7 +5,8 @@ appId: world.respect.app
 - runFlow: "school_admin_login_flow.yaml"
 - assertVisible:
     id: "app_title"
-    text: "Apps"
+    text: "Home"
+- tapOn: "Apps"
 - tapOn:
     id: "floating_action_button"
 - tapOn: "Add from Link"
@@ -16,7 +17,7 @@ appId: world.respect.app
     id: "app_title"
     text: "App detail"
 - tapOn: "Add App"
-- tapOn: "Apps"
+- tapOn:  "Home"
 - assertVisible: "My app"
 
 #  Admin add new class

respect-app-compose/src/androidMain/kotlin/world/respect/AppKoinModule.kt

@@ -245,6 +245,7 @@ import world.respect.shared.domain.urltonavcommand.ResolveUrlToNavCommandUseCase
 import world.respect.shared.viewmodel.scanqrcode.ScanQRCodeViewModel
 import world.respect.shared.domain.navigation.deferreddeeplink.GetDeferredDeepLinkUseCaseAndroid
 import world.respect.shared.domain.navigation.onappstart.NavigateOnAppStartUseCase
+import world.respect.shared.viewmodel.bookmark.BookmarkListViewModel
 
 
 const val SHARED_PREF_SETTINGS_NAME = "respect_settings3_"
@@ -384,7 +385,7 @@ val appKoinModule = module {
     viewModelOf(::EnrollmentEditViewModel)
     viewModelOf(::InviteQrViewModel)
     viewModelOf(::CreateAccountSetPasswordViewModel)
-
+    viewModelOf(::BookmarkListViewModel)
 
     single<GetOfflineStorageOptionsUseCase> {
         GetOfflineStorageOptionsUseCaseAndroid(

respect-app-compose/src/commonMain/kotlin/world/respect/app/app/App.kt

@@ -13,8 +13,10 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -46,7 +48,7 @@ import world.respect.navigation.NavCommandEffect
 import world.respect.shared.domain.account.RespectAccountManager
 import world.respect.shared.domain.biometric.BiometricAuthUseCase
 import world.respect.shared.generated.resources.Res
-import world.respect.shared.generated.resources.apps
+import world.respect.shared.generated.resources.home
 import world.respect.shared.generated.resources.assignments
 import world.respect.shared.generated.resources.parents_only
 import world.respect.shared.generated.resources.cancel
@@ -60,8 +62,7 @@ import world.respect.shared.navigation.Home
 import world.respect.shared.navigation.NavCommand
 import world.respect.shared.navigation.PersonList
 import world.respect.shared.navigation.RespectComposeNavController
-import world.respect.shared.resources.StringResourceUiText
-import world.respect.shared.resources.StringUiText
+import world.respect.shared.ext.asString
 import world.respect.shared.viewmodel.app.appstate.AppUiState
 import world.respect.shared.viewmodel.app.appstate.FabUiState
 import world.respect.shared.viewmodel.app.appstate.SnackBarFlowDispatcher
@@ -84,7 +85,7 @@ val APP_TOP_LEVEL_NAV_ITEMS = listOf(
     TopNavigationItem(
         destRoute = Home,
         icon = Icons.Filled.GridView,
-        label = Res.string.apps,
+        label = Res.string.home,
         routeName = "$routeNamePrefix.Home",
     ),
     TopNavigationItem(
@@ -116,7 +117,7 @@ val APP_TOP_LEVEL_NAV_ITEMS_FOR_CHILD = listOf(
     TopNavigationItem(
         destRoute = Home,
         icon = Icons.Filled.GridView,
-        label = Res.string.apps,
+        label = Res.string.home,
         routeName = "$routeNamePrefix.Home",
     ),
 )
@@ -177,17 +178,19 @@ fun App(
     val koin = getKoin()
 
     LaunchedEffect(Unit) {
-        koin.get<SnackBarFlowDispatcher>().snackFlow.collectLatest {
-            val uiText = it.message
-            val message = if(uiText is StringUiText) {
-                uiText.text
-            }else if(uiText is StringResourceUiText) {
-                getString(uiText.resource)
-            }else {
-                ""
-            }
+        koin.get<SnackBarFlowDispatcher>().snackFlow.collectLatest { snack->
+
+            val message = snack.message.asString()
+            val actionLabel = snack.action?.asString()
 
-            snackbarHostState.showSnackbar(message, it.action)
+            val result = snackbarHostState.showSnackbar(
+                message = message,
+                actionLabel = actionLabel,
+                duration = SnackbarDuration.Short
+            )
+            if (result == SnackbarResult.ActionPerformed) {
+                snack.onAction?.invoke()
+            }
         }
     }
 

respect-app-compose/src/commonMain/kotlin/world/respect/app/app/AppNavHost.kt

@@ -14,6 +14,7 @@ import world.respect.app.view.apps.list.AppListScreen
 import world.respect.app.view.assignment.detail.AssignmentDetailScreen
 import world.respect.app.view.assignment.edit.AssignmentEditScreen
 import world.respect.app.view.assignment.list.AssignmentListScreen
+import world.respect.app.view.bookmark.BookmarkListScreen
 import world.respect.app.view.clazz.detail.ClazzDetailScreen
 import world.respect.app.view.clazz.edit.ClazzEditScreen
 import world.respect.app.view.clazz.list.ClazzListScreen
@@ -73,6 +74,7 @@ import world.respect.shared.navigation.ClazzDetail
 import world.respect.shared.navigation.ClazzEdit
 import world.respect.shared.navigation.ClazzList
 import world.respect.shared.navigation.AcceptInvite
+import world.respect.shared.navigation.BookmarkList
 import world.respect.shared.navigation.CopyCode
 import world.respect.shared.navigation.CreateAccount
 import world.respect.shared.navigation.CreateAccountSetPassword
@@ -260,6 +262,14 @@ fun AppNavHost(
             )
         }
 
+        composable<BookmarkList> {
+            BookmarkListScreen(
+                viewModel = respectViewModel(
+                    onSetAppUiState = onSetAppUiState,
+                    navController = respectNavController,
+                )
+            )
+        }
         composable<ClazzList> {
             val viewModel: ClazzListViewModel = respectViewModel(
                 onSetAppUiState = onSetAppUiState,