update: fixing apps

frogobox · Dec 10, 2023 · f95281c · f95281c
1 parent 2a07766
commit f95281c
Show file tree

Hide file tree

Showing 26 changed files with 109 additions and 67 deletions.
diff --git a/app/src/main/java/com/frogobox/kickstart/di/ConsumeApiModule.kt b/app/src/main/java/com/frogobox/kickstart/di/ConsumeApiModule.kt
@@ -5,11 +5,11 @@ import com.frogobox.api.movie.ConsumeMovieApi
 import com.frogobox.api.news.ConsumeNewsApi
 import com.frogobox.api.pixabay.ConsumePixabayApi
 import com.frogobox.api.sport.ConsumeTheSportDbApi
-import com.frogobox.coreapi.meal.MealUrl
-import com.frogobox.coreapi.movie.MovieUrl
-import com.frogobox.coreapi.news.NewsUrl
-import com.frogobox.coreapi.pixabay.PixabayUrl
-import com.frogobox.coreapi.sport.SportUrl
+import com.frogobox.coreutil.meal.MealUrl
+import com.frogobox.coreutil.movie.MovieUrl
+import com.frogobox.coreutil.news.NewsUrl
+import com.frogobox.coreutil.pixabay.PixabayUrl
+import com.frogobox.coreutil.sport.SportUrl
 import org.koin.dsl.module
 
 

diff --git a/app/src/main/java/com/frogobox/kickstart/di/RepositoryModule.kt b/app/src/main/java/com/frogobox/kickstart/di/RepositoryModule.kt
@@ -1,6 +1,6 @@
 package com.frogobox.kickstart.di
 
-import com.frogobox.coreapi.news.NewsUrl
+import com.frogobox.coreutil.news.NewsUrl
 import com.frogobox.coresdk.source.FrogoApiClient
 import com.frogobox.kickstart.source.ProjectDataRepository
 import com.frogobox.kickstart.source.local.ProjectAppDatabase

diff --git a/app/src/main/java/com/frogobox/kickstart/mvvm/consumable/ConsumableFragment.kt b/app/src/main/java/com/frogobox/kickstart/mvvm/consumable/ConsumableFragment.kt
@@ -5,8 +5,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.bumptech.glide.Glide
-import com.frogobox.coreapi.news.NewsConstant
-import com.frogobox.coreapi.news.model.Article
+import com.frogobox.coreutil.news.NewsConstant
+import com.frogobox.coreutil.news.model.Article
+import com.frogobox.kickstart.R
 import com.frogobox.kickstart.core.BaseFragment
 import com.frogobox.kickstart.databinding.ContentArticleHorizontalBinding
 import com.frogobox.kickstart.databinding.ContentArticleVerticalBinding
@@ -127,7 +128,10 @@ class ConsumableFragment : BaseFragment<FragmentConsumableBinding>() {
                     position: Int,
                     notifyListener: FrogoRecyclerNotifyListener<Article>
                 ) {
-                    requireContext().startActivityExt<DetailActivity, Article>(DetailActivity.EXTRA_DATA, data)
+                    requireContext().startActivityExt<DetailActivity, Article>(
+                        DetailActivity.EXTRA_DATA,
+                        data
+                    )
                     showInterstitial()
                 }
 
@@ -158,7 +162,10 @@ class ConsumableFragment : BaseFragment<FragmentConsumableBinding>() {
                         tvTitle.text = data.title
                         tvPublished.text = data.publishedAt
                         tvDescription.text = data.description
-                        Glide.with(requireContext()).load(data.urlToImage).into(ivUrl)
+                        Glide.with(requireContext())
+                            .load(data.urlToImage)
+                            .placeholder(R.drawable.ic_frogobox)
+                            .into(ivUrl)
                     }
                 }
             }
@@ -183,7 +190,10 @@ class ConsumableFragment : BaseFragment<FragmentConsumableBinding>() {
                     position: Int,
                     notifyListener: FrogoRecyclerNotifyListener<Article>
                 ) {
-                    requireContext().startActivityExt<DetailActivity, Article>(DetailActivity.EXTRA_DATA, data)
+                    requireContext().startActivityExt<DetailActivity, Article>(
+                        DetailActivity.EXTRA_DATA,
+                        data
+                    )
                     showInterstitial()
                 }
 
@@ -214,7 +224,10 @@ class ConsumableFragment : BaseFragment<FragmentConsumableBinding>() {
                         tvTitle.text = data.title
                         tvPublished.text = data.publishedAt
                         tvDescription.text = data.description
-                        Glide.with(requireContext()).load(data.urlToImage).into(ivUrl)
+                        Glide.with(requireContext())
+                            .load(data.urlToImage)
+                            .placeholder(R.drawable.ic_frogobox)
+                            .into(ivUrl)
                     }
                 }
             }

