Update news app

- Update dependencies
- Update News details screen
- Update News item
- Add Category model
- Add filter chips

Author: KaushalVasava

app/build.gradle

@@ -28,18 +28,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true
     }
     composeOptions {
 
-        kotlinCompilerExtensionVersion '1.1.1'
+        kotlinCompilerExtensionVersion '1.4.0'
     }
     packagingOptions {
         resources {
@@ -50,31 +50,31 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.2'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.1'
+    implementation 'androidx.compose.material3:material3:1.1.1'
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
     //coil
     implementation("io.coil-kt:coil-compose:2.2.2")
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
 
-    implementation "androidx.navigation:navigation-compose:2.5.3"
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation "androidx.navigation:navigation-compose:2.6.0"
+    implementation 'androidx.browser:browser:1.5.0'
 
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.0'
-    testImplementation 'org.mockito:mockito-core:2.23.0'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
 }

app/src/main/java/com/lahsuak/apps/jetpackcomposebasic/MainActivity.kt

@@ -9,7 +9,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import com.lahsuak.apps.jetpackcomposebasic.ui.MyAppNavHost
+import com.lahsuak.apps.jetpackcomposebasic.ui.navigation.MyAppNavHost
 import com.lahsuak.apps.jetpackcomposebasic.ui.theme.JetPackComposeBasicTheme
 
 class MainActivity : ComponentActivity() {

app/src/main/java/com/lahsuak/apps/jetpackcomposebasic/api/NewApi.kt

@@ -13,10 +13,10 @@ interface NewApi {
         const val BASE_URL = "https://saurav.tech"//NewsAPI/top-headlines/category/general/in.json"
     }
 
-    @GET("/NewsAPI/top-headlines/category/general/in.json")
+    @GET("/NewsAPI/top-headlines/category/{category}/in.json")
     suspend fun getNews(
-//        @Path("category")
-//        category: String
+        @Path("category")
+        category: String
     ): NewsParentModel
 
     @GET("/NewsAPI/top-headlines/category/general/in.json")

app/src/main/java/com/lahsuak/apps/jetpackcomposebasic/repo/NewsRepository.kt

@@ -8,7 +8,7 @@ import com.lahsuak.apps.jetpackcomposebasic.model.NewsParentModel
 class NewsRepository(private val apiInterface: NewApi= ApiClient.apiInterface) {
     suspend fun getNews(category: String): NewsParentModel {
         return apiInterface.getNews(
-//            category
+            category
         )
     }
 }

app/src/main/java/com/lahsuak/apps/jetpackcomposebasic/ui/CromeTab.kt

@@ -0,0 +1,54 @@
+package com.lahsuak.apps.jetpackcomposebasic.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.List
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.lahsuak.apps.jetpackcomposebasic.R
+import com.lahsuak.apps.jetpackcomposebasic.ui.components.model.Category
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ChipGroup(
+    categories: List<Category>,
+    selectedCategory: Category,
+    onSelectedChanged: (Category) -> Unit = {},
+) {
+    Column(modifier = Modifier.padding(8.dp)) {
+        LazyRow {
+            item {
+                IconButton(
+                    onClick = { /* no-op */ }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.List,
+                        contentDescription = stringResource(R.string.label_filters)
+                    )
+                }
+            }
+            items(categories) {
+                FilterChip(
+                    label = {
+                        Text(it.name.uppercase())
+                    },
+                    modifier = Modifier.padding(horizontal = 4.dp),
+                    selected = selectedCategory == it,
+                    onClick = {
+                        onSelectedChanged(it)
+                    },
+                )
+            }
+        }
+    }
+}

app/src/main/java/com/lahsuak/apps/jetpackcomposebasic/ui/Helper.kt

@@ -1,8 +1,13 @@
-package com.lahsuak.apps.jetpackcomposebasic.ui
+package com.lahsuak.apps.jetpackcomposebasic.ui.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -14,7 +19,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
 import coil.compose.rememberAsyncImagePainter
 import coil.request.ImageRequest
 import com.lahsuak.apps.jetpackcomposebasic.R
@@ -23,6 +27,7 @@ import com.lahsuak.apps.jetpackcomposebasic.ui.theme.JetPackComposeBasicTheme
 
 @Composable
 fun NewsItem(news: News, onClick: () -> Unit) {
+    // coil image painter
     val painter = rememberAsyncImagePainter(
         model = ImageRequest.Builder(LocalContext.current)
             .data(news.urlToImage)
@@ -31,30 +36,36 @@ fun NewsItem(news: News, onClick: () -> Unit) {
             .build(),
         contentScale = ContentScale.FillWidth
     )
-    Column(modifier = Modifier.fillMaxWidth().clickable {
-        onClick()
-    }) {
-        Image(
-            painter = painter,
-            contentDescription = null,
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(200.dp),
-        )
-        Text(
-            text = news.title,
-            style = MaterialTheme.typography.bodyMedium,
-            maxLines = 1,
-            modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
-        )
-        Text(
-            text = news.description,
-            style = MaterialTheme.typography.bodySmall,
-            maxLines = 3,
-            overflow = TextOverflow.Ellipsis,
-            color = Color.Gray,
-            modifier = Modifier.padding(horizontal = 8.dp)
-        )
+    Card(modifier = Modifier
+        .fillMaxWidth()
+        .padding(vertical = 4.dp)
+        .clickable {
+            onClick()
+        }) {
+        Column() {
+            Image(
+                painter = painter,
+                contentDescription = null,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(200.dp),
+                contentScale = ContentScale.Crop
+            )
+            Text(
+                text = news.title,
+                style = MaterialTheme.typography.bodyMedium,
+                maxLines = 1,
+                modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
+            )
+            Text(
+                text = news.description,
+                style = MaterialTheme.typography.bodySmall,
+                maxLines = 3,
+                overflow = TextOverflow.Ellipsis,
+                color = Color.Gray,
+                modifier = Modifier.padding(start = 8.dp, end = 8.dp, bottom = 8.dp)
+            )
+        }
     }
 }
 

app/src/main/java/com/lahsuak/apps/jetpackcomposebasic/ui/NavigationItem.kt

@@ -0,0 +1,10 @@
+package com.lahsuak.apps.jetpackcomposebasic.ui.components.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Category(
+    val pos: Int,
+    val name: String,
+) : Parcelable

app/src/main/java/com/lahsuak/apps/jetpackcomposebasic/ui/components/ChipGroup.kt

@@ -0,0 +1,7 @@
+package com.lahsuak.apps.jetpackcomposebasic.ui.components.model
+
+enum class CategoryType {
+    GENERAL,
+    ENTERTAINMENT,
+    SPORTS
+}