diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ce30f6de27140fd52b43d30d304a6c1b2eea326c..2bc90846b36997a320d4e09acc76ae6c2261ce9c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -13,16 +13,16 @@ repositories { } dependencies { - implementation(Plugins.Android.implementation) - implementation(Plugins.Shadow.implementation) // NOTE(radchenko): generates jar for server builds - implementation(Plugins.Kotlin.implementation) - implementation(Plugins.Kotlin.implementation) - implementation(Plugins.Ktor.implementation) - implementation(Plugins.ApacheCompress.implementation) // NOTE(radchenko): needs for `ktor` to `docker` - implementation(Plugins.MultiplatformCompose.implementation) - implementation(Plugins.Libres.implementation) - implementation(Plugins.BuildConfig.implementation) - implementation(Plugins.Serialization.implementation) + implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) + implementation(libs.plugin.android) + implementation(libs.plugin.shadow) // NOTE(radchenko): generates jar for server builds + implementation(libs.plugin.kotlin) + implementation(libs.plugin.ktor) + implementation(libs.plugin.apacheCompress) // NOTE(radchenko): needs for `ktor` to `docker` + implementation(libs.plugin.multiplatformCompose) + implementation(libs.plugin.libres) + implementation(libs.plugin.buildConfig) + implementation(libs.plugin.serialization) } val rootDirProject = file("../") diff --git a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index aa24940adfccd8978697c34649728e116c4e7933..0000000000000000000000000000000000000000 --- a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,125 +0,0 @@ -object Dependencies { - - object Versions { - const val activityKtx = "1.7.2" - const val kotlin = "1.8.20" - const val agp = "7.4.2" - const val compose = "1.4.0" - const val androidxAppCompat = "1.6.1" - const val androidxActivityCompose = "1.7.2" - const val composeUiTooling = "1.4.3" - const val libres = "1.1.8" - const val composeImageLoader = "1.3.1" - const val napier = "2.6.1" - const val buildConfig = "3.1.0" - const val kotlinxCoroutines = "1.7.1" - const val ktor = "2.3.1" - const val composeIcons = "1.1.0" - const val kotlinxSerialization = "1.5.1" - const val kotlinxDatetime = "0.4.0" - const val googleAuth = "20.5.0" - const val decompose = "2.0.0-compose-experimental-beta-01" - const val mviKotlin = "3.2.1" - const val koin = "3.4.0" - const val essenty = "1.1.0" - const val logback = "1.2.11" - const val shadow = "7.1.2" - } - - object Ktor { - const val ktorVersion = "2.3.1" - - object Client { - const val Core = - "io.ktor:ktor-client-core:$ktorVersion" - const val CommonLogging = - "io.ktor:ktor-client-logging:$ktorVersion" - const val CIO = "io.ktor:ktor-client-cio:$ktorVersion" - const val Android = "io.ktor:ktor-client-android:${Versions.ktor}" - const val Darwin = "io.ktor:ktor-client-darwin:${Versions.ktor}" - } - - object Server { - const val Netty = "io.ktor:ktor-server-netty-jvm:$ktorVersion" - const val Logback = "ch.qos.logback:logback-classic:1.2.11" - } - } - - - object Google { - private const val VERSION = "20.4.0" - const val SignIn = "com.google.android.gms:play-services-auth:$VERSION" - const val ApiClient = "com.google.api-client:google-api-client:2.1.1" - } - - - object AndroidX { - const val activityKtx = "androidx.activity:activity-ktx:${Versions.activityKtx}" - const val appCompat = "androidx.appcompat:appcompat:${Versions.androidxAppCompat}" - const val activityCompose = - "androidx.activity:activity-compose:${Versions.androidxActivityCompose}" - } - - object Compose { - const val uiTooling = "androidx.compose.ui:ui-tooling:${Versions.composeUiTooling}" - } - - object Libres { - const val libresCompose = "io.github.skeptick.libres:libres-compose:${Versions.libres}" - } - - object ImageLoader { - const val imageLoader = "io.github.qdsfdhvh:image-loader:${Versions.composeImageLoader}" - } - - object Napier { - const val napier = "io.github.aakira:napier:${Versions.napier}" - } - - object KotlinxCoroutines { - const val core = - "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinxCoroutines}" - const val android = - "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.kotlinxCoroutines}" - } - - object ComposeIcons { - const val featherIcons = "br.com.devsrsouza.compose.icons:feather:${Versions.composeIcons}" - } - - object KotlinxSerialization { - const val json = - "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}" - } - - object KotlinxDatetime { - const val kotlinxDatetime = - "org.jetbrains.kotlinx:kotlinx-datetime:${Versions.kotlinxDatetime}" - } - - object GoogleAuth { - const val googleAuth = "com.google.android.gms:play-services-auth:${Versions.googleAuth}" - } - - object Decompose { - const val decompose = "com.arkivanov.decompose:decompose:${Versions.decompose}" - const val extensions = - "com.arkivanov.decompose:extensions-compose-jetbrains:${Versions.decompose}" - } - - object MviKotlin { - const val mviKotlin = "com.arkivanov.mvikotlin:mvikotlin:${Versions.mviKotlin}" - const val mviKotlinMain = "com.arkivanov.mvikotlin:mvikotlin-main:${Versions.mviKotlin}" - const val mviKotlinExtensionsCoroutines = - "com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines:${Versions.mviKotlin}" - } - - object Koin { - const val core = "io.insert-koin:koin-core:${Versions.koin}" - const val android = "io.insert-koin:koin-android:${Versions.koin}" - } - - object Essenty { - const val essenty = "com.arkivanov.essenty:lifecycle:${Versions.essenty}" - } -} \ No newline at end of file diff --git a/buildSrc/buildSrc/src/main/kotlin/Plugins.kt b/buildSrc/buildSrc/src/main/kotlin/Plugins.kt deleted file mode 100644 index a01f2dce92b5708af8db1ce0c2b01285df552f74..0000000000000000000000000000000000000000 --- a/buildSrc/buildSrc/src/main/kotlin/Plugins.kt +++ /dev/null @@ -1,58 +0,0 @@ -/*** - * Object for declaration of project plugins. - * Declaration rules: - * - implementation - declare gradle plugin string with version - * - plugin - declare short string to use in some `build.gradle` file - */ -object Plugins { - - object Android { - const val implementation = "com.android.tools.build:gradle:7.3.1" - const val plugin = "com.android.application" - } - - object Shadow { - const val implementation = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2" - const val plugin = "com.github.johnrengelman.shadow" - } - - object Kotlin { - const val implementation = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" - const val plugin = "org.jetbrains.kotlin.multiplatform" - } - - object Ktor { - const val implementation = "io.ktor.plugin:plugin:2.3.1" - const val plugin = "io.ktor.plugin" - } - - object ApacheCompress { - const val implementation = "org.apache.commons:commons-compress:1.21" - } - - object MultiplatformCompose { - const val implementation = "org.jetbrains.compose:compose-gradle-plugin:1.4.0" - const val plugin = "org.jetbrains.compose" - } - - object CocoaPods { - const val plugin = "org.jetbrains.kotlin.native.cocoapods" - } - object Libres { - const val implementation = "io.github.skeptick.libres:gradle-plugin:1.1.8" - const val plugin = "io.github.skeptick.libres" - } - - object BuildConfig { - const val implementation = "com.github.gmazzo.buildconfig:plugin:4.0.4" - const val plugin = "com.github.gmazzo.buildconfig" - } - - object Serialization { - const val implementation = "org.jetbrains.kotlin:kotlin-serialization:1.8.20" - const val plugin = "org.jetbrains.kotlin.plugin.serialization" - } - object Parcelize { - const val plugin = "org.jetbrains.kotlin.plugin.parcelize" - } -} \ No newline at end of file diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..fa8bc749264fccda7b3cf1682d6ba4ed994b4efa --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/kotlin-server-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-server-conventions.gradle.kts index a5678d5e15b5eafc07782515683cc66755422057..1fbe804bc5d1f22345deb3d05e656682b1a3b248 100644 --- a/buildSrc/src/main/kotlin/kotlin-server-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-server-conventions.gradle.kts @@ -1,11 +1,14 @@ +import org.gradle.accessors.dm.LibrariesForLibs + plugins { id("kotlin-common-conventions") id("com.github.johnrengelman.shadow") application } +val libs = the() dependencies { - implementation(Dependencies.Ktor.Server.Logback) - implementation(Dependencies.Ktor.Server.Netty) + implementation(libs.ktor.server.logback) + implementation(libs.ktor.server.netty) implementation(project(":common")) } \ No newline at end of file diff --git a/cloud-server/build.gradle.kts b/cloud-server/build.gradle.kts index 35f48c6367cbcd9a56e98a8e9aaea1fb71893b60..f026f5d067e25176238ded4e611dcf5a4f7f3c98 100644 --- a/cloud-server/build.gradle.kts +++ b/cloud-server/build.gradle.kts @@ -1,6 +1,7 @@ +@Suppress("DSL_SCOPE_VIOLATION") plugins { id("kotlin-server-conventions") - id(Plugins.Ktor.plugin) + id(libs.plugins.ktor.get().pluginId) } application { @@ -8,10 +9,10 @@ application { } dependencies { - implementation(Dependencies.Ktor.Client.Core) - implementation(Dependencies.Ktor.Client.CIO) - implementation(Dependencies.Ktor.Client.CommonLogging) - implementation(Dependencies.Google.ApiClient) + implementation(libs.ktor.client.core) + implementation(libs.ktor.client.cio) + implementation(libs.ktor.client.commonLogging) + implementation(libs.google.appClient) } ktor { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 02302d114477dbf96937f9f8be04a7dde40b7001..a0d043229bf3fa122c12fbc9daca323cdfb0aada 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -6,5 +6,5 @@ group = "band.effective.office.common" version = "unspecified" dependencies { - implementation(Dependencies.Ktor.Server.Netty) + implementation(libs.ktor.server.netty) } \ No newline at end of file diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 648cbf9423b5f41958636eb1b2b64102ca2f8dbf..f635a8429bab7ef90e055bb00071839e64b0b6b7 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -1,12 +1,13 @@ +@Suppress("DSL_SCOPE_VIOLATION") plugins { - id(Plugins.Kotlin.plugin) - id(Plugins.MultiplatformCompose.plugin) - id(Plugins.CocoaPods.plugin) - id(Plugins.Android.plugin) - id(Plugins.Libres.plugin) - id(Plugins.BuildConfig.plugin) - id(Plugins.Serialization.plugin) - id(Plugins.Parcelize.plugin) + id(libs.plugins.kotlin.get().pluginId) + id(libs.plugins.multiplatformCompose.get().pluginId) + id(libs.plugins.cocoaPods.get().pluginId) + id(libs.plugins.android.get().pluginId) + id(libs.plugins.libres.get().pluginId) + id(libs.plugins.buildConfig.get().pluginId) + id(libs.plugins.serialization.get().pluginId) + id(libs.plugins.parcelize.get().pluginId) } kotlin { @@ -32,8 +33,7 @@ kotlin { baseName = "ComposeApp" isStatic = true - export(Dependencies.Decompose.decompose) - export(Dependencies.Essenty.essenty) + export(libs.bundles.decompose) } pod("GoogleSignIn") {} } @@ -44,29 +44,26 @@ kotlin { implementation(compose.runtime) implementation(compose.foundation) implementation(compose.material) - implementation(Dependencies.Libres.libresCompose) - implementation(Dependencies.ImageLoader.imageLoader) - implementation(Dependencies.Napier.napier) - implementation(Dependencies.KotlinxCoroutines.core) - api(Dependencies.Ktor.Client.Core) - api(Dependencies.Ktor.Client.CommonLogging) - implementation(Dependencies.ComposeIcons.featherIcons) - implementation(Dependencies.KotlinxSerialization.json) - implementation(Dependencies.KotlinxDatetime.kotlinxDatetime) + implementation(libs.libres.libresCompose) + implementation(libs.imageLoader) + implementation(libs.napier) + implementation(libs.kotlinx.coroutines.core) + api(libs.ktor.client.core) + api(libs.ktor.client.commonLogging) + implementation(libs.compose.icons.featherIcons) + implementation(libs.kotlinx.serialization.json) + implementation(libs.kotlinx.datetime) // MVI Kotlin - api(Dependencies.MviKotlin.mviKotlin) - api(Dependencies.MviKotlin.mviKotlinMain) - api(Dependencies.MviKotlin.mviKotlinExtensionsCoroutines) + api(libs.bundles.mviKotlin) // Decompose - api(Dependencies.Decompose.decompose) - api(Dependencies.Decompose.extensions) + api(libs.bundles.decompose) // Koin - api(Dependencies.Koin.core) + api(libs.koin.core) - api(Dependencies.Essenty.essenty) + api(libs.essenty.core) } } @@ -78,18 +75,16 @@ kotlin { val androidMain by getting { dependencies { - implementation(Dependencies.AndroidX.appCompat) - implementation(Dependencies.AndroidX.activityCompose) - implementation(Dependencies.Compose.uiTooling) - implementation(Dependencies.KotlinxCoroutines.android) - api(Dependencies.Ktor.Client.Android) - implementation(Dependencies.Google.SignIn) - implementation(Dependencies.AndroidX.activityKtx) + //android + implementation(libs.bundles.android.core) + implementation(libs.google.signin) // Koin - api(Dependencies.Koin.android) + api(libs.koin.android) - api(Dependencies.Ktor.Server.Logback) + //ktor + api(libs.ktor.client.android) + api(libs.ktor.server.logback) } } @@ -102,7 +97,7 @@ kotlin { iosArm64Main.dependsOn(this) iosSimulatorArm64Main.dependsOn(this) dependencies { - implementation(Dependencies.Ktor.Client.Darwin) + implementation(libs.ktor.client.drawin) implementation(files("iosApp/GoogleAuthorization/GoogleAuthorization/Sources")) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000000000000000000000000000000000..7f8d56d2e9c8fb7bf44f34ee919594005cd10910 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,121 @@ +[versions] +retrofit-ver = "2.9.0" +tv-ver="1.0.0-alpha04" +moshi-ver="1.14.0" +hilt-var = "2.44" +hilt-nav-var = "1.0.0" +okhttp3-var = "4.10.0" +retrofit-moshi = "2.9.0" +coil-ver = "2.2.2" +zxing-ver = "3.5.1" +nav-ver = "2.5.3" +notion-ver = "1.8.0" +coil-svg-ver = "2.3.0" +activity-ktx = "1.7.2" +kotlin = "1.8.20" +agp = "7.4.2" +compose-multiplatform = "1.4.0" +composeAndroid = "1.4.6" +androidx-appCompat = "1.6.1" +androidx-activityCompose = "1.7.2" +compose-ui-tooling = "1.4.3" +libres = "1.1.8" +compose-imageLoader = "1.3.1" +napier = "2.6.1" +build-config = "3.1.0" +kotlinx-coroutines = "1.7.1" +ktor = "2.3.1" +compose-icons = "1.1.0" +kotlinx-serialization = "1.5.1" +kotlinx-datetime = "0.4.0" +google-auth = "20.5.0" +decompose = "2.0.0-compose-experimental-beta-01" +mviKotlin = "3.2.1" +koin = "3.4.0" +essenty = "1.1.0" +logback = "1.2.11" +shadow = "7.1.2" +gms = "20.4.0" + +[libraries] +retrofit = {module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit-ver"} +moshi = {module = "com.squareup.moshi:moshi", version.ref = "moshi-ver"} +moshi-adapter = {module = "com.squareup.moshi:moshi-adapters", version.ref = "moshi-ver"} +tv = {module = "androidx.tv:tv-foundation", version.ref = "tv-ver"} +tvMaterial = {module = "androidx.tv:tv-material", version.ref = "tv-ver"} +hilt = {module = "com.google.dagger:hilt-android", version.ref = "hilt-var"} +hilt-nav = {module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt-nav-var"} +hilt-compiller = {module = "com.google.dagger:hilt-compiler", version.ref = "hilt-var"} +okhttp3 = {module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3-var"} +okhttp3-logging = {module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3-var"} +retrofit-moshi = {module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit-moshi"} +moshi-gen = {module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi-ver"} +coil = {module = "io.coil-kt:coil-compose", version.ref = "coil-ver"} +zxing = {module = "com.google.zxing:core", version.ref = "zxing-ver"} +navigation = {module = "androidx.navigation:navigation-compose", version.ref = "nav-ver"} +notion = {module = "com.github.seratch:notion-sdk-jvm-core", version.ref = "notion-ver"} +coil-svg = {module = "io.coil-kt:coil-svg", version.ref = "coil-svg-ver"} +ktor-client-core = {module = "io.ktor:ktor-client-core", version.ref = "ktor"} +ktor-client-commonLogging = {module = "io.ktor:ktor-client-logging", version.ref = "ktor"} +ktor-client-cio = {module = "io.ktor:ktor-client-cio", version.ref = "ktor"} +ktor-client-android = {module = "io.ktor:ktor-client-android", version.ref="ktor"} +ktor-client-drawin = {module = "io.ktor:ktor-client-darwin", version.ref="ktor"} +ktor-server-netty = {module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor"} +ktor-server-logback = {module = "ch.qos.logback:logback-classic", version = "1.2.11"} +androdx-activityKtx = {module = "androidx.activity:activity-ktx", version.ref = "activity-ktx"} +androdx-appCompat = {module = "androidx.appcompat:appcompat", version.ref = "androidx-appCompat"} +androidx-activityCompose = {module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose"} +compose-uiTooling = {module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui-tooling"} +compose-material = {module = "androidx.compose.material:material", version.ref = "compose-multiplatform"} +google-signin = {module = "com.google.android.gms:play-services-auth", version.ref = "gms"} +google-appClient = {module = "com.google.api-client:google-api-client", version = "2.1.1" } +libres-libresCompose = {module = "io.github.skeptick.libres:libres-compose", version.ref = "libres"} +imageLoader = {module = "io.github.qdsfdhvh:image-loader", version.ref = "compose-imageLoader"} +napier = {module = "io.github.aakira:napier", version.ref = "napier"} +kotlinx-coroutines-core = {module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines"} +kotlinx-coroutines-android = {module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines"} +compose-icons-featherIcons = {module = "br.com.devsrsouza.compose.icons:feather", version.ref = "compose-icons"} +kotlinx-serialization-json = {module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization"} +kotlinx-datetime = {module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime"} +google-auth = {module = "com.google.android.gms:play-services-auth", version.ref = "google-auth"} +decompose-decompose = {module = "com.arkivanov.decompose:decompose", version.ref = "decompose"} +decompose-extensions = {module = "com.arkivanov.decompose:extensions-compose-jetbrains", version.ref = "decompose"} +mviKotlin-core = {module = "com.arkivanov.mvikotlin:mvikotlin", version.ref = "mviKotlin"} +mviKotlin-mviKotlinMain = {module = "com.arkivanov.mvikotlin:mvikotlin-main", version.ref = "mviKotlin"} +mviKotlin-mviKotlinExtensionsCoroutines = {module = "com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines", version.ref = "mviKotlin"} +koin-core = {module = "io.insert-koin:koin-core", version.ref = "koin"} +koin-android = {module = "io.insert-koin:koin-android", version.ref = "koin"} +essenty-core = {module = "com.arkivanov.essenty:lifecycle", version.ref = "essenty"} +plugin-ktor = {module = "io.ktor.plugin:plugin", version.ref = "ktor"} +plugin-apacheCompress = {module = "org.apache.commons:commons-compress", version = "1.21"} +plugin-multiplatformCompose = {module = "org.jetbrains.compose:compose-gradle-plugin", version = "1.4.0"} +plugin-libres = {module = "io.github.skeptick.libres:gradle-plugin", version = "1.1.8"} +plugin-buildConfig = {module = "com.github.gmazzo.buildconfig:plugin", version = "4.0.4"} +plugin-serialization = {module = "org.jetbrains.kotlin:kotlin-serialization", version = "1.8.20"} +plugin-android = {module = "com.android.tools.build:gradle", version = "7.3.1"} +plugin-shadow = {module = "gradle.plugin.com.github.johnrengelman:shadow", version = "7.1.2"} +plugin-kotlin = {module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin"} + + + +[plugins] +kapt = {id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin"} +hilt = {id = "com.google.dagger.hilt.android", version.ref = "hilt-var"} +ktor = {id = "io.ktor.plugin", version.ref = "ktor"} +multiplatformCompose = {id = "org.jetbrains.compose"} +cocoaPods = {id = "org.jetbrains.kotlin.native.cocoapods"} +libres = {id = "io.github.skeptick.libres"} +buildConfig = {id = "com.github.gmazzo.buildconfig"} +serialization = {id = "org.jetbrains.kotlin.plugin.serialization"} +parcelize = {id = "org.jetbrains.kotlin.plugin.parcelize"} +android = {id = "com.android.application"} +shadow = {id = "com.github.johnrengelman.shadow"} +kotlin = {id = "org.jetbrains.kotlin.multiplatform"} + +[bundles] +android-core = ["androdx-appCompat", "androidx-activityCompose", "compose-uiTooling", "androdx-activityKtx", "compose-material", "kotlinx-coroutines-android"] +android-tv = ["tv", "tvMaterial"] +retrofit-core = ["retrofit", "okhttp3", "okhttp3-logging"] +moshi-core = ["moshi", "moshi-adapter"] +mviKotlin = ["mviKotlin-core", "mviKotlin-mviKotlinMain", "mviKotlin-mviKotlinExtensionsCoroutines"] +decompose = ["decompose-decompose", "decompose-extensions"] \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index a9a8dd76e91b5a8efcf49f47d4d080c52b0ed91c..4f3d1b12a65e6c849fffa15379cfa184f0afef2f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ - rootProject.name = "effective-office" include("cloud-server", "rpi-server", "gpio") include("common") include("composeApp") +include("tv-app") diff --git a/tv-app/effecticeTV/app/.gitignore b/tv-app/.gitignore similarity index 100% rename from tv-app/effecticeTV/app/.gitignore rename to tv-app/.gitignore diff --git a/tv-app/effecticeTV/README.md b/tv-app/README.md similarity index 100% rename from tv-app/effecticeTV/README.md rename to tv-app/README.md diff --git a/tv-app/build.gradle.kts b/tv-app/build.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..728784e02523ee6ab717135f781dcbb2822fc850 --- /dev/null +++ b/tv-app/build.gradle.kts @@ -0,0 +1,112 @@ +import java.util.Properties +import java.io.FileInputStream + +@Suppress("DSL_SCOPE_VIOLATION") +plugins { + id(libs.plugins.android.get().pluginId) + kotlin("android") + kotlin("kapt") + alias(libs.plugins.hilt) +} + +val localProperties = Properties() +localProperties.load(FileInputStream(rootProject.file("local.properties"))) + +android { + namespace = "band.effective.office.tv" + compileSdk = 33 + + defaultConfig { + applicationId = "band.effective.office.tv" + minSdk = 24 + targetSdk = 33 + + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + + buildConfigField ("String", "apiLeaderUrl", localProperties["apiLeaderUrl"].toString()) + buildConfigField ("String", "apiMattermostUrl", localProperties["apiMattermostUrl"].toString()) + buildConfigField ("String", "mattermostBotToken", localProperties["mattermostBotToken"].toString()) + buildConfigField ("String", "apiSynologyUrl", localProperties["synologyIP"].toString()) + buildConfigField ("String", "synologyLogin", localProperties["synologyLogin"].toString()) + buildConfigField ("String", "synologyPassword", localProperties["synologyPassword"].toString()) + buildConfigField ("String", "folderPathPhotoSynology", localProperties["folderPathPhotoSynology"].toString()) + buildConfigField ("String", "uselessFactsApi", localProperties["uselessFactsApi"].toString()) + buildConfigField ("String", "mattermostBotDirectId", localProperties["mattermostBotDirectId"].toString()) + buildConfigField ("String", "duolingoUrl", localProperties["duolingoUrl"].toString()) + buildConfigField("String", "notionToken", localProperties["NOTION_TOKEN"].toString()) + buildConfigField("String", "notionDatabaseId", localProperties["NOTION_DATABASE_ID"].toString()) + } + + buildTypes { + getByName("release") { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = libs.versions.composeAndroid.get() + } + packagingOptions { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation(libs.bundles.android.core) + + //for tv + implementation(libs.bundles.android.tv) + + //Retrofit + implementation(libs.bundles.retrofit.core) + implementation(libs.retrofit.moshi) + + // moshi + implementation(libs.bundles.moshi.core) + kapt(libs.moshi.gen) + + //hilt di + implementation(libs.hilt) + implementation(libs.hilt.nav) + kapt(libs.hilt.compiller) + + //qr + implementation(libs.zxing) + + //navigation + implementation(libs.navigation) + + //coil + implementation(libs.coil) + + //notion + implementation(libs.notion) +} +kapt { + correctErrorTypes = true +} + diff --git a/tv-app/effecticeTV/.gitignore b/tv-app/effecticeTV/.gitignore deleted file mode 100644 index aa724b77071afcbd9bb398053e05adaf7ac9405a..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx -local.properties diff --git a/tv-app/effecticeTV/app/build.gradle b/tv-app/effecticeTV/app/build.gradle deleted file mode 100644 index 5403981aa386513af503fa9eed33c65149b1d793..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/app/build.gradle +++ /dev/null @@ -1,116 +0,0 @@ -plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' - alias libs.plugins.kotlin.kapt - alias libs.plugins.hilt.plug -} -def localProperties = new Properties() -localProperties.load(new FileInputStream(rootProject.file("local.properties"))) - -android { - namespace 'band.effective.office.tv' - compileSdk 33 - - defaultConfig { - applicationId "band.effective.office.tv" - minSdk 24 - targetSdk 33 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables { - useSupportLibrary true - } - - buildConfigField ("String", "apiLeaderUrl", localProperties['apiLeaderUrl']) - buildConfigField ("String", "apiMattermostUrl", localProperties['apiMattermostUrl']) - buildConfigField ("String", "mattermostBotToken", localProperties['mattermostBotToken']) - buildConfigField ("String", "apiSynologyUrl", localProperties['synologyIP']) - buildConfigField ("String", "synologyLogin", localProperties['synologyLogin']) - buildConfigField ("String", "synologyPassword", localProperties['synologyPassword']) - buildConfigField ("String", "folderPathPhotoSynology", localProperties['folderPathPhotoSynology']) - buildConfigField ("String", "uselessFactsApi", localProperties['uselessFactsApi']) - buildConfigField ("String", "mattermostBotDirectId", localProperties['mattermostBotDirectId']) - buildConfigField ("String", "duolingoUrl", localProperties['duolingoUrl']) - buildConfigField("String", "notionToken", localProperties['NOTION_TOKEN']) - buildConfigField("String", "notionDatabaseId", localProperties['NOTION_DATABASE_ID']) - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion '1.4.0' - } - packagingOptions { - resources { - excludes += '/META-INF/{AL2.0,LGPL2.1}' - } - } -} - -dependencies { - - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' - implementation 'androidx.activity:activity-compose:1.3.1' - implementation "androidx.compose.ui:ui:$compose_ui_version" - implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" - implementation 'androidx.compose.material:material:1.3.1' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version" - debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version" - debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version" - - //for tv - implementation libs.tv - implementation libs.tvMaterial - - //Retrofit - implementation libs.retrofit - implementation libs.okhttp3 - implementation libs.okhttp3.logging - implementation libs.retrofit.moshi - - // moshi - implementation libs.moshi - implementation libs.moshi.adapter - kapt libs.moshi.gen - - //hilt di - implementation libs.hilt - implementation libs.hilt.nav - kapt libs.hitl.compiller - - //qr - implementation libs.zxing - - //navigation - implementation libs.navigation - - //coil - implementation libs.coil - - //notion - implementation libs.notion -} -kapt { - correctErrorTypes true -} diff --git a/tv-app/effecticeTV/app/proguard-rules.pro b/tv-app/effecticeTV/app/proguard-rules.pro deleted file mode 100644 index 481bb434814107eb79d7a30b676d344b0df2f8ce..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/tv-app/effecticeTV/app/tvconfig.gradle b/tv-app/effecticeTV/app/tvconfig.gradle deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tv-app/effecticeTV/build.gradle b/tv-app/effecticeTV/build.gradle deleted file mode 100644 index 0410023a0dda6ec562cc76fdcefd7bf6bdfa7f51..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -buildscript { - ext { - compose_ui_version = '1.3.3' - } -}// Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false - id 'org.jetbrains.kotlin.android' version '1.8.0' apply false - alias libs.plugins.kotlin.kapt apply false - alias libs.plugins.hilt.plug apply false -} \ No newline at end of file diff --git a/tv-app/effecticeTV/gradle.properties b/tv-app/effecticeTV/gradle.properties deleted file mode 100644 index 1a982b5de8af33888507970248111958ca4c0b2f..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/gradle.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file diff --git a/tv-app/effecticeTV/gradle/libs.versions.toml b/tv-app/effecticeTV/gradle/libs.versions.toml deleted file mode 100644 index 28469f732690a0f086458a42e84e3cde9029b899..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/gradle/libs.versions.toml +++ /dev/null @@ -1,37 +0,0 @@ -[versions] -retrofit-ver = "2.9.0" -tv-ver="1.0.0-alpha04" -moshi-ver="1.14.0" -hilt-var = "2.44" -hilt-nav-var = "1.0.0" -kotlin = "1.8.0" -okhttp3-var = "4.10.0" -retrofit-moshi = "2.9.0" -coil-ver = "2.2.2" -zxing-ver = "3.5.1" -nav-ver = "2.5.3" -notion-ver = "1.8.0" -coil-svg-ver = "2.3.0" - -[libraries] -retrofit = {module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit-ver"} -moshi = {module = "com.squareup.moshi:moshi", version.ref = "moshi-ver"} -moshi-adapter = {module = "com.squareup.moshi:moshi-adapters", version.ref = "moshi-ver"} -tv = {module = "androidx.tv:tv-foundation", version.ref = "tv-ver"} -tvMaterial = {module = "androidx.tv:tv-material", version.ref = "tv-ver"} -hilt = {module = "com.google.dagger:hilt-android", version.ref = "hilt-var"} -hilt-nav = {module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt-nav-var"} -hitl-compiller = {module = "com.google.dagger:hilt-compiler", version.ref = "hilt-var"} -okhttp3 = {module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3-var"} -okhttp3-logging = {module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3-var"} -retrofit-moshi = {module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit-moshi"} -moshi-gen = {module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi-ver"} -coil = {module = "io.coil-kt:coil-compose", version.ref = "coil-ver"} -zxing = {module = "com.google.zxing:core", version.ref = "zxing-ver"} -navigation = {module = "androidx.navigation:navigation-compose", version.ref = "nav-ver"} -notion = {module = "com.github.seratch:notion-sdk-jvm-core", version.ref = "notion-ver"} -coil-svg = {module = "io.coil-kt:coil-svg", version.ref = "coil-svg-ver"} - -[plugins] -kotlin-kapt = {id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin"} -hilt-plug = {id = "com.google.dagger.hilt.android", version.ref = "hilt-var"} diff --git a/tv-app/effecticeTV/gradle/wrapper/gradle-wrapper.jar b/tv-app/effecticeTV/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..0000000000000000000000000000000000000000 Binary files a/tv-app/effecticeTV/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/tv-app/effecticeTV/gradle/wrapper/gradle-wrapper.properties b/tv-app/effecticeTV/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index b4d7a7f578f652d1593928d7241f539530864dd3..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Mar 07 19:37:19 OMST 2023 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/tv-app/effecticeTV/gradlew b/tv-app/effecticeTV/gradlew deleted file mode 100755 index 4f906e0c811fc9e230eb44819f509cd0627f2600..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/tv-app/effecticeTV/gradlew.bat b/tv-app/effecticeTV/gradlew.bat deleted file mode 100644 index 107acd32c4e687021ef32db511e8a206129b88ec..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/tv-app/effecticeTV/settings.gradle b/tv-app/effecticeTV/settings.gradle deleted file mode 100644 index a5705a9804ece6c890b49e8655ed2788c471e2e9..0000000000000000000000000000000000000000 --- a/tv-app/effecticeTV/settings.gradle +++ /dev/null @@ -1,16 +0,0 @@ -pluginManagement { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} -rootProject.name = "effectice TV" -include ':app' diff --git a/tv-app/effecticeTV/app/src/androidTest/java/band/effective/office/tv/ExampleInstrumentedTest.kt b/tv-app/src/androidTest/java/band/effective/office/tv/ExampleInstrumentedTest.kt similarity index 100% rename from tv-app/effecticeTV/app/src/androidTest/java/band/effective/office/tv/ExampleInstrumentedTest.kt rename to tv-app/src/androidTest/java/band/effective/office/tv/ExampleInstrumentedTest.kt diff --git a/tv-app/effecticeTV/app/src/main/AndroidManifest.xml b/tv-app/src/main/AndroidManifest.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/AndroidManifest.xml rename to tv-app/src/main/AndroidManifest.xml diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/EffectiveTvApp.kt b/tv-app/src/main/java/band/effective/office/tv/EffectiveTvApp.kt similarity index 77% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/EffectiveTvApp.kt rename to tv-app/src/main/java/band/effective/office/tv/EffectiveTvApp.kt index 9859f68c328b88740ae0ed5c3e081cb9afa7ebf6..806c2278ee9c00ec4fc0f01cb2e5f65caf51d524 100644 --- a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/EffectiveTvApp.kt +++ b/tv-app/src/main/java/band/effective/office/tv/EffectiveTvApp.kt @@ -4,4 +4,4 @@ import android.app.Application import dagger.hilt.android.HiltAndroidApp @HiltAndroidApp -class EffectiveTvApp: Application(){} \ No newline at end of file +class EffectiveTvApp: Application() \ No newline at end of file diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/MainActivity.kt b/tv-app/src/main/java/band/effective/office/tv/MainActivity.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/MainActivity.kt rename to tv-app/src/main/java/band/effective/office/tv/MainActivity.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/Either.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/Either.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/Either.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/Either.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherDuolingoAdapterFactory.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/EitherDuolingoAdapterFactory.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherDuolingoAdapterFactory.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/EitherDuolingoAdapterFactory.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherLeaderIdAdapterFactory.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/EitherLeaderIdAdapterFactory.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherLeaderIdAdapterFactory.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/EitherLeaderIdAdapterFactory.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherMattermostAdapterFactory.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/EitherMattermostAdapterFactory.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherMattermostAdapterFactory.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/EitherMattermostAdapterFactory.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherSynologyAdapterFactory.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/EitherSynologyAdapterFactory.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/EitherSynologyAdapterFactory.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/EitherSynologyAdapterFactory.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/ErrorReason.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/ErrorReason.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/ErrorReason.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/ErrorReason.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/UnsafeOkhttpClient.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/UnsafeOkhttpClient.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/UnsafeOkhttpClient.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/UnsafeOkhttpClient.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/entity/Either.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/entity/Either.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/entity/Either.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/entity/Either.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/entity/ErrorReason.kt b/tv-app/src/main/java/band/effective/office/tv/core/network/entity/ErrorReason.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/network/entity/ErrorReason.kt rename to tv-app/src/main/java/band/effective/office/tv/core/network/entity/ErrorReason.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/ScreenWithControlsTemplate.kt b/tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/ScreenWithControlsTemplate.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/ScreenWithControlsTemplate.kt rename to tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/ScreenWithControlsTemplate.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/SliderProperties.kt b/tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/SliderProperties.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/SliderProperties.kt rename to tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/SliderProperties.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/TimerSlideShow.kt b/tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/TimerSlideShow.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/TimerSlideShow.kt rename to tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/TimerSlideShow.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/ButtonControls.kt b/tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/ButtonControls.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/ButtonControls.kt rename to tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/ButtonControls.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/SlideShowPhotoControl.kt b/tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/SlideShowPhotoControl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/SlideShowPhotoControl.kt rename to tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/components/SlideShowPhotoControl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuButton.kt b/tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuButton.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuButton.kt rename to tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuButton.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuState.kt b/tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuState.kt rename to tv-app/src/main/java/band/effective/office/tv/core/ui/screen_with_controls/model/MenuState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/DomainModule.kt b/tv-app/src/main/java/band/effective/office/tv/di/DomainModule.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/DomainModule.kt rename to tv-app/src/main/java/band/effective/office/tv/di/DomainModule.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/EmployeeInfoModule.kt b/tv-app/src/main/java/band/effective/office/tv/di/EmployeeInfoModule.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/EmployeeInfoModule.kt rename to tv-app/src/main/java/band/effective/office/tv/di/EmployeeInfoModule.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/NetworkModule.kt b/tv-app/src/main/java/band/effective/office/tv/di/NetworkModule.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/NetworkModule.kt rename to tv-app/src/main/java/band/effective/office/tv/di/NetworkModule.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/view_models/AutoplayViewModule.kt b/tv-app/src/main/java/band/effective/office/tv/di/view_models/AutoplayViewModule.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/view_models/AutoplayViewModule.kt rename to tv-app/src/main/java/band/effective/office/tv/di/view_models/AutoplayViewModule.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/view_models/MessageViewModelModule.kt b/tv-app/src/main/java/band/effective/office/tv/di/view_models/MessageViewModelModule.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/view_models/MessageViewModelModule.kt rename to tv-app/src/main/java/band/effective/office/tv/di/view_models/MessageViewModelModule.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/view_models/PhotoViewModelModule.kt b/tv-app/src/main/java/band/effective/office/tv/di/view_models/PhotoViewModelModule.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/di/view_models/PhotoViewModelModule.kt rename to tv-app/src/main/java/band/effective/office/tv/di/view_models/PhotoViewModelModule.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayController.kt b/tv-app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayController.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayController.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayController.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayableViewModel.kt b/tv-app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayableViewModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayableViewModel.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/autoplay/AutoplayableViewModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/AutoplayState.kt b/tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/AutoplayState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/AutoplayState.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/AutoplayState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/NavigateRequests.kt b/tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/NavigateRequests.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/NavigateRequests.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/NavigateRequests.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenDescription.kt b/tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenDescription.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenDescription.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenDescription.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenState.kt b/tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenState.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/autoplay/model/ScreenState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/BotConfig.kt b/tv-app/src/main/java/band/effective/office/tv/domain/botLogic/BotConfig.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/BotConfig.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/botLogic/BotConfig.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/MessengerBot.kt b/tv-app/src/main/java/band/effective/office/tv/domain/botLogic/MessengerBot.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/MessengerBot.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/botLogic/MessengerBot.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/impl/MattermostBot.kt b/tv-app/src/main/java/band/effective/office/tv/domain/botLogic/impl/MattermostBot.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/impl/MattermostBot.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/botLogic/impl/MattermostBot.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotEvent.kt b/tv-app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotEvent.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotEvent.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotEvent.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotInfo.kt b/tv-app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotInfo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotInfo.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/botLogic/model/BotInfo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/model/converterToBotInfo.kt b/tv-app/src/main/java/band/effective/office/tv/domain/botLogic/model/converterToBotInfo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/botLogic/model/converterToBotInfo.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/botLogic/model/converterToBotInfo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/duolingo/DuolingoUser.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/duolingo/DuolingoUser.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/duolingo/DuolingoUser.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/duolingo/DuolingoUser.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/leaderId/ConverterToLeaderIdEventInfo.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/leaderId/ConverterToLeaderIdEventInfo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/leaderId/ConverterToLeaderIdEventInfo.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/leaderId/ConverterToLeaderIdEventInfo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/leaderId/LeaderIdEventInfo.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/leaderId/LeaderIdEventInfo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/leaderId/LeaderIdEventInfo.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/leaderId/LeaderIdEventInfo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/BotMessage.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/message/BotMessage.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/BotMessage.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/message/BotMessage.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/ConverterToBotMessage.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/message/ConverterToBotMessage.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/ConverterToBotMessage.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/message/ConverterToBotMessage.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/MessageQueue.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/message/MessageQueue.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/MessageQueue.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/message/MessageQueue.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/UpdatingQueue.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/message/UpdatingQueue.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/UpdatingQueue.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/message/UpdatingQueue.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/User.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/message/User.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/message/User.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/message/User.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/notion/EmployeeInfoEntity.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/notion/EmployeeInfoEntity.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/notion/EmployeeInfoEntity.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/notion/EmployeeInfoEntity.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/notion/EventInfo.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/notion/EventInfo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/notion/EventInfo.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/notion/EventInfo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/notion/EventType.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/notion/EventType.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/notion/EventType.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/notion/EventType.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/synology/PhotoDomain.kt b/tv-app/src/main/java/band/effective/office/tv/domain/model/synology/PhotoDomain.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/model/synology/PhotoDomain.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/model/synology/PhotoDomain.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/use_cases/AuthSynologyUseCase.kt b/tv-app/src/main/java/band/effective/office/tv/domain/use_cases/AuthSynologyUseCase.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/use_cases/AuthSynologyUseCase.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/use_cases/AuthSynologyUseCase.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/use_cases/EventStoryDataUseCase.kt b/tv-app/src/main/java/band/effective/office/tv/domain/use_cases/EventStoryDataUseCase.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/use_cases/EventStoryDataUseCase.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/use_cases/EventStoryDataUseCase.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/use_cases/PhotoSynologyUseCase.kt b/tv-app/src/main/java/band/effective/office/tv/domain/use_cases/PhotoSynologyUseCase.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/domain/use_cases/PhotoSynologyUseCase.kt rename to tv-app/src/main/java/band/effective/office/tv/domain/use_cases/PhotoSynologyUseCase.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/AuthInterceptor.kt b/tv-app/src/main/java/band/effective/office/tv/network/AuthInterceptor.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/AuthInterceptor.kt rename to tv-app/src/main/java/band/effective/office/tv/network/AuthInterceptor.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/ClientsAnnotation.kt b/tv-app/src/main/java/band/effective/office/tv/network/ClientsAnnotation.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/ClientsAnnotation.kt rename to tv-app/src/main/java/band/effective/office/tv/network/ClientsAnnotation.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/DuolingoApi.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/DuolingoApi.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/DuolingoApi.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/DuolingoApi.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/Course.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/Course.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/Course.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/Course.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/CurrentStreak.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/CurrentStreak.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/CurrentStreak.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/CurrentStreak.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/DuolingoResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/DuolingoResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/DuolingoResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/DuolingoResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/GlobalAmbassadorStatus.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/GlobalAmbassadorStatus.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/GlobalAmbassadorStatus.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/GlobalAmbassadorStatus.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/LiveOpsFeature.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/LiveOpsFeature.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/LiveOpsFeature.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/LiveOpsFeature.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/StreakData.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/StreakData.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/StreakData.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/StreakData.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/User.kt b/tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/User.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/duolingo/models/User.kt rename to tv-app/src/main/java/band/effective/office/tv/network/duolingo/models/User.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/LeaderApi.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/LeaderApi.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/LeaderApi.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/LeaderApi.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/AddressX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/AddressX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/AddressX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/AddressX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/HallX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/HallX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/HallX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/HallX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/SpaceX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/SpaceX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/SpaceX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/SpaceX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/StatX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/StatX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/StatX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/StatX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/ThemeX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/ThemeX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/ThemeX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/ThemeX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/TimezoneX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/TimezoneX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/TimezoneX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/TimezoneX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/TypeX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/TypeX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/TypeX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/TypeX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Error.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Error.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Error.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Error.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/ErrorNetworkResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/ErrorNetworkResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/ErrorNetworkResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/ErrorNetworkResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Errors.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Errors.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Errors.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/errorNetwork/Errors.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Data.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Data.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Data.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Data.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/EventInfoResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/EventInfoResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/EventInfoResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/EventInfoResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Organizer.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Organizer.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Organizer.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Organizer.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Similar.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Similar.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Similar.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Similar.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Speaker.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Speaker.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Speaker.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/Speaker.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/User.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/User.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/User.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/eventInfo/User.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/DataX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/DataX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/DataX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/DataX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Item.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Item.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Item.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Item.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/MetaX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/MetaX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/MetaX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/MetaX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsItem.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsItem.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsItem.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsItem.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ParticipantsX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXXX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXXX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXXX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/PhotoXXX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Photos.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Photos.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Photos.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/Photos.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SearchEventsResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SearchEventsResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SearchEventsResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SearchEventsResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SocialNetworkX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SocialNetworkX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SocialNetworkX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/SocialNetworkX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/StatXX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/StatXX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/StatXX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/StatXX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbXX.kt b/tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbXX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbXX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/leader/models/searchEvent/ThumbXX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/MattermostApi.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/MattermostApi.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/MattermostApi.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/MattermostApi.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/MattermostWebSocketClient.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/MattermostWebSocketClient.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/MattermostWebSocketClient.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/MattermostWebSocketClient.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/impl/MattermostWebSocketClientImpl.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/impl/MattermostWebSocketClientImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/impl/MattermostWebSocketClientImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/mattermostWebSocketClient/impl/MattermostWebSocketClientImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/AuthJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/AuthJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/AuthJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/AuthJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Broadcast.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Broadcast.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Broadcast.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Broadcast.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Data.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Data.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Data.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Data.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/DataX.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/DataX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/DataX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/DataX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/DataXX.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/DataXX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/DataXX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/DataXX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/DeleteResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/DeleteResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/DeleteResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/DeleteResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/GetPostsJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/GetPostsJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/GetPostsJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/GetPostsJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/GetUserJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/GetUserJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/GetUserJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/GetUserJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/MattermostErrorResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/MattermostErrorResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/MattermostErrorResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/MattermostErrorResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Metadata.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Metadata.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Metadata.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Metadata.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyProps.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyProps.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyProps.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyProps.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyPropsX.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyPropsX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyPropsX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/NotifyPropsX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/OtherJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/OtherJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/OtherJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/OtherJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Post.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Post.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Post.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Post.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PostJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PostJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PostJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PostJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageData.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageData.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageData.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageData.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PostMessageJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Props.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Props.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Props.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Props.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PropsX.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PropsX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/PropsX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/PropsX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Reaction.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Reaction.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Reaction.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Reaction.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/ReactionJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/ReactionJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/ReactionJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/ReactionJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Timezone.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Timezone.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/Timezone.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/Timezone.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/TimezoneX.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/TimezoneX.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/TimezoneX.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/TimezoneX.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/WebSocketAuthJson.kt b/tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/WebSocketAuthJson.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/mattermost/model/WebSocketAuthJson.kt rename to tv-app/src/main/java/band/effective/office/tv/network/mattermost/model/WebSocketAuthJson.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoDto.kt b/tv-app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoDto.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoDto.kt rename to tv-app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoDto.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSource.kt b/tv-app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSource.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSource.kt rename to tv-app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSource.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSourceImpl.kt b/tv-app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSourceImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSourceImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/network/notion/EmployeeInfoRemoteDataSourceImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/SynologyApi.kt b/tv-app/src/main/java/band/effective/office/tv/network/synology/SynologyApi.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/SynologyApi.kt rename to tv-app/src/main/java/band/effective/office/tv/network/synology/SynologyApi.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/AuthModel.kt b/tv-app/src/main/java/band/effective/office/tv/network/synology/models/AuthModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/AuthModel.kt rename to tv-app/src/main/java/band/effective/office/tv/network/synology/models/AuthModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/error/SynologyApiError.kt b/tv-app/src/main/java/band/effective/office/tv/network/synology/models/error/SynologyApiError.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/error/SynologyApiError.kt rename to tv-app/src/main/java/band/effective/office/tv/network/synology/models/error/SynologyApiError.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAlbumsResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAlbumsResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAlbumsResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAlbumsResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAuthResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAuthResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAuthResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyAuthResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyListResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyListResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyListResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyListResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyPhotoSAlbumsResponse.kt b/tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyPhotoSAlbumsResponse.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyPhotoSAlbumsResponse.kt rename to tv-app/src/main/java/band/effective/office/tv/network/synology/models/response/SynologyPhotoSAlbumsResponse.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/uselessFact/UselessFactApi.kt b/tv-app/src/main/java/band/effective/office/tv/network/uselessFact/UselessFactApi.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/uselessFact/UselessFactApi.kt rename to tv-app/src/main/java/band/effective/office/tv/network/uselessFact/UselessFactApi.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/uselessFact/model/FactDTO.kt b/tv-app/src/main/java/band/effective/office/tv/network/uselessFact/model/FactDTO.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/network/uselessFact/model/FactDTO.kt rename to tv-app/src/main/java/band/effective/office/tv/network/uselessFact/model/FactDTO.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/duolingo/DuolingoRepository.kt b/tv-app/src/main/java/band/effective/office/tv/repository/duolingo/DuolingoRepository.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/duolingo/DuolingoRepository.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/duolingo/DuolingoRepository.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/duolingo/impl/DuolingoRepositoryImpl.kt b/tv-app/src/main/java/band/effective/office/tv/repository/duolingo/impl/DuolingoRepositoryImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/duolingo/impl/DuolingoRepositoryImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/duolingo/impl/DuolingoRepositoryImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/leaderId/LeaderIdEventsInfoRepository.kt b/tv-app/src/main/java/band/effective/office/tv/repository/leaderId/LeaderIdEventsInfoRepository.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/leaderId/LeaderIdEventsInfoRepository.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/leaderId/LeaderIdEventsInfoRepository.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/leaderId/impl/LeaderIdEventsInfoRepositoryImpl.kt b/tv-app/src/main/java/band/effective/office/tv/repository/leaderId/impl/LeaderIdEventsInfoRepositoryImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/leaderId/impl/LeaderIdEventsInfoRepositoryImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/leaderId/impl/LeaderIdEventsInfoRepositoryImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/notion/EmployeeInfoRepository.kt b/tv-app/src/main/java/band/effective/office/tv/repository/notion/EmployeeInfoRepository.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/notion/EmployeeInfoRepository.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/notion/EmployeeInfoRepository.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/notion/impl/EmployeeInfoRepositoryImpl.kt b/tv-app/src/main/java/band/effective/office/tv/repository/notion/impl/EmployeeInfoRepositoryImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/notion/impl/EmployeeInfoRepositoryImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/notion/impl/EmployeeInfoRepositoryImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/AuthSynologyRepository.kt b/tv-app/src/main/java/band/effective/office/tv/repository/synology/AuthSynologyRepository.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/AuthSynologyRepository.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/synology/AuthSynologyRepository.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/PhotoSynologyRepository.kt b/tv-app/src/main/java/band/effective/office/tv/repository/synology/PhotoSynologyRepository.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/PhotoSynologyRepository.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/synology/PhotoSynologyRepository.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/SynologyRepository.kt b/tv-app/src/main/java/band/effective/office/tv/repository/synology/SynologyRepository.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/SynologyRepository.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/synology/SynologyRepository.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/impl/AuthSynologyRepositoryImpl.kt b/tv-app/src/main/java/band/effective/office/tv/repository/synology/impl/AuthSynologyRepositoryImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/impl/AuthSynologyRepositoryImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/synology/impl/AuthSynologyRepositoryImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/impl/PhotoSynologyRepositoryImpl.kt b/tv-app/src/main/java/band/effective/office/tv/repository/synology/impl/PhotoSynologyRepositoryImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/impl/PhotoSynologyRepositoryImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/synology/impl/PhotoSynologyRepositoryImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/impl/SynologyRepositoryImpl.kt b/tv-app/src/main/java/band/effective/office/tv/repository/synology/impl/SynologyRepositoryImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/synology/impl/SynologyRepositoryImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/synology/impl/SynologyRepositoryImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/UselessFactRepository.kt b/tv-app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/UselessFactRepository.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/UselessFactRepository.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/UselessFactRepository.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/impl/UselessFactRepositoryImpl.kt b/tv-app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/impl/UselessFactRepositoryImpl.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/impl/UselessFactRepositoryImpl.kt rename to tv-app/src/main/java/band/effective/office/tv/repository/uselessFactRepository/impl/UselessFactRepositoryImpl.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayUiState.kt b/tv-app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayUiState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayUiState.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayUiState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayViewModel.kt b/tv-app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayViewModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayViewModel.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/autoplay/AutoplayViewModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplayMenu/AutoplayMenuScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/autoplayMenu/AutoplayMenuScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplayMenu/AutoplayMenuScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/autoplayMenu/AutoplayMenuScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplayMenu/component/SelectableMenuItem.kt b/tv-app/src/main/java/band/effective/office/tv/screen/autoplayMenu/component/SelectableMenuItem.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/autoplayMenu/component/SelectableMenuItem.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/autoplayMenu/component/SelectableMenuItem.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/EventStoryScreenContent.kt b/tv-app/src/main/java/band/effective/office/tv/screen/components/EventStoryScreenContent.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/EventStoryScreenContent.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/components/EventStoryScreenContent.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/NoStoriesScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/components/NoStoriesScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/NoStoriesScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/components/NoStoriesScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/StoryContent.kt b/tv-app/src/main/java/band/effective/office/tv/screen/components/StoryContent.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/StoryContent.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/components/StoryContent.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/StoryIndicator.kt b/tv-app/src/main/java/band/effective/office/tv/screen/components/StoryIndicator.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/components/StoryIndicator.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/components/StoryIndicator.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/DuolingoScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/duolingo/DuolingoScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/DuolingoScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/duolingo/DuolingoScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/DuolingoTitle.kt b/tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/DuolingoTitle.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/DuolingoTitle.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/DuolingoTitle.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/Flag.kt b/tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/Flag.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/Flag.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/Flag.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/GirdItem.kt b/tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/GirdItem.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/GirdItem.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/GirdItem.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/TopsUser.kt b/tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/TopsUser.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/components/TopsUser.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/duolingo/components/TopsUser.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/model/DuolingoUserUI.kt b/tv-app/src/main/java/band/effective/office/tv/screen/duolingo/model/DuolingoUserUI.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/model/DuolingoUserUI.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/duolingo/model/DuolingoUserUI.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/utils/FlagMapper.kt b/tv-app/src/main/java/band/effective/office/tv/screen/duolingo/utils/FlagMapper.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/duolingo/utils/FlagMapper.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/duolingo/utils/FlagMapper.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/error/ErrorScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/error/ErrorScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/error/ErrorScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/error/ErrorScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreenEvents.kt b/tv-app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreenEvents.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreenEvents.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryScreenEvents.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryViewModel.kt b/tv-app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryViewModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryViewModel.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/eventStory/EventStoryViewModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/LatestEventInfoUiState.kt b/tv-app/src/main/java/band/effective/office/tv/screen/eventStory/LatestEventInfoUiState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/LatestEventInfoUiState.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/eventStory/LatestEventInfoUiState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/models/EventInfoUI.kt b/tv-app/src/main/java/band/effective/office/tv/screen/eventStory/models/EventInfoUI.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/eventStory/models/EventInfoUI.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/eventStory/models/EventInfoUI.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/history/HistoryScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/history/HistoryScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/history/HistoryScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/history/HistoryScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsUiState.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsUiState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsUiState.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsUiState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsViewModel.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsViewModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsViewModel.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdEventsViewModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdScreenEvents.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdScreenEvents.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdScreenEvents.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/LeaderIdScreenEvents.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/AdditionalEventInfo.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/AdditionalEventInfo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/AdditionalEventInfo.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/AdditionalEventInfo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventCard.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventCard.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventCard.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventCard.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventPhoto.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventPhoto.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventPhoto.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventPhoto.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventQrImage.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventQrImage.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventQrImage.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/EventQrImage.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/MainEventInfo.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/MainEventInfo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/MainEventInfo.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/MainEventInfo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/TextWithCaptionAndIcon.kt b/tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/TextWithCaptionAndIcon.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/TextWithCaptionAndIcon.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/leaderIdEvents/components/TextWithCaptionAndIcon.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/load/LoadCircle.kt b/tv-app/src/main/java/band/effective/office/tv/screen/load/LoadCircle.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/load/LoadCircle.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/load/LoadCircle.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/load/LoadScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/load/LoadScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/load/LoadScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/load/LoadScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/MenuScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/menu/MenuScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/MenuScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/menu/MenuScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/ButtonAutoplay.kt b/tv-app/src/main/java/band/effective/office/tv/screen/menu/component/ButtonAutoplay.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/ButtonAutoplay.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/menu/component/ButtonAutoplay.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/MenuComponent.kt b/tv-app/src/main/java/band/effective/office/tv/screen/menu/component/MenuComponent.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/MenuComponent.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/menu/component/MenuComponent.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/MenuItems.kt b/tv-app/src/main/java/band/effective/office/tv/screen/menu/component/MenuItems.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/MenuItems.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/menu/component/MenuItems.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/TimeComponent.kt b/tv-app/src/main/java/band/effective/office/tv/screen/menu/component/TimeComponent.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/menu/component/TimeComponent.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/menu/component/TimeComponent.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/MessageScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/MessageScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/MessageScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/MessageScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/component/EmptyMessageScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/component/EmptyMessageScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/component/EmptyMessageScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/component/EmptyMessageScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/component/ManyMessagesScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/component/ManyMessagesScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/component/ManyMessagesScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/component/ManyMessagesScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/component/OneMessageScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/component/OneMessageScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/component/OneMessageScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/component/OneMessageScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenEvents.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenEvents.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenEvents.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenEvents.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenState.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenState.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageScreenState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageViewModel.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageViewModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageViewModel.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/primaryMessage/PrimaryMessageViewModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreenEvents.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreenEvents.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreenEvents.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageScreenEvents.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageState.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageState.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageViewModel.kt b/tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageViewModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageViewModel.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/message/secondaryMessage/SecondaryMessageViewModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/navigation/NavigationHost.kt b/tv-app/src/main/java/band/effective/office/tv/screen/navigation/NavigationHost.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/navigation/NavigationHost.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/navigation/NavigationHost.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/navigation/NavigationModel.kt b/tv-app/src/main/java/band/effective/office/tv/screen/navigation/NavigationModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/navigation/NavigationModel.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/navigation/NavigationModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoScreen.kt b/tv-app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoScreen.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoScreen.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoScreen.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoState.kt b/tv-app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoState.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoState.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/photo/BestPhotoState.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/PhotoViewModel.kt b/tv-app/src/main/java/band/effective/office/tv/screen/photo/PhotoViewModel.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/PhotoViewModel.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/photo/PhotoViewModel.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoSlideShow.kt b/tv-app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoSlideShow.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoSlideShow.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoSlideShow.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoUI.kt b/tv-app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoUI.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoUI.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/photo/components/PhotoUI.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/model/Photo.kt b/tv-app/src/main/java/band/effective/office/tv/screen/photo/model/Photo.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/screen/photo/model/Photo.kt rename to tv-app/src/main/java/band/effective/office/tv/screen/photo/model/Photo.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Color.kt b/tv-app/src/main/java/band/effective/office/tv/ui/theme/Color.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Color.kt rename to tv-app/src/main/java/band/effective/office/tv/ui/theme/Color.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Shape.kt b/tv-app/src/main/java/band/effective/office/tv/ui/theme/Shape.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Shape.kt rename to tv-app/src/main/java/band/effective/office/tv/ui/theme/Shape.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Theme.kt b/tv-app/src/main/java/band/effective/office/tv/ui/theme/Theme.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Theme.kt rename to tv-app/src/main/java/band/effective/office/tv/ui/theme/Theme.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Type.kt b/tv-app/src/main/java/band/effective/office/tv/ui/theme/Type.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/ui/theme/Type.kt rename to tv-app/src/main/java/band/effective/office/tv/ui/theme/Type.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/CalendarToString.kt b/tv-app/src/main/java/band/effective/office/tv/utils/CalendarToString.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/CalendarToString.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/CalendarToString.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/CalendarUtils.kt b/tv-app/src/main/java/band/effective/office/tv/utils/CalendarUtils.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/CalendarUtils.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/CalendarUtils.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/CorrectDeclension.kt b/tv-app/src/main/java/band/effective/office/tv/utils/CorrectDeclension.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/CorrectDeclension.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/CorrectDeclension.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/DateUtlils.kt b/tv-app/src/main/java/band/effective/office/tv/utils/DateUtlils.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/DateUtlils.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/DateUtlils.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/DayCountFromString.kt b/tv-app/src/main/java/band/effective/office/tv/utils/DayCountFromString.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/DayCountFromString.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/DayCountFromString.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/GregorianCalendarMoshiAdapter.kt b/tv-app/src/main/java/band/effective/office/tv/utils/GregorianCalendarMoshiAdapter.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/GregorianCalendarMoshiAdapter.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/GregorianCalendarMoshiAdapter.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/RStringGetter.kt b/tv-app/src/main/java/band/effective/office/tv/utils/RStringGetter.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/RStringGetter.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/RStringGetter.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/RememberQrBitmapPainter.kt b/tv-app/src/main/java/band/effective/office/tv/utils/RememberQrBitmapPainter.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/RememberQrBitmapPainter.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/RememberQrBitmapPainter.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/StringToDate.kt b/tv-app/src/main/java/band/effective/office/tv/utils/StringToDate.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/StringToDate.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/StringToDate.kt diff --git a/tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/TimeInterval.kt b/tv-app/src/main/java/band/effective/office/tv/utils/TimeInterval.kt similarity index 100% rename from tv-app/effecticeTV/app/src/main/java/band/effective/office/tv/utils/TimeInterval.kt rename to tv-app/src/main/java/band/effective/office/tv/utils/TimeInterval.kt diff --git a/tv-app/effecticeTV/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/tv-app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to tv-app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ar.xml b/tv-app/src/main/res/drawable/ar.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ar.xml rename to tv-app/src/main/res/drawable/ar.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ca.xml b/tv-app/src/main/res/drawable/ca.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ca.xml rename to tv-app/src/main/res/drawable/ca.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/clock.png b/tv-app/src/main/res/drawable/clock.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/clock.png rename to tv-app/src/main/res/drawable/clock.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/cs.xml b/tv-app/src/main/res/drawable/cs.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/cs.xml rename to tv-app/src/main/res/drawable/cs.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/cy.xml b/tv-app/src/main/res/drawable/cy.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/cy.xml rename to tv-app/src/main/res/drawable/cy.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/da.xml b/tv-app/src/main/res/drawable/da.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/da.xml rename to tv-app/src/main/res/drawable/da.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/de.xml b/tv-app/src/main/res/drawable/de.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/de.xml rename to tv-app/src/main/res/drawable/de.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/dualingo.xml b/tv-app/src/main/res/drawable/dualingo.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/dualingo.xml rename to tv-app/src/main/res/drawable/dualingo.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/duolingo_logo.png b/tv-app/src/main/res/drawable/duolingo_logo.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/duolingo_logo.png rename to tv-app/src/main/res/drawable/duolingo_logo.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/el.xml b/tv-app/src/main/res/drawable/el.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/el.xml rename to tv-app/src/main/res/drawable/el.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/empty2.xml b/tv-app/src/main/res/drawable/empty2.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/empty2.xml rename to tv-app/src/main/res/drawable/empty2.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/empty3.xml b/tv-app/src/main/res/drawable/empty3.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/empty3.xml rename to tv-app/src/main/res/drawable/empty3.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/en.xml b/tv-app/src/main/res/drawable/en.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/en.xml rename to tv-app/src/main/res/drawable/en.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/eo.xml b/tv-app/src/main/res/drawable/eo.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/eo.xml rename to tv-app/src/main/res/drawable/eo.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/error_circle.png b/tv-app/src/main/res/drawable/error_circle.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/error_circle.png rename to tv-app/src/main/res/drawable/error_circle.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/es.xml b/tv-app/src/main/res/drawable/es.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/es.xml rename to tv-app/src/main/res/drawable/es.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/events_placeholder.png b/tv-app/src/main/res/drawable/events_placeholder.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/events_placeholder.png rename to tv-app/src/main/res/drawable/events_placeholder.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/fi.xml b/tv-app/src/main/res/drawable/fi.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/fi.xml rename to tv-app/src/main/res/drawable/fi.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/fr.xml b/tv-app/src/main/res/drawable/fr.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/fr.xml rename to tv-app/src/main/res/drawable/fr.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ga.xml b/tv-app/src/main/res/drawable/ga.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ga.xml rename to tv-app/src/main/res/drawable/ga.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/gd.xml b/tv-app/src/main/res/drawable/gd.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/gd.xml rename to tv-app/src/main/res/drawable/gd.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/gn.xml b/tv-app/src/main/res/drawable/gn.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/gn.xml rename to tv-app/src/main/res/drawable/gn.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ha.xml b/tv-app/src/main/res/drawable/ha.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ha.xml rename to tv-app/src/main/res/drawable/ha.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/he.xml b/tv-app/src/main/res/drawable/he.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/he.xml rename to tv-app/src/main/res/drawable/he.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/hi.xml b/tv-app/src/main/res/drawable/hi.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/hi.xml rename to tv-app/src/main/res/drawable/hi.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ht.xml b/tv-app/src/main/res/drawable/ht.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ht.xml rename to tv-app/src/main/res/drawable/ht.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/hu.xml b/tv-app/src/main/res/drawable/hu.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/hu.xml rename to tv-app/src/main/res/drawable/hu.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/hv.xml b/tv-app/src/main/res/drawable/hv.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/hv.xml rename to tv-app/src/main/res/drawable/hv.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_launcher_background.xml b/tv-app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_launcher_background.xml rename to tv-app/src/main/res/drawable/ic_launcher_background.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_next_active.xml b/tv-app/src/main/res/drawable/ic_next_active.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_next_active.xml rename to tv-app/src/main/res/drawable/ic_next_active.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_next_inactive.xml b/tv-app/src/main/res/drawable/ic_next_inactive.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_next_inactive.xml rename to tv-app/src/main/res/drawable/ic_next_inactive.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_pause_active.xml b/tv-app/src/main/res/drawable/ic_pause_active.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_pause_active.xml rename to tv-app/src/main/res/drawable/ic_pause_active.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_pause_inactive.xml b/tv-app/src/main/res/drawable/ic_pause_inactive.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_pause_inactive.xml rename to tv-app/src/main/res/drawable/ic_pause_inactive.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_play_active.xml b/tv-app/src/main/res/drawable/ic_play_active.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_play_active.xml rename to tv-app/src/main/res/drawable/ic_play_active.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_play_inactive.xml b/tv-app/src/main/res/drawable/ic_play_inactive.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_play_inactive.xml rename to tv-app/src/main/res/drawable/ic_play_inactive.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_previous_active.xml b/tv-app/src/main/res/drawable/ic_previous_active.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_previous_active.xml rename to tv-app/src/main/res/drawable/ic_previous_active.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ic_previous_inactive.xml b/tv-app/src/main/res/drawable/ic_previous_inactive.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ic_previous_inactive.xml rename to tv-app/src/main/res/drawable/ic_previous_inactive.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/id.xml b/tv-app/src/main/res/drawable/id.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/id.xml rename to tv-app/src/main/res/drawable/id.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/it.xml b/tv-app/src/main/res/drawable/it.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/it.xml rename to tv-app/src/main/res/drawable/it.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ja.xml b/tv-app/src/main/res/drawable/ja.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ja.xml rename to tv-app/src/main/res/drawable/ja.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/kl.xml b/tv-app/src/main/res/drawable/kl.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/kl.xml rename to tv-app/src/main/res/drawable/kl.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ko.xml b/tv-app/src/main/res/drawable/ko.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ko.xml rename to tv-app/src/main/res/drawable/ko.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/la.xml b/tv-app/src/main/res/drawable/la.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/la.xml rename to tv-app/src/main/res/drawable/la.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/location.png b/tv-app/src/main/res/drawable/location.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/location.png rename to tv-app/src/main/res/drawable/location.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/logo.png b/tv-app/src/main/res/drawable/logo.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/logo.png rename to tv-app/src/main/res/drawable/logo.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/mic.png b/tv-app/src/main/res/drawable/mic.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/mic.png rename to tv-app/src/main/res/drawable/mic.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/nl.xml b/tv-app/src/main/res/drawable/nl.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/nl.xml rename to tv-app/src/main/res/drawable/nl.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/no_bo.xml b/tv-app/src/main/res/drawable/no_bo.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/no_bo.xml rename to tv-app/src/main/res/drawable/no_bo.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/nv.xml b/tv-app/src/main/res/drawable/nv.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/nv.xml rename to tv-app/src/main/res/drawable/nv.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/pl.xml b/tv-app/src/main/res/drawable/pl.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/pl.xml rename to tv-app/src/main/res/drawable/pl.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/pt_copy.xml b/tv-app/src/main/res/drawable/pt_copy.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/pt_copy.xml rename to tv-app/src/main/res/drawable/pt_copy.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ro.xml b/tv-app/src/main/res/drawable/ro.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ro.xml rename to tv-app/src/main/res/drawable/ro.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/ru.xml b/tv-app/src/main/res/drawable/ru.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/ru.xml rename to tv-app/src/main/res/drawable/ru.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/sv.xml b/tv-app/src/main/res/drawable/sv.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/sv.xml rename to tv-app/src/main/res/drawable/sv.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/sw.xml b/tv-app/src/main/res/drawable/sw.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/sw.xml rename to tv-app/src/main/res/drawable/sw.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/teachers.xml b/tv-app/src/main/res/drawable/teachers.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/teachers.xml rename to tv-app/src/main/res/drawable/teachers.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/th.xml b/tv-app/src/main/res/drawable/th.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/th.xml rename to tv-app/src/main/res/drawable/th.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/tr.xml b/tv-app/src/main/res/drawable/tr.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/tr.xml rename to tv-app/src/main/res/drawable/tr.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/troubleshooting.xml b/tv-app/src/main/res/drawable/troubleshooting.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/troubleshooting.xml rename to tv-app/src/main/res/drawable/troubleshooting.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/uk.xml b/tv-app/src/main/res/drawable/uk.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/uk.xml rename to tv-app/src/main/res/drawable/uk.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/user.png b/tv-app/src/main/res/drawable/user.png similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/user.png rename to tv-app/src/main/res/drawable/user.png diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/vi.xml b/tv-app/src/main/res/drawable/vi.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/vi.xml rename to tv-app/src/main/res/drawable/vi.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/yiddish.xml b/tv-app/src/main/res/drawable/yiddish.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/yiddish.xml rename to tv-app/src/main/res/drawable/yiddish.xml diff --git a/tv-app/effecticeTV/app/src/main/res/drawable/zh.xml b/tv-app/src/main/res/drawable/zh.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/drawable/zh.xml rename to tv-app/src/main/res/drawable/zh.xml diff --git a/tv-app/effecticeTV/app/src/main/res/font/druktextwidelcg_medium.ttf b/tv-app/src/main/res/font/druktextwidelcg_medium.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/druktextwidelcg_medium.ttf rename to tv-app/src/main/res/font/druktextwidelcg_medium.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/museocyrl.otf b/tv-app/src/main/res/font/museocyrl.otf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/museocyrl.otf rename to tv-app/src/main/res/font/museocyrl.otf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_black.ttf b/tv-app/src/main/res/font/roboto_black.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_black.ttf rename to tv-app/src/main/res/font/roboto_black.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_blackitalic.ttf b/tv-app/src/main/res/font/roboto_blackitalic.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_blackitalic.ttf rename to tv-app/src/main/res/font/roboto_blackitalic.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_bold.ttf b/tv-app/src/main/res/font/roboto_bold.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_bold.ttf rename to tv-app/src/main/res/font/roboto_bold.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_bolditalic.ttf b/tv-app/src/main/res/font/roboto_bolditalic.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_bolditalic.ttf rename to tv-app/src/main/res/font/roboto_bolditalic.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_italic.ttf b/tv-app/src/main/res/font/roboto_italic.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_italic.ttf rename to tv-app/src/main/res/font/roboto_italic.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_light.ttf b/tv-app/src/main/res/font/roboto_light.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_light.ttf rename to tv-app/src/main/res/font/roboto_light.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_lightitalic.ttf b/tv-app/src/main/res/font/roboto_lightitalic.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_lightitalic.ttf rename to tv-app/src/main/res/font/roboto_lightitalic.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_medium.ttf b/tv-app/src/main/res/font/roboto_medium.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_medium.ttf rename to tv-app/src/main/res/font/roboto_medium.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_mediumitalic.ttf b/tv-app/src/main/res/font/roboto_mediumitalic.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_mediumitalic.ttf rename to tv-app/src/main/res/font/roboto_mediumitalic.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_regular.ttf b/tv-app/src/main/res/font/roboto_regular.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_regular.ttf rename to tv-app/src/main/res/font/roboto_regular.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_thin.ttf b/tv-app/src/main/res/font/roboto_thin.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_thin.ttf rename to tv-app/src/main/res/font/roboto_thin.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/font/roboto_thinitalic.ttf b/tv-app/src/main/res/font/roboto_thinitalic.ttf similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/font/roboto_thinitalic.ttf rename to tv-app/src/main/res/font/roboto_thinitalic.ttf diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/tv-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to tv-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/tv-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to tv-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/tv-app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml rename to tv-app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/tv-app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to tv-app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/tv-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to tv-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/tv-app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to tv-app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/tv-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to tv-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/tv-app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to tv-app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/tv-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to tv-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/tv-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to tv-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/tv-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to tv-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/tv-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to tv-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/tv-app/effecticeTV/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/tv-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to tv-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/tv-app/effecticeTV/app/src/main/res/values/colors.xml b/tv-app/src/main/res/values/colors.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/values/colors.xml rename to tv-app/src/main/res/values/colors.xml diff --git a/tv-app/effecticeTV/app/src/main/res/values/strings.xml b/tv-app/src/main/res/values/strings.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/values/strings.xml rename to tv-app/src/main/res/values/strings.xml diff --git a/tv-app/effecticeTV/app/src/main/res/values/themes.xml b/tv-app/src/main/res/values/themes.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/values/themes.xml rename to tv-app/src/main/res/values/themes.xml diff --git a/tv-app/effecticeTV/app/src/main/res/xml/backup_rules.xml b/tv-app/src/main/res/xml/backup_rules.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/xml/backup_rules.xml rename to tv-app/src/main/res/xml/backup_rules.xml diff --git a/tv-app/effecticeTV/app/src/main/res/xml/data_extraction_rules.xml b/tv-app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from tv-app/effecticeTV/app/src/main/res/xml/data_extraction_rules.xml rename to tv-app/src/main/res/xml/data_extraction_rules.xml diff --git a/tv-app/effecticeTV/app/src/test/java/band/effective/office/tv/ExampleUnitTest.kt b/tv-app/src/test/java/band/effective/office/tv/ExampleUnitTest.kt similarity index 100% rename from tv-app/effecticeTV/app/src/test/java/band/effective/office/tv/ExampleUnitTest.kt rename to tv-app/src/test/java/band/effective/office/tv/ExampleUnitTest.kt