Merge pull request #6 from Akashkamble/migrate_to_alpha

Migrate to Dagger Hilt and Jetpack Compose alpha.

README.md

@@ -10,13 +10,13 @@ News App built with JetPack Compose
 
 ## The app contains following libraries
 
-- [Jetpack Compose(v0.1.0-dev14)] (https://developer.android.com/jetpack/compose) (UI)
+- [Jetpack Compose](https://developer.android.com/jetpack/compose) (UI)
 
-- [Koin](https://insert-koin.io/) (Dependency Injection)
+- [Dagger-Hilt](https://dagger.dev/hilt/) (Dependency Injection)
 
 - [LifeCycle Components](https://developer.android.com/topic/libraries/architecture/livedata) (ViewModel and LiveData)
 
-- [Kotlin Corountines](https://kotlinlang.org/docs/reference/coroutines-overview.html) (Asynchronous programming)
+- [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html) (Asynchronous programming)
 
 - [Retrofit](https://square.github.io/retrofit/) (Networking)
 

app/build.gradle

@@ -2,17 +2,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'dagger.hilt.android.plugin'
 
 
 android {
     compileSdkVersion 29
 
     defaultConfig {
-        applicationId "com.akash.newzz_compose"
+        applicationId "com.akash.newzzcompose"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 2
-        versionName "0.0.2"
+        versionCode 3
+        versionName "0.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -28,51 +29,61 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
+        useIR = true
     }
     buildFeatures {
         compose true
     }
 
     composeOptions {
-        kotlinCompilerVersion "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
-        kotlinCompilerExtensionVersion "0.1.0-dev14"
+        kotlinCompilerVersion "$kotlin_version"
+        kotlinCompilerExtensionVersion "$compose_version"
     }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(':data')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.activity:activity-ktx:1.1.0"
+    implementation 'android.arch.lifecycle:extensions:1.1.1'
 
     /* ---------------------JetPack Compose-----------------------------*/
-    implementation("androidx.compose:compose-runtime:$compose_version")
-    implementation("androidx.ui:ui-core:$compose_version")
-    implementation "androidx.ui:ui-layout:$compose_version"
-    implementation "androidx.ui:ui-material:$compose_version"
-    implementation "androidx.ui:ui-tooling:$compose_version"
-    implementation "androidx.ui:ui-livedata:$compose_version"
+    implementation("androidx.compose.runtime:runtime:$compose_version")
+    implementation("androidx.compose.runtime:runtime-livedata:$compose_version")
+    implementation("androidx.compose.foundation:foundation:$compose_version")
+    implementation("androidx.compose.foundation:foundation-layout:$compose_version")
+
+    implementation("androidx.compose.ui:ui:$compose_version")
+    implementation("androidx.compose.material:material:$compose_version")
+    implementation("androidx.compose.material:material-icons-extended:$compose_version")
+
+    implementation("androidx.ui:ui-tooling:$compose_version")
 
     /* ---------------------LifeCycle Extension-----------------------------*/
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
-    /*-----------------------Koin-------------------------------------*/
-    implementation "org.koin:koin-android:$koin_version"
-    implementation "org.koin:koin-android-viewmodel:$koin_version"
+    /*------------------------Dagger Hilt----------------------------------*/
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
+
+    implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hilt_jetpack_config_version"
+    kapt "androidx.hilt:hilt-compiler:$hilt_jetpack_config_version"
 
     /*---------------------ChromeCustomTab------------------------------*/
-    implementation 'androidx.browser:browser:1.3.0-alpha04'
+    implementation 'androidx.browser:browser:1.3.0-alpha05'
 
     /*---------------------CoilImageLoader------------------------------*/
-    implementation "dev.chrisbanes.accompanist:accompanist-coil:0.1.6"
+    implementation "dev.chrisbanes.accompanist:accompanist-coil:0.2.0"
 
     /*----------------------------Moshi-------------------------------------*/
     implementation 'com.squareup.moshi:moshi:1.9.1'
 
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 }

app/src/main/java/com/akash/newzz_compose/NewzzApplication.kt

@@ -1,22 +1,14 @@
 package com.akash.newzz_compose
 
 import com.akash.newzz.data.BaseApplication
-import com.akash.newzz_compose.di.appModule
-import org.koin.android.ext.koin.androidContext
-import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.startKoin
+import dagger.hilt.android.HiltAndroidApp
 
 /**
- * Created by Akash on 06/06/20
+ * Created by Akash on 28/08/20
  */
+@HiltAndroidApp
 class NewzzApplication : BaseApplication() {
-
     override fun onCreate() {
         super.onCreate()
-        startKoin {
-            androidLogger()
-            androidContext(this@NewzzApplication)
-            modules(appModule)
-        }
     }
 }

app/src/main/java/com/akash/newzz_compose/di/NewzzActivityModule.kt

@@ -0,0 +1,35 @@
+package com.akash.newzz_compose.di
+
+import com.akash.newzz.data.apiservice.NewzzApiService
+import com.akash.newzz.data.repository.NewsRepository
+import com.akash.newzz.data.repository.NewsRepositoryImpl
+import com.squareup.moshi.Moshi
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+import dagger.hilt.android.scopes.ActivityScoped
+
+/**
+ * Created by Akash on 28/08/20
+ */
+
+@Module
+@InstallIn(ActivityComponent::class)
+object NewzzActivityModule {
+
+    @Provides
+    @ActivityScoped
+    fun provideNewsApiService(): NewzzApiService = NewzzApiService()
+
+    @Provides
+    @ActivityScoped
+    fun provideNewsRepo(
+        apiService: NewzzApiService,
+        moshi: Moshi
+    ): NewsRepository = NewsRepositoryImpl(apiService, moshi)
+
+    @Provides
+    @ActivityScoped
+    fun provideMoshi(): Moshi = Moshi.Builder().build()
+}

app/src/main/java/com/akash/newzz_compose/other/Category.kt

@@ -0,0 +1,34 @@
+package com.akash.newzz_compose.other
+
+import com.akash.newzz_compose.R
+
+/**
+ * Created by Akash on 28/08/20
+ */
+
+interface Category {
+    val category: String
+    val icon: Int
+}
+
+data class General(
+    override val category: String = "general",
+    override val icon: Int = R.drawable.ic_general
+) : Category
+
+data class Business(
+    override val category: String = "business",
+    override val icon: Int = R.drawable.ic_business
+) : Category
+
+data class Technology(
+    override val category: String = "technology",
+    override val icon: Int = R.drawable.ic_tech
+) : Category
+
+fun getTitleResource(activeCategory: Category): Int = when (activeCategory) {
+    is General -> R.string.title_general
+    is Business -> R.string.title_business
+    is Technology -> R.string.title_technology
+    else -> throw IllegalAccessException("Page number is invalid")
+}