fincode/TSUDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change icon type

Browse Source
This commit is contained in:
Shcherbatykh Oleg
2026-02-27 11:21:03 +03:00
parent 993ab0a0b1
commit aaed01bd12
6 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/ru/fincode/tsudesk/presentation/main/MainScaffold.kt
View File

@@ -5,8 +5,8 @@ import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.navigation.NavHostController
import androidx.navigation.compose.currentBackStackEntryAsState
import ru.fincode.core.ui.components.BottomBarItem
@@ -20,32 +20,20 @@ fun MainScaffold(
navController: NavHostController,
content: @Composable (Modifier) -> Unit,
) {
val scheduleIcon = painterResource(R.drawable.ic_progress)
val newsIcon = painterResource(R.drawable.ic_news)
val progressIcon = painterResource(R.drawable.ic_progress)
val settingsIcon = painterResource(R.drawable.ic_progress)
val scheduleIcon =
androidx.compose.ui.graphics.vector.ImageVector.vectorResource(R.drawable.ic_progress)
val newsIcon =
androidx.compose.ui.graphics.vector.ImageVector.vectorResource(R.drawable.ic_progress)
val progressIcon =
androidx.compose.ui.graphics.vector.ImageVector.vectorResource(R.drawable.ic_progress)
val settingsIcon =
androidx.compose.ui.graphics.vector.ImageVector.vectorResource(R.drawable.ic_progress)
val items = listOf(
TopLevelItem(
destination = TopLevelDestination.SCHEDULE,
labelRes = R.string.tab_schedule,
icon = scheduleIcon
),
TopLevelItem(
destination = TopLevelDestination.NEWS,
labelRes = R.string.tab_news,
icon = newsIcon
),
TopLevelItem(
destination = TopLevelDestination.PROGRESS,
labelRes = R.string.tab_progress,
icon = progressIcon
),
TopLevelItem(
destination = TopLevelDestination.SETTINGS,
labelRes = R.string.tab_settings,
icon = settingsIcon
),
TopLevelItem(TopLevelDestination.SCHEDULE, R.string.tab_schedule, scheduleIcon),
TopLevelItem(TopLevelDestination.NEWS, R.string.tab_news, newsIcon),
TopLevelItem(TopLevelDestination.PROGRESS, R.string.tab_progress, progressIcon),
TopLevelItem(TopLevelDestination.SETTINGS, R.string.tab_settings, settingsIcon),
)
val backStackEntry by navController.currentBackStackEntryAsState()

4
app/src/main/java/ru/fincode/tsudesk/presentation/main/TopLevelItem.kt
View File

@@ -1,11 +1,11 @@
package ru.fincode.tsudesk.presentation.main
import androidx.annotation.StringRes
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import ru.fincode.tsudesk.core.navigation.TopLevelDestination
data class TopLevelItem(
val destination: TopLevelDestination,
@StringRes val labelRes: Int,
val icon: Painter,
val icon: ImageVector
)

6
app/src/main/java/ru/fincode/tsudesk/presentation/navigation/AppNavHost.kt
View File

@@ -9,6 +9,7 @@ import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import ru.fincode.tsudesk.core.navigation.AppRoute
import ru.fincode.tsudesk.core.navigation.navigateRoute
import ru.fincode.tsudesk.feature.news.presentation.screen.NewsRoute
import ru.fincode.tsudesk.presentation.main.MainScaffold
import ru.fincode.tsudesk.feature.schedule.presentation.screen.ScheduleRoute
import ru.fincode.tsudesk.feature.splash.presentation.screen.SplashRoute
@@ -73,9 +74,4 @@ private fun MainTabsNavHost(
// SettingsRoute(modifier = Modifier)
}
}
}
@Composable
fun NewsRoute(modifier: Modifier) {
TODO("Not yet implemented")
}

8
app/src/main/res/drawable/ic_progress.xml
View File

@@ -3,10 +3,12 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,3L1,9l11,6 9,-4.91V17h2V9L12,3z"
android:fillColor="?attr/colorControlNormal"/>
android:fillColor="#FF000000"/>
<path
android:pathData="M5,12.18V17c0,2.21 3.58,4 7,4s7,-1.79 7,-4v-4.82l-7,3.82 -7,-3.82z"
android:fillColor="?attr/colorControlNormal"/>
</vector>
android:fillColor="#FF000000"/>
</vector>