Skip to content

Commit

Permalink
Merge pull request #106 from VictorKabata/package-naming
Browse files Browse the repository at this point in the history
Update application package name
  • Loading branch information
VictorKabata authored Dec 14, 2023
2 parents 0508c91 + 552f500 commit 881846c
Show file tree
Hide file tree
Showing 108 changed files with 282 additions and 283 deletions.
4 changes: 2 additions & 2 deletions appAndroid/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
compileSdk = 34

defaultConfig {
applicationId = "com.vickikbt.notflix"
applicationId = "com.vickbt.notflix"

minSdk = 24
targetSdk = compileSdk
Expand Down Expand Up @@ -47,7 +47,7 @@ android {
composeOptions {
kotlinCompilerExtensionVersion = "1.5.3"
}
namespace = "com.vickikbt.notflix"
namespace = "com.vickbt.notflix"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion appAndroid/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:393812441846:android:88af4c42582e9416204ad7",
"android_client_info": {
"package_name": "com.vickikbt.notflix"
"package_name": "com.vickbt.notflix"
}
},
"oauth_client": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vickikbt.notflix
package com.vickbt.notflix

import android.app.Application
import com.vickikbt.shared.di.initKoin
import com.vickikbt.shared.utils.ContextUtils
import com.vickbt.shared.di.initKoin
import com.vickbt.shared.utils.ContextUtils
import org.koin.android.BuildConfig
import org.koin.android.ext.koin.androidContext
import org.koin.android.ext.koin.androidLogger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vickikbt.notflix.ui.activity
package com.vickbt.notflix.ui.activity

import android.os.Bundle
import androidx.compose.animation.ExperimentalAnimationApi
import com.vickikbt.shared.ui.screens.main.MainScreen
import com.vickbt.shared.ui.screens.main.MainScreen
import moe.tlaster.precompose.lifecycle.PreComposeActivity
import moe.tlaster.precompose.lifecycle.setContent

Expand Down
2 changes: 1 addition & 1 deletion appDesktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ dependencies {

compose.desktop {
application {
mainClass = "com.vickikbt.notflix.NotflixApplicationKt"
mainClass = "com.vickbt.notflix.NotflixApplicationKt"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vickbt.notflix

import androidx.compose.ui.window.application
import com.vickbt.notflix.ui.windows.MainWindow
import com.vickikbt.shared.di.initKoin
import com.vickbt.shared.di.initKoin
import org.koin.core.Koin

lateinit var koin: Koin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.ApplicationScope
import androidx.compose.ui.window.WindowPosition
import androidx.compose.ui.window.rememberWindowState
import com.vickikbt.shared.ui.screens.main.MainScreen
import com.vickbt.shared.ui.screens.main.MainScreen
import moe.tlaster.precompose.PreComposeWindow

@Composable
Expand Down
4 changes: 2 additions & 2 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ android {
defaultConfig {
minSdk = 24
}
namespace = "com.vickikbt.shared"
namespace = "com.vickbt.shared"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
Expand All @@ -114,7 +114,7 @@ android {
}

buildkonfig {
packageName = "com.vickikbt.shared"
packageName = "com.vickbt.shared"

defaultConfigs {
buildConfigField(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vickikbt.shared.di
package com.vickbt.shared.di

import com.vickikbt.shared.utils.MultiplatformSettingsWrapper
import com.vickbt.shared.utils.MultiplatformSettingsWrapper
import org.koin.core.module.Module
import org.koin.dsl.module

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.utils
package com.vickbt.shared.utils

import android.content.Context

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.utils
package com.vickbt.shared.utils

import com.seiko.imageloader.ImageLoader
import com.seiko.imageloader.cache.memory.maxSizePercent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.utils
package com.vickbt.shared.utils

import android.content.Context
import com.russhwolf.settings.AndroidSettings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vickikbt.shared.data.datasources
package com.vickbt.shared.data.datasources

import com.vickikbt.shared.domain.models.MovieDetails
import com.vickikbt.shared.domain.repositories.FavoritesRepository
import com.vickbt.shared.domain.models.MovieDetails
import com.vickbt.shared.domain.repositories.FavoritesRepository
import io.ktor.client.HttpClient
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.vickikbt.shared.data.datasources
package com.vickbt.shared.data.datasources

import com.vickikbt.shared.data.mappers.toDomain
import com.vickikbt.shared.data.network.models.CastDto
import com.vickikbt.shared.data.network.models.MovieDetailsDto
import com.vickikbt.shared.data.network.models.MovieResultsDto
import com.vickikbt.shared.data.network.utils.safeApiCall
import com.vickikbt.shared.domain.models.Cast
import com.vickikbt.shared.domain.models.Movie
import com.vickikbt.shared.domain.models.MovieDetails
import com.vickikbt.shared.domain.repositories.MovieDetailsRepository
import com.vickikbt.shared.utils.NetworkResultState
import com.vickbt.shared.data.mappers.toDomain
import com.vickbt.shared.data.network.models.CastDto
import com.vickbt.shared.data.network.models.MovieDetailsDto
import com.vickbt.shared.data.network.models.MovieResultsDto
import com.vickbt.shared.data.network.utils.safeApiCall
import com.vickbt.shared.domain.models.Cast
import com.vickbt.shared.domain.models.Movie
import com.vickbt.shared.domain.models.MovieDetails
import com.vickbt.shared.domain.repositories.MovieDetailsRepository
import com.vickbt.shared.utils.NetworkResultState
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.vickikbt.shared.data.datasources
package com.vickbt.shared.data.datasources

import com.vickikbt.shared.data.mappers.toDomain
import com.vickikbt.shared.data.network.models.MovieResultsDto
import com.vickikbt.shared.data.network.utils.safeApiCall
import com.vickikbt.shared.domain.models.Movie
import com.vickikbt.shared.domain.repositories.MoviesRepository
import com.vickikbt.shared.utils.NetworkResultState
import com.vickbt.shared.data.mappers.toDomain
import com.vickbt.shared.data.network.models.MovieResultsDto
import com.vickbt.shared.data.network.utils.safeApiCall
import com.vickbt.shared.domain.models.Movie
import com.vickbt.shared.domain.repositories.MoviesRepository
import com.vickbt.shared.utils.NetworkResultState
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.vickikbt.shared.data.datasources
package com.vickbt.shared.data.datasources

import com.russhwolf.settings.ObservableSettings
import com.russhwolf.settings.coroutines.getIntOrNullFlow
import com.vickikbt.shared.domain.repositories.SettingsRepository
import com.vickikbt.shared.domain.utils.Constants.KEY_IMAGE_QUALITY
import com.vickikbt.shared.domain.utils.Constants.KEY_THEME
import com.vickbt.shared.domain.repositories.SettingsRepository
import com.vickbt.shared.domain.utils.Constants.KEY_IMAGE_QUALITY
import com.vickbt.shared.domain.utils.Constants.KEY_THEME
import kotlinx.coroutines.flow.Flow

class SettingsRepositoryImpl constructor(private val observableSettings: ObservableSettings) :
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.vickikbt.shared.data.mappers
package com.vickbt.shared.data.mappers

import com.vickikbt.shared.data.network.models.ActorDto
import com.vickikbt.shared.data.network.models.CastDto
import com.vickikbt.shared.data.network.models.ErrorResponseDto
import com.vickikbt.shared.data.network.models.MovieDetailsDto
import com.vickikbt.shared.data.network.models.MovieDto
import com.vickikbt.shared.data.network.models.VideoDto
import com.vickikbt.shared.domain.models.Actor
import com.vickikbt.shared.domain.models.Cast
import com.vickikbt.shared.domain.models.ErrorResponse
import com.vickikbt.shared.domain.models.Movie
import com.vickikbt.shared.domain.models.MovieDetails
import com.vickikbt.shared.domain.models.Video
import com.vickbt.shared.data.network.models.ActorDto
import com.vickbt.shared.data.network.models.CastDto
import com.vickbt.shared.data.network.models.ErrorResponseDto
import com.vickbt.shared.data.network.models.MovieDetailsDto
import com.vickbt.shared.data.network.models.MovieDto
import com.vickbt.shared.data.network.models.VideoDto
import com.vickbt.shared.domain.models.Actor
import com.vickbt.shared.domain.models.Cast
import com.vickbt.shared.domain.models.ErrorResponse
import com.vickbt.shared.domain.models.Movie
import com.vickbt.shared.domain.models.MovieDetails
import com.vickbt.shared.domain.models.Video

fun MovieDto.toDomain(): Movie {
return Movie(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.data.network.models
package com.vickbt.shared.data.network.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.vickikbt.shared.data.network.utils
package com.vickbt.shared.data.network.utils

import com.vickikbt.shared.data.mappers.toDomain
import com.vickikbt.shared.data.network.models.ErrorResponseDto
import com.vickikbt.shared.domain.models.ErrorResponse
import com.vickikbt.shared.utils.NetworkResultState
import com.vickbt.shared.data.mappers.toDomain
import com.vickbt.shared.data.network.models.ErrorResponseDto
import com.vickbt.shared.domain.models.ErrorResponse
import com.vickbt.shared.utils.NetworkResultState
import io.ktor.client.call.body
import io.ktor.client.plugins.ClientRequestException
import io.ktor.client.plugins.RedirectResponseException
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.vickikbt.shared.di
package com.vickbt.shared.di

import com.vickikbt.shared.BuildKonfig
import com.vickikbt.shared.data.datasources.FavoritesRepositoryImpl
import com.vickikbt.shared.data.datasources.MovieDetailsRepositoryImpl
import com.vickikbt.shared.data.datasources.MoviesRepositoryImpl
import com.vickikbt.shared.data.datasources.SettingsRepositoryImpl
import com.vickikbt.shared.domain.repositories.FavoritesRepository
import com.vickikbt.shared.domain.repositories.MovieDetailsRepository
import com.vickikbt.shared.domain.repositories.MoviesRepository
import com.vickikbt.shared.domain.repositories.SettingsRepository
import com.vickikbt.shared.domain.utils.Constants.BASE_URL
import com.vickikbt.shared.domain.utils.Constants.URL_PATH
import com.vickikbt.shared.presentation.ui.screens.home.HomeViewModel
import com.vickikbt.shared.presentation.ui.screens.main.MainViewModel
import com.vickikbt.shared.presentation.ui.screens.settings.SettingsViewModel
import com.vickikbt.shared.ui.screens.details.DetailsViewModel
import com.vickbt.shared.BuildKonfig
import com.vickbt.shared.data.datasources.FavoritesRepositoryImpl
import com.vickbt.shared.data.datasources.MovieDetailsRepositoryImpl
import com.vickbt.shared.data.datasources.MoviesRepositoryImpl
import com.vickbt.shared.data.datasources.SettingsRepositoryImpl
import com.vickbt.shared.domain.repositories.FavoritesRepository
import com.vickbt.shared.domain.repositories.MovieDetailsRepository
import com.vickbt.shared.domain.repositories.MoviesRepository
import com.vickbt.shared.domain.repositories.SettingsRepository
import com.vickbt.shared.domain.utils.Constants.BASE_URL
import com.vickbt.shared.domain.utils.Constants.URL_PATH
import com.vickbt.shared.presentation.ui.screens.home.HomeViewModel
import com.vickbt.shared.presentation.ui.screens.main.MainViewModel
import com.vickbt.shared.presentation.ui.screens.settings.SettingsViewModel
import com.vickbt.shared.ui.screens.details.DetailsViewModel
import io.github.aakira.napier.DebugAntilog
import io.github.aakira.napier.Napier
import io.ktor.client.HttpClient
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vickikbt.shared.di
package com.vickbt.shared.di

import com.vickikbt.shared.presentation.ui.screens.home.HomeViewModel
import com.vickikbt.shared.presentation.ui.screens.main.MainViewModel
import com.vickikbt.shared.presentation.ui.screens.settings.SettingsViewModel
import com.vickbt.shared.presentation.ui.screens.home.HomeViewModel
import com.vickbt.shared.presentation.ui.screens.main.MainViewModel
import com.vickbt.shared.presentation.ui.screens.settings.SettingsViewModel
import org.koin.core.Koin
import org.koin.core.KoinApplication
import org.koin.core.context.startKoin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.domain.models
package com.vickbt.shared.domain.models

data class Actor(

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.domain.models
package com.vickbt.shared.domain.models

data class Cast(

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.domain.models
package com.vickbt.shared.domain.models

data class Dates(
val maximum: String?,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.domain.models
package com.vickbt.shared.domain.models

data class ErrorResponse(
val success: Boolean,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.domain.models
package com.vickbt.shared.domain.models

data class Genre(

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vickikbt.shared.domain.models
package com.vickbt.shared.domain.models

data class Movie(
val adult: Boolean? = null,
Expand Down
Loading

0 comments on commit 881846c

Please sign in to comment.