msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 08:17:04 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 3

all: migrate from drawables to generated ImageVectors

Browse source
This commit is contained in:
Harsh Shandilya 2022-04-22 20:29:00 +05:30
parent 67389c8acd
commit 0a1634bb83
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
19 changed files with 314 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

7
android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
View file

@ -21,7 +21,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.lifecycle.viewmodel.compose.viewModel
@ -42,10 +41,10 @@ import dev.msfjarvis.claw.android.ui.lists.HottestPosts
import dev.msfjarvis.claw.android.ui.navigation.Destinations
import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
import dev.msfjarvis.claw.api.LobstersApi
import dev.msfjarvis.claw.common.R as commonR
import dev.msfjarvis.claw.common.comments.CommentsPage
import dev.msfjarvis.claw.common.comments.HTMLConverter
import dev.msfjarvis.claw.common.comments.LocalHTMLConverter
import dev.msfjarvis.claw.common.res.ClawIcons
import dev.msfjarvis.claw.common.theme.LobstersTheme
import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
import kotlinx.coroutines.launch
@ -85,12 +84,12 @@ fun LobstersApp(
NavigationItem(
label = "Hottest",
route = Destinations.Hottest.getRoute(),
icon = painterResource(R.drawable.ic_whatshot_24dp),
icon = ClawIcons.Flame,
) { coroutineScope.launch { networkListState.animateScrollToItem(index = 0) } },
NavigationItem(
label = "Saved",
route = Destinations.Saved.getRoute(),
icon = painterResource(commonR.drawable.ic_favorite_24dp),
icon = ClawIcons.Heart,
) { coroutineScope.launch { savedListState.animateScrollToItem(index = 0) } },
)

6
android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt
View file

@ -7,7 +7,7 @@ import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.navigation.NavController
import dev.msfjarvis.claw.android.ui.navigation.Destinations
import dev.msfjarvis.claw.android.ui.slideInAnimation
@ -29,7 +29,7 @@ fun ClawNavigationBar(
NavigationBar(modifier = modifier) {
items.forEach { navItem ->
NavigationBarItem(
icon = { Icon(painter = navItem.icon, contentDescription = navItem.label) },
icon = { Icon(imageVector = navItem.icon, contentDescription = navItem.label) },
label = { Text(text = navItem.label) },
selected = navController.currentDestination?.route == navItem.route,
onClick = {
@ -51,6 +51,6 @@ fun ClawNavigationBar(
class NavigationItem(
val label: String,
val route: String,
val icon: Painter,
val icon: ImageVector,
val listStateResetCallback: () -> Unit,
)

9
android/src/main/res/drawable/ic_whatshot_24dp.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M13.5,0.67s0.74,2.65 0.74,4.8c0,2.06 -1.35,3.73 -3.41,3.73 -2.07,0 -3.63,-1.67 -3.63,-3.73l0.03,-0.36C5.21,7.51 4,10.62 4,14c0,4.42 3.58,8 8,8s8,-3.58 8,-8C20,8.61 17.41,3.8 13.5,0.67zM11.71,19c-1.78,0 -3.22,-1.4 -3.22,-3.14 0,-1.62 1.05,-2.76 2.81,-3.12 1.77,-0.36 3.6,-1.21 4.62,-2.58 0.39,1.29 0.59,2.65 0.59,4.04 0,2.65 -2.15,4.8 -4.8,4.8z" />
</vector>