mirror of
https://github.com/msfjarvis/compose-lobsters
synced 2025-08-14 10:37:05 +05:30
common: replace material with material3 where possible
This commit is contained in:
parent
5cc0315bfb
commit
1d02f56025
6 changed files with 9 additions and 6 deletions
|
@ -4,8 +4,6 @@ import androidx.compose.animation.ExperimentalAnimationApi
|
||||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||||
import androidx.compose.material.icons.Icons
|
|
||||||
import androidx.compose.material.icons.filled.ArrowBack
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
|
@ -129,7 +127,7 @@ fun LobstersApp(
|
||||||
if (navItems.none { it.route == currentDestination }) {
|
if (navItems.none { it.route == currentDestination }) {
|
||||||
IconButton(onClick = { navController.popBackStack() }) {
|
IconButton(onClick = { navController.popBackStack() }) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Filled.ArrowBack,
|
painter = ClawIcons.ArrowBack,
|
||||||
contentDescription = "Go back to previous screen",
|
contentDescription = "Go back to previous screen",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,9 +13,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material.Icon
|
|
||||||
import androidx.compose.material.LocalContentColor
|
import androidx.compose.material.LocalContentColor
|
||||||
import androidx.compose.material.LocalTextStyle
|
import androidx.compose.material.LocalTextStyle
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
|
|
|
@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.foundation.lazy.itemsIndexed
|
import androidx.compose.foundation.lazy.itemsIndexed
|
||||||
import androidx.compose.material.Surface
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package dev.msfjarvis.claw.common.res
|
package dev.msfjarvis.claw.common.res
|
||||||
|
|
||||||
|
import dev.msfjarvis.claw.common.res.clawicons.arrow_back_black_24dp
|
||||||
import dev.msfjarvis.claw.common.res.clawicons.comment_black_24dp
|
import dev.msfjarvis.claw.common.res.clawicons.comment_black_24dp
|
||||||
import dev.msfjarvis.claw.common.res.clawicons.favorite_black_24dp
|
import dev.msfjarvis.claw.common.res.clawicons.favorite_black_24dp
|
||||||
import dev.msfjarvis.claw.common.res.clawicons.favorite_border_black_24dp
|
import dev.msfjarvis.claw.common.res.clawicons.favorite_border_black_24dp
|
||||||
|
@ -8,6 +9,9 @@ import dev.msfjarvis.claw.common.res.clawicons.public_black_24dp
|
||||||
import dev.msfjarvis.claw.common.res.clawicons.whatshot_black_24dp
|
import dev.msfjarvis.claw.common.res.clawicons.whatshot_black_24dp
|
||||||
|
|
||||||
object ClawIcons {
|
object ClawIcons {
|
||||||
|
|
||||||
|
val ArrowBack = arrow_back_black_24dp()
|
||||||
|
|
||||||
val Comment = comment_black_24dp()
|
val Comment = comment_black_24dp()
|
||||||
|
|
||||||
val Flame = whatshot_black_24dp()
|
val Flame = whatshot_black_24dp()
|
||||||
|
|
|
@ -2,8 +2,8 @@ package dev.msfjarvis.claw.common.ui
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.material.Text
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
|
1
common/src/commonMain/svgs/arrow_back_black_24dp.svg
Normal file
1
common/src/commonMain/svgs/arrow_back_black_24dp.svg
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"/></svg>
|
After Width: | Height: | Size: 217 B |
Loading…
Add table
Add a link
Reference in a new issue