diff --git a/app/src/main/java/com/frogobox/kickstart/mvvm/consumable/ConsumableViewModel.kt b/app/src/main/java/com/frogobox/kickstart/mvvm/consumable/ConsumableViewModel.kt
@@ -1,16 +1,16 @@
 package com.frogobox.kickstart.mvvm.consumable
 
 import androidx.lifecycle.MutableLiveData
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_BUSINESS
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_ENTERTAIMENT
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_GENERAL
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_HEALTH
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_SCIENCE
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_SPORTS
-import com.frogobox.coreapi.news.NewsConstant.CATEGORY_TECHNOLOGY
-import com.frogobox.coreapi.news.NewsConstant.COUNTRY_ID
-import com.frogobox.coreapi.news.model.Article
-import com.frogobox.coreapi.news.response.ArticleResponse
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_ENTERTAIMENT
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_GENERAL
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_HEALTH
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_SCIENCE
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_SPORTS
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_TECHNOLOGY
+import com.frogobox.coreutil.news.NewsConstant.COUNTRY_ID
+import com.frogobox.coreutil.news.response.ArticleResponse
+import com.frogobox.coreutil.news.NewsConstant.CATEGORY_BUSINESS
+import com.frogobox.coreutil.news.model.Article
 import com.frogobox.kickstart.core.BaseViewModel
 import com.frogobox.kickstart.source.ProjectDataRepository
 import com.frogobox.kickstart.source.callback.ProjectConsumeApiCallback

diff --git a/app/src/main/java/com/frogobox/kickstart/mvvm/detail/DetailActivity.kt b/app/src/main/java/com/frogobox/kickstart/mvvm/detail/DetailActivity.kt
@@ -1,7 +1,9 @@
 package com.frogobox.kickstart.mvvm.detail
 
 import android.os.Bundle
-import com.frogobox.coreapi.news.model.Article
+import com.bumptech.glide.Glide
+import com.frogobox.coreutil.news.model.Article
+import com.frogobox.kickstart.R
 import com.frogobox.kickstart.core.BaseActivity
 import com.frogobox.kickstart.databinding.ActivityDetailBinding
 import com.frogobox.sdk.ext.getExtraDataExt
