Commits:
5 changed files:
Changes:
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksAction.kt
| ... |
... |
@@ -82,7 +82,6 @@ internal data object SearchClicked : BookmarksAction |
|
82
|
82
|
internal data object AddFolderClicked : BookmarksAction
|
|
83
|
83
|
internal data object CloseClicked : BookmarksAction
|
|
84
|
84
|
internal data object BackClicked : BookmarksAction
|
|
85
|
|
-internal data object SignIntoSyncClicked : BookmarksAction
|
|
86
|
85
|
internal data class EditBookmarkClicked(val bookmark: BookmarkItem.Bookmark) : BookmarksAction
|
|
87
|
86
|
internal data class ReceivedSyncSignInUpdate(val isSignedIn: Boolean) : BookmarksAction
|
|
88
|
87
|
internal data object FirstSyncCompleted : BookmarksAction
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksMiddleware.kt
| ... |
... |
@@ -137,7 +137,6 @@ internal class BookmarksMiddleware( |
|
137
|
137
|
SearchClicked -> navigateToSearch()
|
|
138
|
138
|
AddFolderClicked -> getNavController().navigate(BookmarksDestinations.ADD_FOLDER)
|
|
139
|
139
|
CloseClicked -> exitBookmarks()
|
|
140
|
|
- SignIntoSyncClicked -> navigateToSignIntoSync()
|
|
141
|
140
|
is EditBookmarkClicked -> getNavController().navigate(BookmarksDestinations.EDIT_BOOKMARK)
|
|
142
|
141
|
BackClicked -> {
|
|
143
|
142
|
when {
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksReducer.kt
| ... |
... |
@@ -154,7 +154,6 @@ internal fun bookmarksReducer(state: BookmarksState, action: BookmarksAction) = |
|
154
|
154
|
ViewDisposed,
|
|
155
|
155
|
SelectFolderAction.ViewAppeared,
|
|
156
|
156
|
SearchClicked,
|
|
157
|
|
- SignIntoSyncClicked,
|
|
158
|
157
|
is InitEdit,
|
|
159
|
158
|
Init,
|
|
160
|
159
|
PrivateBrowsingAuthorized,
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksScreen.kt
| ... |
... |
@@ -824,38 +824,11 @@ private fun EmptyList( |
|
824
|
824
|
horizontalAlignment = Alignment.CenterHorizontally,
|
|
825
|
825
|
verticalArrangement = Arrangement.spacedBy(16.dp),
|
|
826
|
826
|
) {
|
|
827
|
|
- Image(
|
|
828
|
|
- painter = painterResource(state.drawableId()),
|
|
829
|
|
- contentDescription = null,
|
|
830
|
|
- )
|
|
831
|
827
|
Text(
|
|
832
|
828
|
text = stringResource(R.string.bookmark_empty_list_title),
|
|
833
|
829
|
style = FirefoxTheme.typography.headline7,
|
|
834
|
830
|
color = FirefoxTheme.colors.textPrimary,
|
|
835
|
831
|
)
|
|
836
|
|
- Text(
|
|
837
|
|
- text = stringResource(state.descriptionId()),
|
|
838
|
|
- style = FirefoxTheme.typography.body2,
|
|
839
|
|
- color = FirefoxTheme.colors.textPrimary,
|
|
840
|
|
- textAlign = TextAlign.Center,
|
|
841
|
|
- )
|
|
842
|
|
- if (state is EmptyListState.NotAuthenticated) {
|
|
843
|
|
- TextButton(
|
|
844
|
|
- onClick = { dispatcher(SignIntoSyncClicked) },
|
|
845
|
|
- colors = ButtonDefaults.buttonColors(backgroundColor = FirefoxTheme.colors.actionPrimary),
|
|
846
|
|
- shape = RoundedCornerShape(4.dp),
|
|
847
|
|
- modifier = Modifier
|
|
848
|
|
- .heightIn(36.dp)
|
|
849
|
|
- .fillMaxWidth(),
|
|
850
|
|
- ) {
|
|
851
|
|
- Text(
|
|
852
|
|
- text = stringResource(R.string.bookmark_empty_list_guest_cta),
|
|
853
|
|
- color = FirefoxTheme.colors.textOnColorPrimary,
|
|
854
|
|
- style = FirefoxTheme.typography.button,
|
|
855
|
|
- textAlign = TextAlign.Center,
|
|
856
|
|
- )
|
|
857
|
|
- }
|
|
858
|
|
- }
|
|
859
|
832
|
}
|
|
860
|
833
|
}
|
|
861
|
834
|
}
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksTelemetryMiddleware.kt
| ... |
... |
@@ -135,7 +135,6 @@ internal class BookmarksTelemetryMiddleware : Middleware<BookmarksState, Bookmar |
|
135
|
135
|
Init,
|
|
136
|
136
|
is SelectFolderAction.ItemClicked,
|
|
137
|
137
|
AddFolderAction.ParentFolderClicked,
|
|
138
|
|
- SignIntoSyncClicked,
|
|
139
|
138
|
is AddFolderAction.FolderCreated,
|
|
140
|
139
|
is AddFolderAction.TitleChanged,
|
|
141
|
140
|
is EditBookmarkAction.TitleChanged,
|
|