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
33 changes: 19 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid)
alias(libs.plugins.kotlinxSerialization)
alias(libs.plugins.kapt)
alias(libs.plugins.ksp)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.hilt)
}

android {
Expand All @@ -29,11 +30,15 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
composeCompiler {
reportsDestination = layout.buildDirectory.dir("compose_compiler")
metricsDestination = layout.buildDirectory.dir("compose_compiler")
enableStrongSkippingMode = true
stabilityConfigurationFile = rootProject.file("compose-stability.conf")
}
buildFeatures {
viewBinding true
viewBinding false // так как XML-лейаутов больше нет
compose true
}
}

Expand All @@ -47,14 +52,8 @@ dependencies {
implementation libs.core.ktx
implementation libs.appcompat
implementation libs.material
implementation libs.constraintlayout
implementation libs.swipetorefresh
implementation libs.lifecycle.livedata.ktx
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,10 +62,16 @@ dependencies {
implementation libs.androidx.datastore
implementation libs.androidx.datastore.preferences

implementation libs.dagger
kapt libs.daggerCompiler
implementation platform(libs.androidx.compose.bom)
implementation libs.bundles.compose
implementation libs.kotlinx.collections.immutable
debugImplementation libs.androidx.compose.ui.tooling

implementation libs.hilt.android
ksp libs.hilt.compiler
implementation libs.hilt.navigation.compose

testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.espresso.core
}
}
28 changes: 13 additions & 15 deletions app/src/main/java/ru/otus/marketsample/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
package ru.otus.marketsample

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
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 dagger.hilt.android.AndroidEntryPoint
import ru.otus.marketsample.ui.navigation.MainScreen
import ru.otus.marketsample.ui.theme.MarketSampleTheme

class MainActivity : AppCompatActivity() {

private lateinit var binding: ActivityMainBinding
@AndroidEntryPoint
class MainActivity : ComponentActivity() {

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 {
MarketSampleTheme {
MainScreen()
}
}
}
}
}
49 changes: 0 additions & 49 deletions app/src/main/java/ru/otus/marketsample/MainFragment.kt

This file was deleted.

14 changes: 3 additions & 11 deletions app/src/main/java/ru/otus/marketsample/MarketSampleApp.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
package ru.otus.marketsample

import android.app.Application
import ru.otus.marketsample.di.AppComponent
import ru.otus.marketsample.di.DaggerAppComponent
import ru.otus.common.di.Dependencies
import ru.otus.common.di.DependenciesProvider
import dagger.hilt.android.HiltAndroidApp

class MarketSampleApp: Application(), DependenciesProvider {
val appComponent: AppComponent = DaggerAppComponent.factory().create(this)

override fun getDependencies(): Dependencies {
return appComponent
}
}
@HiltAndroidApp
class MarketSampleApp : Application()

This file was deleted.

Loading