added dagger-hilt

oguzcetinbas · May 25, 2023 · c02ba01 · c02ba01
1 parent 2d63f81
commit c02ba01
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -62,14 +62,14 @@ dependencies {
  implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
  implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
- implementation 'androidx.fragment:fragment-ktx:1.5.6'
+ implementation 'androidx.fragment:fragment-ktx:1.5.7'
 
  // Retrofit
  implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 
  // okHttp
- implementation("com.squareup.okhttp3:okhttp:4.10.0")
- implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
+ implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2")
+ implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2")
 
  // Gson
  implementation 'com.squareup.retrofit2:converter-gson:2.9.0'

diff --git a/app/src/main/java/com/example/hw13_weatherapp/constants/Consts.kt b/app/src/main/java/com/example/hw13_weatherapp/constants/Consts.kt
@@ -5,7 +5,7 @@ import com.example.hw13_weatherapp.R
 object Consts{
 
  // Base Url tanımlandı
- //const val BASE_URL = "https://api.open-meteo.com/"
+ const val BASE_URL = "https://api.open-meteo.com/"
 
  // ViewType layoutları için sabit değişkenler tanımlandı
  const val VIEW_TYPE_CURRENT_DAY = 0

diff --git a/app/src/main/java/com/example/hw13_weatherapp/di/AppModule.kt b/app/src/main/java/com/example/hw13_weatherapp/di/AppModule.kt
@@ -5,6 +5,7 @@ import android.os.Environment
 import androidx.room.Room
 import com.example.hw13_weatherapp.constants.Consts
 import com.example.hw13_weatherapp.db.WeatherPropertyDatabase
+import com.example.hw13_weatherapp.model.api.WeatherApiService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -23,20 +24,23 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-class AppModule {
+object AppModule {
 
  @Provides
  @Singleton
  fun provideRetrofit(): Retrofit {
  return Retrofit.Builder()
- .baseUrl(provideBaseUrl())
+ .baseUrl(Consts.BASE_URL)
  .addConverterFactory(GsonConverterFactory.create())
  .client(provideOkHttp())
  .build()
  }
 
  @Provides
- fun provideBaseUrl() = "https://api.open-meteo.com/"
+ @Singleton
+ fun provideWeatherApiService(retrofit: Retrofit): WeatherApiService {
+ return retrofit.create(WeatherApiService::class.java)
+ }
 
  @Provides
  @Singleton

diff --git a/...eatherapp/view/homeFragment/MainModule.kt → .../example/hw13_weatherapp/di/MainModule.kt b/...eatherapp/view/homeFragment/MainModule.kt → .../example/hw13_weatherapp/di/MainModule.kt
@@ -1,4 +1,4 @@
-package com.example.hw13_weatherapp.view.homeFragment
+package com.example.hw13_weatherapp.di
 
 import android.content.Context
 import com.example.hw13_weatherapp.db.WeatherPropertyDao
@@ -16,12 +16,7 @@ import retrofit2.Retrofit
 
 @Module
 @InstallIn(ViewModelComponent::class)
-class MainModule {
-
- @Provides
- fun provideWeatherApiService(retrofit: Retrofit): WeatherApiService {
- return retrofit.create(WeatherApiService::class.java)
- }
+object MainModule {
 
  @Provides
  fun provideWeatherPropertyDao(database: WeatherPropertyDatabase): WeatherPropertyDao {
@@ -46,5 +41,4 @@ class MainModule {
  ): WeatherPropertyRepository {
  return WeatherPropertyRepository(context,remoteDataSource,localDataSource)
  }
-
 }
diff --git a/app/src/main/java/com/example/hw13_weatherapp/view/MainActivity.kt b/app/src/main/java/com/example/hw13_weatherapp/view/MainActivity.kt
@@ -33,7 +33,6 @@ class MainActivity : AppCompatActivity() {
  val view = binding.root
  setContentView(view)
  createNotificationChannel()
-
  }
 
  private val requestPermissionLauncher = registerForActivityResult(