Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
alias(libs.plugins.kotlinAndroid)
alias(libs.plugins.kotlinxSerialization)
alias(libs.plugins.kapt)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down Expand Up @@ -34,9 +35,20 @@ android {
}
buildFeatures {
viewBinding true
compose true
}
}

composeCompiler {
reportsDestination.set(
layout.buildDirectory.dir("compose-reports")
)

metricsDestination.set(
layout.buildDirectory.dir("compose-metrics")
)
}

dependencies {
implementation project(":common:di")
implementation project(":common:formatters")
Expand All @@ -53,8 +65,6 @@ dependencies {
implementation libs.lifecycle.viewmodel.ktx
implementation libs.fragment.ktx
implementation libs.lifecycle.runtime.ktx
implementation libs.navigation.fragment.ktx
implementation libs.navigation.ui.ktx
implementation libs.coil
implementation libs.gson
implementation libs.bundles.network
Expand All @@ -63,6 +73,17 @@ dependencies {
implementation libs.androidx.datastore
implementation libs.androidx.datastore.preferences

implementation libs.androidx.foundation
implementation libs.androidx.foundation.layout
implementation libs.androidx.material3
implementation libs.androidx.activity.compose
implementation libs.androidx.lifecycle.viewmodel.compose
implementation libs.androidx.lifecycle.runtime.compose

implementation libs.compose.coil

implementation libs.androidx.navigation.compose

implementation libs.dagger
kapt libs.daggerCompiler

Expand Down
48 changes: 48 additions & 0 deletions app/src/main/java/ru/otus/marketsample/BottomBar.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package ru.otus.marketsample

import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.painterResource
import androidx.navigation.NavController
import ru.otus.common.ui.R

@Composable
fun BottomBar(
navController: NavController
){
NavigationBar {
NavigationBarItem(
selected = true,
onClick = {
navController.navigate("products")
},
icon = {
Icon(
painter = painterResource(R.drawable.ic_list),
contentDescription = "Products"
)
},
label = {
Text("Products")
}
)
NavigationBarItem(
selected = false,
onClick = {
navController.navigate("promo")
},
icon = {
Icon(
painter = painterResource(R.drawable.ic_discount),
contentDescription = "Promo"
)
},
label = {
Text("Promo")
}
)
}
}
42 changes: 30 additions & 12 deletions app/src/main/java/ru/otus/marketsample/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,42 @@ package ru.otus.marketsample
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import ru.otus.marketsample.databinding.ActivityMainBinding
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.ui.Modifier
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import ru.otus.marketsample.navigation.CreateGraph

class MainActivity : AppCompatActivity() {

private lateinit var binding: ActivityMainBinding

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)

ViewCompat.setOnApplyWindowInsetsListener(binding.container) { view, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
view.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
insets

setContent {
val navController = rememberNavController()

val currentRoute = navController
.currentBackStackEntryAsState()
.value
?.destination
?.route

Scaffold(
bottomBar = {
if (currentRoute != "details/{productId}") {
BottomBar(navController = navController)
}
}
) { padding ->
CreateGraph(
navController = navController,
appComponent = (application as MarketSampleApp).appComponent,
modifier = Modifier.padding(padding)
)
}
}
}
}
49 changes: 0 additions & 49 deletions app/src/main/java/ru/otus/marketsample/MainFragment.kt

This file was deleted.

This file was deleted.

Loading