@@ -25,13 +27,19 @@ class DetailActivity : BaseActivity<ActivityDetailBinding>() {
     override fun onCreateExt(savedInstanceState: Bundle?) {
         super.onCreateExt(savedInstanceState)
         setupDetailActivity("Detail Berita")
+
         val extraArticle = getExtraDataExt<Article>(EXTRA_DATA)
+
         binding.apply {
             tvTitle.text = extraArticle.title
             tvSource.text = extraArticle.source?.name ?: ""
             tvContent.text = extraArticle.description
-            ivUrl.glideLoad(extraArticle.urlToImage)
+            Glide.with(this@DetailActivity)
+                .load(extraArticle.urlToImage)
+                .placeholder(R.drawable.ic_frogobox)
+                .into(ivUrl)
         }
+
     }
 
 

diff --git a/app/src/main/java/com/frogobox/kickstart/mvvm/main/MainActivity.kt b/app/src/main/java/com/frogobox/kickstart/mvvm/main/MainActivity.kt
@@ -1,11 +1,13 @@
 package com.frogobox.kickstart.mvvm.main
 
+import android.content.res.ColorStateList
 import android.os.Bundle
 import com.frogobox.kickstart.R
 import com.frogobox.kickstart.core.BaseActivity
 import com.frogobox.kickstart.databinding.ActivityMainBinding
 import com.frogobox.kickstart.mvvm.consumable.ConsumableFragment
 import com.frogobox.kickstart.mvvm.favorite.FavoriteFragment
+import com.frogobox.sdk.ext.getColorExt
 
 class MainActivity : BaseActivity<ActivityMainBinding>() {
 
@@ -35,16 +37,29 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private fun setupBottomNav(frameLayout: Int) {
         binding.bottomNavMainMenu.apply {
             clearAnimation()
-            itemIconTintList = null
 
-            setOnNavigationItemSelectedListener {
+            val iconColorStates = ColorStateList(
+                arrayOf(
+                    intArrayOf(-android.R.attr.state_checked),
+                    intArrayOf(android.R.attr.state_checked)
+                ), intArrayOf(
+                    getColorExt(R.color.colorTextTitle),
+                    getColorExt(R.color.colorPrimary),
+                )
+            )
+
+            itemIconTintList = iconColorStates
+            itemTextColor = iconColorStates
+
+            setOnItemSelectedListener {
                 when (it.itemId) {
                     R.id.bottom_menu_consumable -> {
                         supportActionBar?.title = getString(R.string.title_consumable)
                         setupChildFragment(
                             frameLayout,
                             ConsumableFragment()
                         )
+                        return@setOnItemSelectedListener true
                     }
 
                     R.id.bottom_menu_favorite -> {
@@ -53,6 +68,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                             frameLayout,
                             FavoriteFragment()
                         )
+                        return@setOnItemSelectedListener true
                     }
 
                     R.id.bottom_menu_main -> {
@@ -61,10 +77,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                             frameLayout,
                             MainFragment()
                         )
+                        return@setOnItemSelectedListener true
                     }
                 }
 
-                true
+                false
             }
         }
 

diff --git a/app/src/main/java/com/frogobox/kickstart/mvvm/main/MainFragment.kt b/app/src/main/java/com/frogobox/kickstart/mvvm/main/MainFragment.kt
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import com.bumptech.glide.Glide
-import com.frogobox.coreapi.news.model.Article
+import com.frogobox.coreutil.news.model.Article
 import com.frogobox.kickstart.R
 import com.frogobox.kickstart.core.BaseFragment
 import com.frogobox.kickstart.databinding.FragmentMainBinding
@@ -78,7 +78,10 @@ class MainFragment : BaseFragment<FragmentMainBinding>() {
                 view.findViewById<TextView>(R.id.tv_title).text = data.title
                 view.findViewById<TextView>(R.id.tv_description).text = data.publishedAt
                 view.findViewById<TextView>(R.id.tv_published).text = data.description
-                Glide.with(view.context).load(data.urlToImage).into(view.findViewById(R.id.iv_url))
+                Glide.with(view.context)
+                    .load(data.urlToImage)
+                    .placeholder(R.drawable.ic_frogobox)
+                    .into(view.findViewById(R.id.iv_url))
             }
         }
 

diff --git a/app/src/main/java/com/frogobox/kickstart/mvvm/main/MainViewModel.kt b/app/src/main/java/com/frogobox/kickstart/mvvm/main/MainViewModel.kt
@@ -1,9 +1,9 @@
 package com.frogobox.kickstart.mvvm.main
 
 import androidx.lifecycle.MutableLiveData
-import com.frogobox.coreapi.news.NewsConstant
-import com.frogobox.coreapi.news.NewsUrl
-import com.frogobox.coreapi.news.response.ArticleResponse
+import com.frogobox.coreutil.news.NewsConstant
+import com.frogobox.coreutil.news.NewsUrl
+import com.frogobox.coreutil.news.response.ArticleResponse
 import com.frogobox.kickstart.core.BaseViewModel
 import com.frogobox.kickstart.source.ProjectDataRepository
 import com.frogobox.kickstart.source.callback.ProjectDataCallback

diff --git a/app/src/main/java/com/frogobox/kickstart/source/ProjectDataRepository.kt b/app/src/main/java/com/frogobox/kickstart/source/ProjectDataRepository.kt
@@ -6,8 +6,8 @@ import com.frogobox.api.movie.ConsumeMovieApi
 import com.frogobox.api.news.ConsumeNewsApi
 import com.frogobox.api.pixabay.ConsumePixabayApi
 import com.frogobox.api.sport.ConsumeTheSportDbApi
-import com.frogobox.coreapi.news.response.ArticleResponse
-import com.frogobox.coreapi.news.response.SourceResponse
+import com.frogobox.coreutil.news.response.ArticleResponse
+import com.frogobox.coreutil.news.response.SourceResponse
 import com.frogobox.kickstart.model.Favorite
 import com.frogobox.kickstart.source.callback.ProjectDataCallback
 import com.frogobox.kickstart.source.callback.ProjectStateCallback

diff --git a/app/src/main/java/com/frogobox/kickstart/source/ProjectDataSource.kt b/app/src/main/java/com/frogobox/kickstart/source/ProjectDataSource.kt
@@ -1,6 +1,6 @@
 package com.frogobox.kickstart.source
 
-import com.frogobox.coreapi.news.response.ArticleResponse
+import com.frogobox.coreutil.news.response.ArticleResponse
 import com.frogobox.coresdk.source.ICoreDataSource
 import com.frogobox.kickstart.model.Favorite
 import com.frogobox.kickstart.source.callback.ProjectDataCallback

diff --git a/app/src/main/java/com/frogobox/kickstart/source/local/ProjectAppDatabase.kt b/app/src/main/java/com/frogobox/kickstart/source/local/ProjectAppDatabase.kt
@@ -57,7 +57,6 @@ abstract class ProjectAppDatabase : RoomDatabase() {
                     ProjectAppDatabase::class.java,
                     appDatabaseName
                 )
-                    .addMigrations(MIGRATION_2_3)
                     .fallbackToDestructiveMigration() // FOR DEVELOPMENT ONLY !!!!
                     .build()
             } else {
@@ -66,15 +65,8 @@ abstract class ProjectAppDatabase : RoomDatabase() {
                     ProjectAppDatabase::class.java,
                     appDatabaseName
                 )
-                    .addMigrations(MIGRATION_2_3)
                     .build()
             }
         }
