Improvements to the old bookmarks screen
This commit is contained in:
+2
-4
@@ -32,7 +32,7 @@ import androidx.compose.material.icons.automirrored.filled.DriveFileMove
|
|||||||
import androidx.compose.material3.ExtendedFloatingActionButton
|
import androidx.compose.material3.ExtendedFloatingActionButton
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.SecondaryScrollableTabRow
|
import androidx.compose.material3.SecondaryTabRow
|
||||||
import androidx.compose.material3.Tab
|
import androidx.compose.material3.Tab
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
@@ -42,7 +42,6 @@ import androidx.compose.runtime.rememberCoroutineScope
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||||
import com.vitorpamplona.amethyst.R
|
import com.vitorpamplona.amethyst.R
|
||||||
@@ -102,11 +101,10 @@ private fun RenderOldBookmarkScreen(
|
|||||||
topBar = {
|
topBar = {
|
||||||
Column {
|
Column {
|
||||||
TopBarWithBackButton(stringRes(id = R.string.old_bookmarks_title), nav::popBack)
|
TopBarWithBackButton(stringRes(id = R.string.old_bookmarks_title), nav::popBack)
|
||||||
SecondaryScrollableTabRow(
|
SecondaryTabRow(
|
||||||
containerColor = Color.Transparent,
|
containerColor = Color.Transparent,
|
||||||
contentColor = MaterialTheme.colorScheme.onBackground,
|
contentColor = MaterialTheme.colorScheme.onBackground,
|
||||||
selectedTabIndex = pagerState.currentPage,
|
selectedTabIndex = pagerState.currentPage,
|
||||||
edgePadding = 8.dp,
|
|
||||||
modifier = TabRowHeight,
|
modifier = TabRowHeight,
|
||||||
) {
|
) {
|
||||||
Tab(
|
Tab(
|
||||||
|
|||||||
@@ -409,9 +409,9 @@
|
|||||||
<string name="manual_zaps">Manual Zap Splits</string>
|
<string name="manual_zaps">Manual Zap Splits</string>
|
||||||
<string name="bookmarks">Bookmarks</string>
|
<string name="bookmarks">Bookmarks</string>
|
||||||
<string name="bookmarks_title">Bookmarks</string>
|
<string name="bookmarks_title">Bookmarks</string>
|
||||||
<string name="bookmarks_explainer">Your bookmarks (kind 10003)</string>
|
<string name="bookmarks_explainer">Your bookmarks</string>
|
||||||
<string name="old_bookmarks_title">Old Bookmarks</string>
|
<string name="old_bookmarks_title">Old Bookmarks</string>
|
||||||
<string name="old_bookmarks_explainer">Your old bookmarks (kind 30001). Migrate them to the new format.</string>
|
<string name="old_bookmarks_explainer">Your old bookmarks</string>
|
||||||
<string name="migrate_bookmarks_button">Move All to New Bookmarks</string>
|
<string name="migrate_bookmarks_button">Move All to New Bookmarks</string>
|
||||||
<string name="migrate_bookmarks_success">Bookmarks migrated successfully</string>
|
<string name="migrate_bookmarks_success">Bookmarks migrated successfully</string>
|
||||||
<string name="drafts">Drafts</string>
|
<string name="drafts">Drafts</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user