|
@@ -10,6 +10,7 @@ import androidx.compose.foundation.text.KeyboardOptions
|
|
|
import androidx.compose.material.TextFieldDefaults
|
|
|
import androidx.compose.material.icons.Icons
|
|
|
import androidx.compose.material.icons.outlined.ArrowBack
|
|
|
+import androidx.compose.material.icons.outlined.ArrowForward
|
|
|
import androidx.compose.material.icons.outlined.Close
|
|
|
import androidx.compose.material.icons.outlined.MoreVert
|
|
|
import androidx.compose.material.icons.outlined.Search
|
|
@@ -38,12 +39,14 @@ import androidx.compose.ui.graphics.Color
|
|
|
import androidx.compose.ui.graphics.SolidColor
|
|
|
import androidx.compose.ui.graphics.vector.ImageVector
|
|
|
import androidx.compose.ui.platform.LocalFocusManager
|
|
|
+import androidx.compose.ui.platform.LocalLayoutDirection
|
|
|
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
import androidx.compose.ui.text.font.FontWeight
|
|
|
import androidx.compose.ui.text.input.ImeAction
|
|
|
import androidx.compose.ui.text.input.VisualTransformation
|
|
|
import androidx.compose.ui.text.style.TextOverflow
|
|
|
+import androidx.compose.ui.unit.LayoutDirection
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
import androidx.compose.ui.unit.sp
|
|
|
import eu.kanade.tachiyomi.R
|
|
@@ -62,7 +65,7 @@ fun AppBar(
|
|
|
subtitle: String? = null,
|
|
|
// Up button
|
|
|
navigateUp: (() -> Unit)? = null,
|
|
|
- navigationIcon: ImageVector = Icons.Outlined.ArrowBack,
|
|
|
+ navigationIcon: ImageVector? = null,
|
|
|
// Menu
|
|
|
actions: @Composable RowScope.() -> Unit = {},
|
|
|
// Action mode
|
|
@@ -107,7 +110,7 @@ fun AppBar(
|
|
|
titleContent: @Composable () -> Unit,
|
|
|
// Up button
|
|
|
navigateUp: (() -> Unit)? = null,
|
|
|
- navigationIcon: ImageVector = Icons.Outlined.ArrowBack,
|
|
|
+ navigationIcon: ImageVector? = null,
|
|
|
// Menu
|
|
|
actions: @Composable RowScope.() -> Unit = {},
|
|
|
// Action mode
|
|
@@ -131,10 +134,7 @@ fun AppBar(
|
|
|
} else {
|
|
|
navigateUp?.let {
|
|
|
IconButton(onClick = it) {
|
|
|
- Icon(
|
|
|
- imageVector = navigationIcon,
|
|
|
- contentDescription = stringResource(R.string.abc_action_bar_up_description),
|
|
|
- )
|
|
|
+ UpIcon(navigationIcon)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -360,6 +360,16 @@ fun SearchToolbar(
|
|
|
)
|
|
|
}
|
|
|
|
|
|
+@Composable
|
|
|
+fun UpIcon(navigationIcon: ImageVector? = null) {
|
|
|
+ val icon = navigationIcon
|
|
|
+ ?: if (LocalLayoutDirection.current == LayoutDirection.Ltr) Icons.Outlined.ArrowBack else Icons.Outlined.ArrowForward
|
|
|
+ Icon(
|
|
|
+ imageVector = icon,
|
|
|
+ contentDescription = stringResource(R.string.abc_action_bar_up_description),
|
|
|
+ )
|
|
|
+}
|
|
|
+
|
|
|
sealed interface AppBar {
|
|
|
sealed interface AppBarAction
|
|
|
|