Skip to content

Commit

Permalink
build(deps): migrate from local to jitpack stubs
Browse files Browse the repository at this point in the history
Former-commit-id: 1fa0821
  • Loading branch information
rhenwinch committed Sep 14, 2024
1 parent fd5d6bb commit ccd322f
Show file tree
Hide file tree
Showing 201 changed files with 839 additions and 824 deletions.
5 changes: 3 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ dependencies {
implementation(projects.data.watchlist)
implementation(projects.domain.provider)
implementation(projects.domain.tmdb)
implementation(projects.model.provider)
implementation(libs.stubs.model.provider)

implementation(projects.service)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.launch
import okhttp3.OkHttpClient
import javax.inject.Inject
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

internal const val errorReportFormUrl = "https://docs.google.com/forms/u/0/d/e/1FAIpQLSfTVmgiOeF7RlDbjBR10RQG6C6uKioSk-toqKecPvpkAe9ffw/formResponse?pli=1"

Expand Down Expand Up @@ -43,7 +43,7 @@ internal class DefaultCrashReportSender @Inject constructor(

if(!isSent) {
context.run {
showToast(getString(UtilR.string.fail_sending_error_log))
showToast(getString(LocaleR.string.fail_sending_error_log))
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/flixclusive/mobile/MobileApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import com.ramcosta.composedestinations.utils.startDestination
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlin.system.exitProcess
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down Expand Up @@ -170,15 +170,15 @@ internal fun MobileActivity.MobileApp(
hasBeenDisconnected = true
snackbarHostState.showSnackbar(
InternetMonitorSnackbarVisuals(
message = UiText.StringResource(UtilR.string.offline_message).asString(context),
message = UiText.StringResource(LocaleR.string.offline_message).asString(context),
isDisconnected = true
)
)
} else if (hasBeenDisconnected) {
hasBeenDisconnected = false
snackbarHostState.showSnackbar(
InternetMonitorSnackbarVisuals(
message = UiText.StringResource(UtilR.string.online_message).asString(context),
message = UiText.StringResource(LocaleR.string.online_message).asString(context),
isDisconnected = false
)
)
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/kotlin/com/flixclusive/mobile/MobileAppViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.flixclusive.core.datastore.AppSettingsManager
import com.flixclusive.core.ui.mobile.KeyEventHandler
import com.flixclusive.core.network.util.Resource
import com.flixclusive.core.ui.common.provider.MediaLinkResourceState
import com.flixclusive.core.ui.mobile.KeyEventHandler
import com.flixclusive.core.util.webview.WebViewDriverManager
import com.flixclusive.data.configuration.AppConfigurationManager
import com.flixclusive.data.util.InternetMonitor
import com.flixclusive.data.watch_history.WatchHistoryRepository
import com.flixclusive.data.watchlist.WatchlistRepository
import com.flixclusive.domain.provider.CachedLinks
import com.flixclusive.domain.provider.GetMediaLinksUseCase
import com.flixclusive.domain.tmdb.FilmProviderUseCase
import com.flixclusive.model.database.toWatchlistItem
import com.flixclusive.domain.provider.CachedLinks
import com.flixclusive.core.ui.common.provider.MediaLinkResourceState
import com.flixclusive.model.film.Film
import com.flixclusive.model.film.FilmDetails
import com.flixclusive.model.film.common.tv.Episode
Expand All @@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

@HiltViewModel
internal class MobileAppViewModel @Inject constructor(
Expand Down Expand Up @@ -184,7 +184,7 @@ internal class MobileAppViewModel @Inject constructor(
return

onPlayClickJob = viewModelScope.launch {
updateVideoDataDialogState(MediaLinkResourceState.Fetching(UtilR.string.film_data_fetching))
updateVideoDataDialogState(MediaLinkResourceState.Fetching(LocaleR.string.film_data_fetching))

var filmToShow = film ?: _filmToPreview.value ?: return@launch

Expand All @@ -195,7 +195,7 @@ internal class MobileAppViewModel @Inject constructor(
else -> Resource.Success(filmToShow)
}

val errorFetchingFilm = MediaLinkResourceState.Error(UtilR.string.film_data_fetch_failed)
val errorFetchingFilm = MediaLinkResourceState.Error(LocaleR.string.film_data_fetch_failed)
if(response !is Resource.Success) {
return@launch updateVideoDataDialogState(errorFetchingFilm)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import com.flixclusive.core.ui.common.util.onMediumEmphasis
import com.flixclusive.mobile.MobileNavGraphs
import com.ramcosta.composedestinations.spec.NavGraphSpec
import com.flixclusive.core.ui.common.R as UiCommonR
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

@Composable
internal fun BottomBar(
Expand Down Expand Up @@ -167,24 +167,24 @@ private val mobileNavigationItems = listOf(
screen = MobileNavGraphs.home,
iconSelected = UiCommonR.drawable.home,
iconUnselected = UiCommonR.drawable.home_outlined,
label = UtilR.string.home
label = LocaleR.string.home
),
AppNavigationItem(
screen = MobileNavGraphs.search,
iconSelected = UiCommonR.drawable.search,
iconUnselected = UiCommonR.drawable.search_outlined,
label = UtilR.string.search
label = LocaleR.string.search
),
AppNavigationItem(
screen = MobileNavGraphs.providers,
iconSelected = UiCommonR.drawable.provider_logo_fill,
iconUnselected = UiCommonR.drawable.provider_logo,
label = UtilR.string.providers
label = LocaleR.string.providers
),
AppNavigationItem(
screen = MobileNavGraphs.preferences,
iconSelected = UiCommonR.drawable.settings_filled,
iconUnselected = UiCommonR.drawable.settings,
label = UtilR.string.preferences
label = LocaleR.string.preferences
),
)
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import com.flixclusive.core.ui.common.util.formatRating
import com.flixclusive.model.film.Film
import com.flixclusive.core.ui.common.R as UiCommonR
import com.flixclusive.core.ui.mobile.R as UiMobileR
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down Expand Up @@ -138,7 +138,7 @@ internal fun FilmPreviewBottomSheet(
) {
Icon(
imageVector = Icons.Rounded.Star,
contentDescription = stringResource(UtilR.string.rating_icon),
contentDescription = stringResource(LocaleR.string.rating_icon),
modifier = Modifier.scale(0.6F),
tint = starColor,
)
Expand Down Expand Up @@ -170,27 +170,27 @@ internal fun FilmPreviewBottomSheet(
verticalAlignment = Alignment.CenterVertically
) {
IconButtonWithLabel(
labelId = UtilR.string.play,
labelId = LocaleR.string.play,
onClick = onPlayClick
) {
Icon(
painter = painterResource(UiCommonR.drawable.play),
contentDescription = stringResource(UtilR.string.play_button),
contentDescription = stringResource(LocaleR.string.play_button),
modifier = Modifier.size(33.dp)
)
}

val contentDescription = if (isInWatchlist()) {
UtilR.string.added_to_watchlist_button
} else UtilR.string.add_to_watchlist_button
LocaleR.string.added_to_watchlist_button
} else LocaleR.string.add_to_watchlist_button

val icon = if (isInWatchlist()) {
R.drawable.added_bookmark
} else R.drawable.add_bookmark

val label = if (isInWatchlist()) {
UtilR.string.watchlisted
} else UtilR.string.watchlist
LocaleR.string.watchlisted
} else LocaleR.string.watchlist

IconButtonWithLabel(
labelId = label,
Expand All @@ -205,12 +205,12 @@ internal fun FilmPreviewBottomSheet(

if (isInWatchHistory()) {
IconButtonWithLabel(
labelId = UtilR.string.remove,
labelId = LocaleR.string.remove,
onClick = onWatchHistoryButtonClick
) {
Icon(
painter = painterResource(UiCommonR.drawable.delete),
contentDescription = stringResource(UtilR.string.remove),
contentDescription = stringResource(LocaleR.string.remove),
modifier = Modifier.size(33.dp)
)
}
Expand Down Expand Up @@ -238,14 +238,14 @@ internal fun FilmPreviewBottomSheet(
) {
Icon(
painter = painterResource(R.drawable.information),
contentDescription = stringResource(UtilR.string.more_details),
contentDescription = stringResource(LocaleR.string.more_details),
modifier = Modifier
.scale(0.7F)
.padding(start = 15.dp),
)

Text(
text = stringResource(UtilR.string.more_details),
text = stringResource(LocaleR.string.more_details),
style = MaterialTheme.typography.titleMedium,
modifier = Modifier
.padding(vertical = 15.dp)
Expand All @@ -254,7 +254,7 @@ internal fun FilmPreviewBottomSheet(

Icon(
painter = painterResource(UiMobileR.drawable.right_arrow),
contentDescription = stringResource(UtilR.string.navigate_to_film),
contentDescription = stringResource(LocaleR.string.navigate_to_film),
modifier = Modifier
.scale(0.7F)
.padding(end = 15.dp),
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/kotlin/com/flixclusive/tv/NavDrawer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,20 @@ import com.flixclusive.core.ui.tv.util.focusOnInitialVisibility
import com.flixclusive.core.ui.tv.util.useLocalLastFocusedItemFocusedRequester
import com.ramcosta.composedestinations.spec.NavGraphSpec
import kotlinx.coroutines.delay
import com.flixclusive.core.locale.R as LocaleR

internal val tvNavigationItems = listOf(
AppNavigationItem(
screen = TvNavGraphs.home,
iconSelected = R.drawable.home,
iconUnselected = R.drawable.home_outlined,
label = com.flixclusive.core.util.R.string.home
label = LocaleR.string.home
),
AppNavigationItem(
screen = TvNavGraphs.search,
iconSelected = R.drawable.search,
iconUnselected = R.drawable.search_outlined,
label = com.flixclusive.core.util.R.string.search
label = LocaleR.string.search
),
)

Expand Down
4 changes: 2 additions & 2 deletions core/database/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ android {
}

dependencies {
implementation(projects.core.util)
implementation(libs.stubs.util)
implementation(projects.model.database)
implementation(projects.model.film)
implementation(libs.stubs.model.film)

implementation(libs.gson)
}
2 changes: 1 addition & 1 deletion core/datastore/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ dependencies {
api(libs.dataStore.preferences)
api(projects.model.datastore)

implementation(projects.core.util)
implementation(libs.stubs.util)
}
4 changes: 2 additions & 2 deletions core/network/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ dependencies {
implementation(libs.retrofit.gson)
implementation(projects.core.datastore)
implementation(projects.core.locale)
implementation(projects.core.util)
implementation(libs.stubs.util)
implementation(projects.model.configuration)
implementation(projects.model.datastore)
implementation(projects.model.film)
implementation(libs.stubs.model.film)
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import java.net.ConnectException
import java.net.SocketTimeoutException
import java.net.UnknownHostException
import javax.net.ssl.SSLException
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

/**
* A sealed class representing a resource that can be in one of three states: Success, Failure, or Loading.
Expand Down Expand Up @@ -55,9 +55,9 @@ sealed class Resource<out T>(
*/
fun Throwable.toNetworkException(): Failure {
return when (this) {
is SocketTimeoutException -> Failure(UtilR.string.connection_timeout)
is SocketTimeoutException -> Failure(LocaleR.string.connection_timeout)
is ConnectException, is UnknownHostException -> Failure(
UtilR.string.connection_failed)
LocaleR.string.connection_failed)
is HttpException -> {
val errorMessage = "HTTP Code: ${code()}"
errorLog(errorMessage)
Expand Down
6 changes: 3 additions & 3 deletions core/ui/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ android {

dependencies {
api(projects.core.theme)
api(projects.core.util)
api(libs.stubs.util)
api(projects.core.locale)
implementation(projects.model.database)
implementation(projects.model.provider)
implementation(projects.model.film)
implementation(libs.stubs.model.provider)
implementation(libs.stubs.model.film)
implementation(projects.model.datastore)

implementation(libs.coil.compose)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

val COMMON_TOP_BAR_HEIGHT = 65.dp

Expand Down Expand Up @@ -51,7 +51,7 @@ fun CommonTopBar(
IconButton(onClick = onNavigationIconClick) {
Icon(
painter = painterResource(R.drawable.left_arrow),
contentDescription = stringResource(UtilR.string.navigate_up)
contentDescription = stringResource(LocaleR.string.navigate_up)
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import coil.compose.AsyncImage
import coil.imageLoader
import com.flixclusive.core.ui.common.util.buildImageUrl
import com.flixclusive.core.ui.common.util.ifElse
import com.flixclusive.core.util.R as UtilR
import com.flixclusive.core.locale.R as LocaleR

enum class FilmCover(val ratio: Float) {
Backdrop(16F / 9F),
Expand Down Expand Up @@ -55,7 +55,7 @@ enum class FilmCover(val ratio: Float) {
imageLoader = LocalContext.current.imageLoader,
error = imagePlaceholder,
contentScale = contentScale,
contentDescription = contentDescription ?: stringResource(id = UtilR.string.film_item_content_description),
contentDescription = contentDescription ?: stringResource(id = LocaleR.string.film_item_content_description),
onSuccess = { onSuccess?.invoke() },
modifier = modifier
.aspectRatio(ratio)
Expand Down
Loading

0 comments on commit ccd322f

Please sign in to comment.