Skip to content

Commit 10c45cf

Browse files
committed
restructured dependencies
1 parent 1202faf commit 10c45cf

File tree

65 files changed

+277
-142
lines changed

Some content is hidden

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

65 files changed

+277
-142
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ android {
6262
dependencies {
6363
implementation(project(":core"))
6464
implementation(project(":network"))
65-
implementation(project(":source-github"))
66-
implementation(project(":source-medium"))
67-
implementation(project(":source-androidweekly"))
68-
implementation(project(":source-kotlinweekly"))
69-
implementation(project(":source-rss"))
7065
implementation(project(":services"))
7166
// debugImplementation(project(":devik"))
7267
// releaseImplementation(project(":devik-noop"))

app/src/main/java/me/arunsharma/devupdates/data/AppDatabase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package me.arunsharma.devupdates.data
22

33
import androidx.room.Database
44
import androidx.room.RoomDatabase
5-
import com.dev.services.models.ServiceItem
5+
import com.dev.services.api.models.ServiceItem
66
import me.arunsharma.devupdates.data.dao.FeedDao
77

88
@Database(entities = [ServiceItem::class], version = 1)

app/src/main/java/me/arunsharma/devupdates/data/SourceConfigStore.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package me.arunsharma.devupdates.data
33
import android.content.Context
44
import com.dev.core.AppConstants
55
import com.dev.core.utils.StorageUtils
6-
import com.dev.services.models.ServiceRequest
7-
import com.dev.services.models.SourceConfig
6+
import com.dev.services.api.models.ServiceRequest
7+
import com.dev.services.api.models.SourceConfig
88
import com.squareup.moshi.Moshi
99
import dagger.hilt.android.qualifiers.ApplicationContext
1010
import me.arunsharma.devupdates.R

app/src/main/java/me/arunsharma/devupdates/data/dao/FeedDao.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import androidx.room.Dao
44
import androidx.room.Insert
55
import androidx.room.OnConflictStrategy
66
import androidx.room.Query
7-
import com.dev.services.models.ServiceItem
7+
import com.dev.services.api.models.ServiceItem
88
import kotlinx.coroutines.flow.Flow
99

1010
@Dao

app/src/main/java/me/arunsharma/devupdates/data/repo/RepoFeed.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import android.text.format.DateUtils
44
import com.dev.core.di.annotations.IoDispatcher
55
import com.dev.network.model.APIErrorException
66
import com.dev.network.model.ResponseStatus
7-
import com.dev.services.models.ServiceItem
8-
import com.dev.services.models.ServiceRequest
9-
import com.dev.services.models.ServiceResult
10-
import com.dev.services.repo.ServiceIntegration
11-
import com.devupdates.github.ServiceGithub
7+
import com.dev.services.api.ServiceConstants
8+
import com.dev.services.api.models.ServiceItem
9+
import com.dev.services.api.models.ServiceRequest
10+
import com.dev.services.api.models.ServiceResult
11+
import com.dev.services.api.repo.ServiceIntegration
1212
import kotlinx.coroutines.CoroutineDispatcher
1313
import kotlinx.coroutines.flow.Flow
1414
import kotlinx.coroutines.withContext
@@ -106,7 +106,7 @@ class RepoFeed @Inject constructor(
106106
checkForUpdate: (ServiceRequest, List<ServiceItem>, List<ServiceItem>) -> Unit
107107
) {
108108
serviceIntegration.forEach { entry ->
109-
if (entry.key != ServiceGithub.SERVICE_KEY) {
109+
if (entry.key != ServiceConstants.SERVICE_KEY_GITHUB) {
110110
sources.find {
111111
it.type.toString() == entry.key
112112
}?.let { request ->

app/src/main/java/me/arunsharma/devupdates/di/data/ServiceConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.arunsharma.devupdates.di.data
22

3-
import com.dev.services.models.SourceConfig
3+
import com.dev.services.api.models.SourceConfig
44
import retrofit2.http.GET
55
import retrofit2.http.Url
66

app/src/main/java/me/arunsharma/devupdates/ui/fragments/addsource/DataSourceAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.core.content.ContextCompat
66
import androidx.recyclerview.widget.RecyclerView
77
import com.dev.core.recyclerview.BaseRecyclerViewAdapter
88
import com.dev.core.recyclerview.BaseViewHolder
9-
import com.dev.services.models.ServiceRequest
9+
import com.dev.services.api.models.ServiceRequest
1010
import me.arunsharma.devupdates.R
1111
import me.arunsharma.devupdates.databinding.ItemDataSourceBinding
1212
import me.arunsharma.devupdates.utils.cache.FeedUtils

app/src/main/java/me/arunsharma/devupdates/ui/fragments/addsource/VMDataSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package me.arunsharma.devupdates.ui.fragments.addsource
33
import androidx.lifecycle.LiveData
44
import androidx.lifecycle.MutableLiveData
55
import com.dev.core.base.BaseViewModel
6-
import com.dev.services.models.ServiceRequest
6+
import com.dev.services.api.models.ServiceRequest
77
import dagger.hilt.android.lifecycle.HiltViewModel
88
import kotlinx.coroutines.Dispatchers
99
import kotlinx.coroutines.withContext

app/src/main/java/me/arunsharma/devupdates/ui/fragments/bookmarks/BookmarksFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.dev.core.databinding.LayoutProgressErrorBinding
1010
import com.dev.core.recyclerview.BaseRecyclerViewAdapter
1111
import com.dev.core.utils.CustomTabHelper
1212
import com.dev.core.utils.viewBinding
13-
import com.dev.services.models.ServiceItem
13+
import com.dev.services.api.models.ServiceItem
1414
import dagger.hilt.android.AndroidEntryPoint
1515
import me.arunsharma.devupdates.R
1616
import me.arunsharma.devupdates.databinding.FragmentBookmarksBinding

app/src/main/java/me/arunsharma/devupdates/ui/fragments/bookmarks/VMBookmarks.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import androidx.lifecycle.LiveData
55
import androidx.lifecycle.MutableLiveData
66
import com.dev.core.base.BaseViewModel
77
import com.dev.core.di.annotations.IoDispatcher
8-
import com.dev.services.models.DataSource
9-
import com.dev.services.models.ServiceItem
10-
import com.dev.services.models.ServiceRequest
8+
import com.dev.services.api.models.DataSource
9+
import com.dev.services.api.models.ServiceItem
10+
import com.dev.services.api.models.ServiceRequest
1111
import dagger.hilt.android.lifecycle.HiltViewModel
1212
import kotlinx.coroutines.CoroutineDispatcher
1313
import kotlinx.coroutines.Dispatchers

0 commit comments

Comments
 (0)