-
-        private val MIGRATION_2_3: Migration = object : Migration(2, 3) {
-            override fun migrate(database: SupportSQLiteDatabase) {
-
-            }
-        }
     }
 }
diff --git a/app/src/main/java/com/frogobox/kickstart/source/local/ProjectLocalDataSource.kt b/app/src/main/java/com/frogobox/kickstart/source/local/ProjectLocalDataSource.kt
@@ -1,6 +1,6 @@
 package com.frogobox.kickstart.source.local
 
-import com.frogobox.coreapi.news.response.ArticleResponse
+import com.frogobox.coreutil.news.response.ArticleResponse
 import com.frogobox.kickstart.model.Favorite
 import com.frogobox.kickstart.source.ProjectDataSource
 import com.frogobox.kickstart.source.callback.ProjectDataCallback

diff --git a/app/src/main/java/com/frogobox/kickstart/source/remote/ProjectRemoteDataSource.kt b/app/src/main/java/com/frogobox/kickstart/source/remote/ProjectRemoteDataSource.kt
@@ -5,7 +5,7 @@ import com.frogobox.api.movie.ConsumeMovieApi
 import com.frogobox.api.news.ConsumeNewsApi
 import com.frogobox.api.pixabay.ConsumePixabayApi
 import com.frogobox.api.sport.ConsumeTheSportDbApi
-import com.frogobox.coreapi.news.response.ArticleResponse
+import com.frogobox.coreutil.news.response.ArticleResponse
 import com.frogobox.coresdk.response.FrogoDataResponse
 import com.frogobox.kickstart.model.Favorite
 import com.frogobox.kickstart.source.ProjectDataSource

diff --git a/app/src/main/java/com/frogobox/kickstart/source/remote/network/NewsApiService.kt b/app/src/main/java/com/frogobox/kickstart/source/remote/network/NewsApiService.kt
@@ -1,9 +1,10 @@
 package com.frogobox.kickstart.source.remote.network
 
-import com.frogobox.coreapi.news.NewsConstant
-import com.frogobox.coreapi.news.NewsUrl
-import com.frogobox.coreapi.news.response.ArticleResponse
-import com.frogobox.coreapi.news.response.SourceResponse
+
+import com.frogobox.coreutil.news.NewsConstant
+import com.frogobox.coreutil.news.NewsUrl
+import com.frogobox.coreutil.news.response.ArticleResponse
+import com.frogobox.coreutil.news.response.SourceResponse
 import io.reactivex.rxjava3.core.Observable
 import retrofit2.http.GET
 import retrofit2.http.Query

diff --git a/app/src/main/res/drawable/background_card.xml b/app/src/main/res/drawable/background_card.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?attr/colorOnPrimary" />
+            <solid android:color="@color/colorBackgroundTheme" />
             <corners android:radius="@dimen/dimen_medium_8dp" />
             <!--<stroke android:color="@color/colorBackground"-->
                     <!--android:width="1dp"/>-->

diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/frogoColorWhite"
+    android:background="@color/colorBackgroundTheme"
     android:orientation="vertical"
     android:padding="@dimen/frogo_dimen_16dp">
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
         android:id="@+id/bottom_nav_main_menu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/frogoColorWhite"
+        android:background="@color/colorBackgroundTheme"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,7 +19,6 @@
         android:id="@+id/framelayout_main_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="@color/frogoColorWhite"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"

diff --git a/app/src/main/res/layout/content_article_horizontal.xml b/app/src/main/res/layout/content_article_horizontal.xml
@@ -23,7 +23,7 @@
     android:layout_marginTop="@dimen/frogo_dimen_16dp"
     android:layout_marginEnd="@dimen/frogo_dimen_16dp"
     android:layout_marginBottom="@dimen/frogo_dimen_8dp"
-    android:background="@drawable/frogo_bg_card_8dp"
+    android:background="@drawable/background_card"
     android:elevation="@dimen/frogo_dimen_2dp"
     android:orientation="vertical"
     android:padding="@dimen/frogo_dimen_16dp">
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:maxLines="1"
             android:text="@string/frogo_is_empty_data"
-            android:textColor="@color/frogoColorBlack"
+            android:textColor="@color/colorTextTitle"
             android:textSize="16sp"
             android:textStyle="bold" />
 
@@ -57,13 +57,15 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/frogo_dimen_8dp"
             android:maxLines="1"
+            android:textColor="@color/colorTextSubTitle"
             android:text="@string/frogo_is_empty_data" />
 
         <TextView
             android:id="@+id/tv_description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxLines="3"
+            android:textColor="@color/colorTextDescription"
             android:text="@string/frogo_is_empty_data" />
 
     </LinearLayout>