Merge pull request #73 from frogobox/release/2.3.3

Release/2.3.3

Author: amirisback

README.md

@@ -13,7 +13,7 @@
 
 This Is Latest Release
 
-    $version_release = 2.3.2
+    $version_release = 2.3.3
 
 What's New??
 
@@ -54,7 +54,7 @@ allprojects {
 ```groovy
 dependencies {
     // library frogo-sdk
-    implementation 'com.github.frogobox:frogo-sdk:2.3.2'
+    implementation 'com.github.frogobox:frogo-sdk:2.3.3'
 }
 ```
 
@@ -63,14 +63,14 @@ dependencies {
 ```groovy
 dependencies {
     // library frogo-sdk
-    implementation("com.github.frogobox:frogo-sdk:2.3.2")
+    implementation("com.github.frogobox:frogo-sdk:2.3.3")
 }
 ```
 
 #### <Option 3> libs.versions.toml
 ```yml
 [versions]
-frogoAndroid = "2.3.2"
+frogoAndroid = "2.3.3"
 
 [libraries]
 frogo-android = { group = "com.github.frogobox", name = "frogo-sdk", version.ref = "frogoAndroid" }

app/build.gradle.kts

@@ -1,11 +1,25 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import java.text.SimpleDateFormat
+import java.util.Date
 
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.ksp)
+    id("kotlin-parcelize")
 }
 
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas") // If Using Ksp
+}
+
+base {
+    // Naming APK // AAB
+    val timestamp = SimpleDateFormat("dd-MM-yyyy_hh-mm").format(Date())
+    archivesName = "${ProjectSetting.NAME_APK}-[${ProjectSetting.PROJECT_VERSION_NAME}]-$timestamp"
+}
+
+
 android {
 
     compileSdk = ProjectSetting.PROJECT_COMPILE_SDK
@@ -26,9 +40,6 @@ android {
         // Declaration build config
         buildConfigField("String", "DATABASE_NAME", ProjectSetting.DB)
 
-        // Naming APK // AAB
-        setProperty("archivesBaseName", "${ProjectSetting.NAME_APK}(${versionName})")
-
         // Declaration apps name debug mode
         val debugAttribute = "Development"
         val nameAppDebug = "${ProjectSetting.NAME_APP} $debugAttribute"

app/schemas/com.frogobox.appsdk.source.AppDatabase/1.json

@@ -0,0 +1,65 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "2e79a9bdd7c1e5de61e10c8203b81266",
+    "entities": [
+      {
+        "tableName": "article",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `author` TEXT, `title` TEXT, `description` TEXT, `url` TEXT, `urlToImage` TEXT, `publishedAt` TEXT, `content` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "urlToImage",
+            "columnName": "urlToImage",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "publishedAt",
+            "columnName": "publishedAt",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2e79a9bdd7c1e5de61e10c8203b81266')"
+    ]
+  }
+}

app/src/main/java/com/frogobox/appsdk/model/Article.kt

@@ -1,9 +1,11 @@
 package com.frogobox.appsdk.model
 
+import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * Created by Faisal Amir
@@ -22,6 +24,8 @@ import com.google.gson.annotations.SerializedName
  * com.frogobox.frogoconsumeapi.news.data.model
  *
  */
+
+@Parcelize
 @Entity(tableName = "article")
 data class Article(
 
@@ -55,4 +59,4 @@ data class Article(
     @ColumnInfo(name = "content")
     @SerializedName("content")
     var content: String? = null,
-)
+) : Parcelable

app/src/main/java/com/frogobox/appsdk/news/NewsDetailActivity.kt

@@ -10,7 +10,7 @@ import com.frogobox.sdk.ext.setImageExt
 
 class NewsDetailActivity : BaseActivity<ActivityNewsDetailBinding>() {
 
-    private val extraData: Article by lazy {
+    private val extraData: Article? by lazy {
         getExtraExt("EXTRA_NEWS_DETAIL")
     }
 
@@ -22,9 +22,9 @@ class NewsDetailActivity : BaseActivity<ActivityNewsDetailBinding>() {
         super.onCreateExt(savedInstanceState)
         setupDetailActivity("Detail News")
         binding.apply {
-            ivNewsDetailImage.setImageExt(extraData.urlToImage, R.drawable.ic_frogobox)
-            newsDetailTitle.text = extraData.title
-            newsDetailDescription.text = extraData.description
+            ivNewsDetailImage.setImageExt(extraData?.urlToImage, R.drawable.ic_frogobox)
+            newsDetailTitle.text = extraData?.title
+            newsDetailDescription.text = extraData?.description
         }
     }
 }

app/src/main/java/com/frogobox/appsdk/news/result/NewsResultActivity.kt

@@ -5,7 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.frogobox.appsdk.core.BaseActivity
 import com.frogobox.appsdk.model.Article
 import com.frogobox.appsdk.news.NewsViewAdapter
-import com.frogobox.coresdk.source.FrogoResult
+import com.frogobox.coresdk.source.Resource
 import com.frogobox.databinding.ActivityNewsBinding
 import com.frogobox.sdk.ext.gone
 import com.frogobox.sdk.ext.visible
@@ -25,15 +25,15 @@ class NewsResultActivity : BaseActivity<ActivityNewsBinding>() {
 
             articles.observe(this@NewsResultActivity) {
                 when (it) {
-                    is FrogoResult.Error -> {
+                    is Resource.Error -> {
                         binding.progressCircular.gone()
                     }
 
-                    is FrogoResult.Loading -> {
+                    is Resource.Loading -> {
                         binding.progressCircular.visible()
                     }
 
-                    is FrogoResult.Success -> {
+                    is Resource.Success -> {
                         binding.progressCircular.gone()
                         it.result.articles?.let { list ->
                             setupRecyclerView(list)

app/src/main/java/com/frogobox/appsdk/news/result/NewsResultViewModel.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import com.frogobox.appsdk.model.ArticleResponse
 import com.frogobox.appsdk.source.AppRepository
 import com.frogobox.appsdk.util.NewsConstant
-import com.frogobox.coresdk.source.FrogoResult
+import com.frogobox.coresdk.source.Resource
 import com.frogobox.sdk.view.FrogoViewModel2
 
 
@@ -26,8 +26,8 @@ class NewsResultViewModel(
     private val repository: AppRepository,
 ) : FrogoViewModel2() {
 
-    private var _articles = MutableLiveData<FrogoResult<ArticleResponse>>()
-    var articles: LiveData<FrogoResult<ArticleResponse>> = _articles
+    private var _articles = MutableLiveData<Resource<ArticleResponse>>()
+    var articles: LiveData<Resource<ArticleResponse>> = _articles
 
     private fun getData() {
         repository.getTopHeadlineResult(

app/src/main/java/com/frogobox/appsdk/source/AppDataSourceResult.kt

@@ -3,7 +3,7 @@ package com.frogobox.appsdk.source
 import androidx.lifecycle.MutableLiveData
 import com.frogobox.appsdk.model.ArticleResponse
 import com.frogobox.appsdk.model.SourceResponse
-import com.frogobox.coresdk.source.FrogoResult
+import com.frogobox.coresdk.source.Resource
 import com.frogobox.coresdk.source.ICoreDataSource
 
 
@@ -30,7 +30,7 @@ interface AppDataSourceResult : ICoreDataSource {
         country: String?,
         pageSize: Int?,
         page: Int?,
-        result: MutableLiveData<FrogoResult<ArticleResponse>>,
+        result: MutableLiveData<Resource<ArticleResponse>>,
     )
 
     // Get Everythings
@@ -46,15 +46,15 @@ interface AppDataSourceResult : ICoreDataSource {
         sortBy: String?,
         pageSize: Int?,
         page: Int?,
-        result: MutableLiveData<FrogoResult<ArticleResponse>>,
+        result: MutableLiveData<Resource<ArticleResponse>>,
     )
 
     // Get Sources
     fun getSourcesResult(
         language: String,
         country: String,
         category: String,
-        result: MutableLiveData<FrogoResult<SourceResponse>>,
+        result: MutableLiveData<Resource<SourceResponse>>,
     )
 
 }

app/src/main/java/com/frogobox/appsdk/source/AppRemoteDataSource.kt

@@ -10,7 +10,7 @@ import com.frogobox.appsdk.util.NewsUrl
 import com.frogobox.coresdk.response.FrogoDataResponse
 import com.frogobox.coresdk.response.FrogoStateResponse
 import com.frogobox.coresdk.source.FrogoApiClient
-import com.frogobox.coresdk.source.FrogoResult
+import com.frogobox.coresdk.source.Resource
 import com.frogobox.sdk.ext.doApiRequest
 import com.frogobox.sdk.ext.doApiRequestResult
 import com.frogobox.sdk.ext.usingChuck
@@ -163,7 +163,7 @@ class AppRemoteDataSource(private val context: Context) : FrogoRemoteDataSource(
         country: String?,
         pageSize: Int?,
         page: Int?,
-        result: MutableLiveData<FrogoResult<ArticleResponse>>,
+        result: MutableLiveData<Resource<ArticleResponse>>,
     ) {
         FrogoApiClient
             .create<AppApiService>(
@@ -189,7 +189,7 @@ class AppRemoteDataSource(private val context: Context) : FrogoRemoteDataSource(
         sortBy: String?,
         pageSize: Int?,
         page: Int?,
-        result: MutableLiveData<FrogoResult<ArticleResponse>>,
+        result: MutableLiveData<Resource<ArticleResponse>>,
     ) {
         FrogoApiClient
             .create<AppApiService>(
@@ -220,7 +220,7 @@ class AppRemoteDataSource(private val context: Context) : FrogoRemoteDataSource(
         language: String,
         country: String,
         category: String,
-        result: MutableLiveData<FrogoResult<SourceResponse>>,
+        result: MutableLiveData<Resource<SourceResponse>>,
     ) {
         FrogoApiClient
             .create<AppApiService>(

app/src/main/java/com/frogobox/appsdk/source/AppRepository.kt

@@ -7,7 +7,7 @@ import com.frogobox.appsdk.model.ArticleResponse
 import com.frogobox.appsdk.model.SourceResponse
 import com.frogobox.coresdk.response.FrogoDataResponse
 import com.frogobox.coresdk.response.FrogoStateResponse
-import com.frogobox.coresdk.source.FrogoResult
+import com.frogobox.coresdk.source.Resource
 import com.frogobox.sdk.ext.toJson
 import com.frogobox.sdk.source.FrogoRepository
 import com.frogobox.sdk.util.FrogoFunc
@@ -193,7 +193,7 @@ class AppRepository(
         country: String?,
         pageSize: Int?,
         page: Int?,
-        result: MutableLiveData<FrogoResult<ArticleResponse>>,
+        result: MutableLiveData<Resource<ArticleResponse>>,
     ) {
         remoteDataSource.getTopHeadlineResult(q, sources, category, country, pageSize, page, result)
     }
@@ -210,7 +210,7 @@ class AppRepository(
         sortBy: String?,
         pageSize: Int?,
         page: Int?,
-        result: MutableLiveData<FrogoResult<ArticleResponse>>,
+        result: MutableLiveData<Resource<ArticleResponse>>,
     ) {
         remoteDataSource.getEverythingsResult(
             q,
@@ -232,7 +232,7 @@ class AppRepository(
         language: String,
         country: String,
         category: String,
-        result: MutableLiveData<FrogoResult<SourceResponse>>,
+        result: MutableLiveData<Resource<SourceResponse>>,
     ) {
         remoteDataSource.getSourcesResult(language, country, category, result)
     }