Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main to develop #32

Merged
merged 8 commits into from
Aug 6, 2024
Merged

main to develop #32

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c0e151
fix
G-dev-ui Aug 5, 2024
abaecb7
fix2
G-dev-ui Aug 5, 2024
ed83600
fix3
G-dev-ui Aug 5, 2024
f107660
fix4
G-dev-ui Aug 5, 2024
aa6efd3
fix4
G-dev-ui Aug 5, 2024
7eda430
Merge remote-tracking branch 'origin/iteration_1_review' into iterati…
G-dev-ui Aug 5, 2024
be6a618
Lint fix
ElchinGasymov Aug 5, 2024
3d6834d
Merge pull request #31 from ElchinGasymov/iteration_1_review
G-dev-ui Aug 5, 2024
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
4 changes: 2 additions & 2 deletions app/src/main/java/ru/practicum/android/diploma/di/DataModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ru.practicum.android.diploma.di

import org.koin.android.ext.koin.androidContext
import androidx.room.Room
import org.koin.android.ext.koin.androidContext
import org.koin.dsl.module
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import ru.practicum.android.diploma.data.db.AppDatabase
import ru.practicum.android.diploma.data.network.HHApiService
import ru.practicum.android.diploma.data.network.NetworkClient
import ru.practicum.android.diploma.data.network.RetrofitNetworkClient
import ru.practicum.android.diploma.data.db.AppDatabase

const val BASE_URL = "https://api.hh.ru/"
val dataModule = module {
Expand Down
Loading