Skip to content

Commit b08f8c5

Browse files
amirisbackamirisback
authored
Merge pull request #33 from frogobox/develop/split-api
DEVELOP :: Fixing Bug Model Library
2 parents 07650b5 + 368fae9 commit b08f8c5

441 files changed

Lines changed: 3713 additions & 3903 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/android-ci-generated-artifact.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ env:
1010
on:
1111
# Triggers the workflow on push or pull request events but only for default and protected branches
1212
workflow_dispatch:
13-
# The workflow will be dispatched to the default queue
13+
# The workflow will be dispatched to the default queue
1414

1515
jobs:
1616
build:
1717

1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v1
21+
- uses: actions/checkout@v3
2222

2323
# Set Current Date As Env Variable
2424
- name: Set current date as env variable
@@ -29,9 +29,11 @@ jobs:
2929
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
3030

3131
- name: Set Up JDK
32-
uses: actions/setup-java@v1
32+
uses: actions/setup-java@v3
3333
with:
34-
java-version: 17
34+
distribution: 'zulu' # See 'Supported distributions' for available options
35+
java-version: '17'
36+
cache: 'gradle'
3537

3638
- name: Change wrapper permissions
3739
run: chmod +x ./gradlew

‎.github/workflows/android-ci.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ on:
1515
branches: [ master ]
1616

1717
workflow_dispatch:
18-
# The workflow will be dispatched to the default queue
18+
# The workflow will be dispatched to the default queue
1919

2020
jobs:
2121
build:
2222

2323
runs-on: ubuntu-latest
2424

2525
steps:
26-
- uses: actions/checkout@v1
26+
- uses: actions/checkout@v3
2727

2828
# Set Current Date As Env Variable
2929
- name: Set current date as env variable
@@ -34,9 +34,11 @@ jobs:
3434
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
3535

3636
- name: Set Up JDK
37-
uses: actions/setup-java@v1
37+
uses: actions/setup-java@v3
3838
with:
39-
java-version: 17
39+
distribution: 'zulu' # See 'Supported distributions' for available options
40+
java-version: '17'
41+
cache: 'gradle'
4042

4143
- name: Change wrapper permissions
4244
run: chmod +x ./gradlew
@@ -47,4 +49,4 @@ jobs:
4749

4850
# Run Build Project
4951
- name: Build gradle project
50-
run: ./gradlew build
52+
run: ./gradlew build

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
## Version Release
2727
This Is Latest Release
2828

29-
$version_release = 2.4.7
29+
$version_release = 2.4.8
3030

3131
What's New??
3232

@@ -73,20 +73,20 @@ allprojects {
7373

7474
dependencies {
7575
// library frogo-consume-api
76-
implementation 'com.github.frogobox:frogo-consume-api:2.4.7'
76+
implementation 'com.github.frogobox:frogo-consume-api:2.4.8'
7777

7878
// library frogo-consume-api for desktop
79-
implementation 'com.github.frogobox.frogo-consume-api:frogocoreconsumeapi:2.4.7'
79+
implementation 'com.github.frogobox.frogo-consume-api:core-api:2.4.8'
8080
}
8181

8282
#### <Option 2> Kotlin DSL Gradle
8383

8484
dependencies {
8585
// library frogo-consume-api
86-
implementation("com.github.frogobox:frogo-consume-api:2.4.7")
86+
implementation("com.github.frogobox:frogo-consume-api:2.4.8")
8787

8888
// library frogo-consume-api for desktop
89-
implementation("com.github.frogobox.frogo-consume-api:frogocoreconsumeapi:2.4.7")
89+
implementation("com.github.frogobox.frogo-consume-api:core-api:2.4.8")
9090
}
9191

9292

‎app/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ android {
8585
dependencies {
8686
implementation(project(DependencyGradle.FROGO_PATH_CORE_ANDROID_API))
8787
implementation(project(DependencyGradle.FROGO_PATH_CORE_API))
88-
implementation(DependencyGradle.FROGO_RECYCLER_VIEW)
89-
implementation(DependencyGradle.FROGO_UI)
88+
9089
implementation(DependencyGradle.FROGO_SDK)
90+
implementation(DependencyGradle.FROGO_UI)
91+
implementation(DependencyGradle.FROGO_RECYCLER_VIEW)
9192
}

‎app/src/main/java/com/frogobox/appapi/di/ConsumeApiModule.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import com.frogobox.api.movie.ConsumeMovieApi
55
import com.frogobox.api.news.ConsumeNewsApi
66
import com.frogobox.api.pixabay.ConsumePixabayApi
77
import com.frogobox.api.sport.ConsumeTheSportDbApi
8-
import com.frogobox.coremodel.meal.MealUrl
9-
import com.frogobox.coremodel.movie.MovieUrl
10-
import com.frogobox.coremodel.news.NewsUrl
11-
import com.frogobox.coremodel.pixabay.PixabayUrl
12-
import com.frogobox.coremodel.sport.SportUrl
8+
import com.frogobox.coreutil.meal.MealUrl
9+
import com.frogobox.coreutil.movie.MovieUrl
10+
import com.frogobox.coreutil.news.NewsUrl
11+
import com.frogobox.coreutil.pixabay.PixabayUrl
12+
import com.frogobox.coreutil.sport.SportUrl
1313
import org.koin.dsl.module
1414

1515

@@ -29,23 +29,23 @@ import org.koin.dsl.module
2929
val consumeApiModule = module {
3030

3131
single {
32-
ConsumeNewsApi(NewsUrl.API_KEY)
32+
ConsumeNewsApi(com.frogobox.coreutil.news.NewsUrl.API_KEY)
3333
}
3434

3535
single {
36-
ConsumeTheSportDbApi(SportUrl.API_KEY)
36+
ConsumeTheSportDbApi(com.frogobox.coreutil.sport.SportUrl.API_KEY)
3737
}
3838

3939
single {
40-
ConsumeTheMealDbApi(MealUrl.API_KEY)
40+
ConsumeTheMealDbApi(com.frogobox.coreutil.meal.MealUrl.API_KEY)
4141
}
4242

4343
single {
44-
ConsumePixabayApi(PixabayUrl.API_KEY)
44+
ConsumePixabayApi(com.frogobox.coreutil.pixabay.PixabayUrl.API_KEY)
4545
}
4646

4747
single {
48-
ConsumeMovieApi(MovieUrl.API_KEY)
48+
ConsumeMovieApi(com.frogobox.coreutil.movie.MovieUrl.API_KEY)
4949
}
5050

5151
}

‎app/src/main/java/com/frogobox/appapi/mvvm/meal/MealActivity.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.view.LayoutInflater
55
import android.view.ViewGroup
66
import com.bumptech.glide.Glide
77
import com.frogobox.appapi.databinding.ActivityMealBinding
8-
import com.frogobox.coremodel.meal.model.Meal
8+
import com.frogobox.coreutil.meal.model.Meal
99
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
1010
import com.frogobox.recycler.core.IFrogoBindingAdapter
1111
import com.frogobox.sdk.ext.progressViewHandle
@@ -46,9 +46,9 @@ class MealActivity : FrogoBindActivity<ActivityMealBinding>() {
4646
mealViewModel.getListMeals(this, "b")
4747
}
4848

49-
private fun setupRv(data: List<Meal>) {
49+
private fun setupRv(data: List<com.frogobox.coreutil.meal.model.Meal>) {
5050

51-
val adapterCallback = object : IFrogoBindingAdapter<Meal, FrogoRvGridType2Binding> {
51+
val adapterCallback = object : IFrogoBindingAdapter<com.frogobox.coreutil.meal.model.Meal, FrogoRvGridType2Binding> {
5252

5353
override fun setViewBinding(parent: ViewGroup): FrogoRvGridType2Binding {
5454
return FrogoRvGridType2Binding.inflate(
@@ -60,9 +60,9 @@ class MealActivity : FrogoBindActivity<ActivityMealBinding>() {
6060

6161
override fun setupInitComponent(
6262
binding: FrogoRvGridType2Binding,
63-
data: Meal,
63+
data: com.frogobox.coreutil.meal.model.Meal,
6464
position: Int,
65-
notifyListener: FrogoRecyclerNotifyListener<Meal>
65+
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coreutil.meal.model.Meal>
6666
) {
6767
binding.apply {
6868
Glide.with(root.context).load(data.strMealThumb).into(frogoRvGridType2IvPoster)
@@ -73,25 +73,25 @@ class MealActivity : FrogoBindActivity<ActivityMealBinding>() {
7373

7474
override fun onItemClicked(
7575
binding: FrogoRvGridType2Binding,
76-
data: Meal,
76+
data: com.frogobox.coreutil.meal.model.Meal,
7777
position: Int,
78-
notifyListener: FrogoRecyclerNotifyListener<Meal>
78+
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coreutil.meal.model.Meal>
7979
) {
8080
data.strMeal?.let { showToast(it) }
8181
}
8282

8383
override fun onItemLongClicked(
8484
binding: FrogoRvGridType2Binding,
85-
data: Meal,
85+
data: com.frogobox.coreutil.meal.model.Meal,
8686
position: Int,
87-
notifyListener: FrogoRecyclerNotifyListener<Meal>
87+
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coreutil.meal.model.Meal>
8888
) {
8989
data.strMeal?.let { showToast(it) }
9090
}
9191

9292
}
9393

94-
binding.frogoRv.injectorBinding<Meal, FrogoRvGridType2Binding>()
94+
binding.frogoRv.injectorBinding<com.frogobox.coreutil.meal.model.Meal, FrogoRvGridType2Binding>()
9595
.addData(data)
9696
.addCallback(adapterCallback)
9797
.createLayoutGrid(2)

‎app/src/main/java/com/frogobox/appapi/mvvm/meal/MealViewModel.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.frogobox.appapi.core.BaseViewModel
77
import com.frogobox.appapi.source.ApiRepository
88
import com.frogobox.appapi.util.isDebug
99
import com.frogobox.coreapi.ConsumeApiResponse
10-
import com.frogobox.coremodel.meal.model.Meal
11-
import com.frogobox.coremodel.meal.response.MealResponse
10+
import com.frogobox.coreutil.meal.model.Meal
11+
import com.frogobox.coreutil.meal.response.MealResponse
1212

1313
/*
1414
* Created by faisalamir on 28/07/21
@@ -26,15 +26,15 @@ class MealViewModel(
2626
private val repository: ApiRepository
2727
) : BaseViewModel() {
2828

29-
val _listData = MutableLiveData<List<Meal>>()
30-
val listData: LiveData<List<Meal>> = _listData
29+
val _listData = MutableLiveData<List<com.frogobox.coreutil.meal.model.Meal>>()
30+
val listData: LiveData<List<com.frogobox.coreutil.meal.model.Meal>> = _listData
3131

3232
fun getListMeals(context: Context, firstLetter: String) {
3333
val mealApi = repository.consumeTheMealDbApi().usingChuckInterceptor(isDebug, context)
3434
mealApi.listAllMeal(
3535
firstLetter,
36-
object : ConsumeApiResponse<MealResponse<Meal>> {
37-
override fun onSuccess(data: MealResponse<Meal>) {
36+
object : ConsumeApiResponse<com.frogobox.coreutil.meal.response.MealResponse<com.frogobox.coreutil.meal.model.Meal>> {
37+
override fun onSuccess(data: com.frogobox.coreutil.meal.response.MealResponse<com.frogobox.coreutil.meal.model.Meal>) {
3838
// on Success Request
3939
data.meals?.let { _listData.postValue(it) }
4040
}

‎app/src/main/java/com/frogobox/appapi/mvvm/movies/movie/MovieDayFragment.kt‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import androidx.fragment.app.Fragment
88
import com.bumptech.glide.Glide
99
import com.frogobox.appapi.databinding.ContentItemBinding
1010
import com.frogobox.appapi.databinding.FragmentTrendingChildBinding
11-
import com.frogobox.coremodel.movie.MovieUrl
12-
import com.frogobox.coremodel.movie.model.TrendingMovie
11+
import com.frogobox.coreutil.movie.MovieUrl
1312
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
1413
import com.frogobox.recycler.core.IFrogoBindingAdapter
1514
import com.frogobox.sdk.ext.progressViewHandle
@@ -52,22 +51,22 @@ class MovieDayFragment : FrogoBindFragment<FragmentTrendingChildBinding>() {
5251
override fun onViewCreatedExt(view: View, savedInstanceState: Bundle?) {
5352
}
5453

55-
private fun setupRV(data: List<com.frogobox.coremodel.movie.model.TrendingMovie>) {
54+
private fun setupRV(data: List<com.frogobox.coreutil.movie.model.TrendingMovie>) {
5655

57-
val adapterCallback = object : IFrogoBindingAdapter<com.frogobox.coremodel.movie.model.TrendingMovie, ContentItemBinding> {
56+
val adapterCallback = object : IFrogoBindingAdapter<com.frogobox.coreutil.movie.model.TrendingMovie, ContentItemBinding> {
5857
override fun onItemClicked(
5958
binding: ContentItemBinding,
60-
data: com.frogobox.coremodel.movie.model.TrendingMovie,
59+
data: com.frogobox.coreutil.movie.model.TrendingMovie,
6160
position: Int,
62-
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coremodel.movie.model.TrendingMovie>
61+
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coreutil.movie.model.TrendingMovie>
6362
) {
6463
}
6564

6665
override fun onItemLongClicked(
6766
binding: ContentItemBinding,
68-
data: com.frogobox.coremodel.movie.model.TrendingMovie,
67+
data: com.frogobox.coreutil.movie.model.TrendingMovie,
6968
position: Int,
70-
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coremodel.movie.model.TrendingMovie>
69+
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coreutil.movie.model.TrendingMovie>
7170
) {
7271
}
7372

@@ -81,21 +80,21 @@ class MovieDayFragment : FrogoBindFragment<FragmentTrendingChildBinding>() {
8180

8281
override fun setupInitComponent(
8382
binding: ContentItemBinding,
84-
data: com.frogobox.coremodel.movie.model.TrendingMovie,
83+
data: com.frogobox.coreutil.movie.model.TrendingMovie,
8584
position: Int,
86-
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coremodel.movie.model.TrendingMovie>
85+
notifyListener: FrogoRecyclerNotifyListener<com.frogobox.coreutil.movie.model.TrendingMovie>
8786
) {
8887
binding.apply {
8988
tvTitle.text = data.title
9089
tvOverview.text = data.overview
9190
Glide.with(root.context)
92-
.load("${MovieUrl.BASE_URL_IMAGE_ORIGNAL}${data.poster_path}")
91+
.load("${com.frogobox.coreutil.movie.MovieUrl.BASE_URL_IMAGE_ORIGNAL}${data.poster_path}")
9392
.into(ivPoster)
9493
}
9594
}
9695
}
9796

98-
binding.frogoRecyclerView.injectorBinding<com.frogobox.coremodel.movie.model.TrendingMovie, ContentItemBinding>()
97+
binding.frogoRecyclerView.injectorBinding<com.frogobox.coreutil.movie.model.TrendingMovie, ContentItemBinding>()
9998
.addData(data)
10099
.addCallback(adapterCallback)
101100
.createLayoutGrid(2)

‎app/src/main/java/com/frogobox/appapi/mvvm/movies/movie/MovieViewModel.kt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import android.app.Application
44
import com.frogobox.appapi.mvvm.movies.core.BaseMovieApiViewModel
55
import com.frogobox.appapi.source.ApiRepository
66
import com.frogobox.coreapi.ConsumeApiResponse
7-
import com.frogobox.coremodel.movie.model.TrendingMovie
8-
import com.frogobox.coremodel.movie.response.Trending
97
import com.frogobox.sdk.util.FrogoMutableLiveData
108

119
/*
@@ -25,12 +23,12 @@ class MovieViewModel(
2523
private val repository: ApiRepository
2624
) : BaseMovieApiViewModel(context, repository) {
2725

28-
val listDataDay = FrogoMutableLiveData<List<com.frogobox.coremodel.movie.model.TrendingMovie>>()
29-
val listDataWeek = FrogoMutableLiveData<List<com.frogobox.coremodel.movie.model.TrendingMovie>>()
26+
val listDataDay = FrogoMutableLiveData<List<com.frogobox.coreutil.movie.model.TrendingMovie>>()
27+
val listDataWeek = FrogoMutableLiveData<List<com.frogobox.coreutil.movie.model.TrendingMovie>>()
3028

3129
fun getTrendingMovieDay() {
32-
movieApi.getTrendingMovieDay(object : ConsumeApiResponse<com.frogobox.coremodel.movie.response.Trending<com.frogobox.coremodel.movie.model.TrendingMovie>> {
33-
override fun onSuccess(data: com.frogobox.coremodel.movie.response.Trending<com.frogobox.coremodel.movie.model.TrendingMovie>) {
30+
movieApi.getTrendingMovieDay(object : ConsumeApiResponse<com.frogobox.coreutil.movie.response.Trending<com.frogobox.coreutil.movie.model.TrendingMovie>> {
31+
override fun onSuccess(data: com.frogobox.coreutil.movie.response.Trending<com.frogobox.coreutil.movie.model.TrendingMovie>) {
3432
data.results?.let { listDataDay.postValue(it) }
3533
}
3634

@@ -58,8 +56,8 @@ class MovieViewModel(
5856

5957
fun getTrendingMovieWeek() {
6058
movieApi.getTrendingMovieWeek(object :
61-
ConsumeApiResponse<com.frogobox.coremodel.movie.response.Trending<com.frogobox.coremodel.movie.model.TrendingMovie>> {
62-
override fun onSuccess(data: com.frogobox.coremodel.movie.response.Trending<com.frogobox.coremodel.movie.model.TrendingMovie>) {
59+
ConsumeApiResponse<com.frogobox.coreutil.movie.response.Trending<com.frogobox.coreutil.movie.model.TrendingMovie>> {
60+
override fun onSuccess(data: com.frogobox.coreutil.movie.response.Trending<com.frogobox.coreutil.movie.model.TrendingMovie>) {
6361
data.results?.let { listDataWeek.postValue(it) }
6462
}
6563

0 commit comments

Comments
 (0)