diff --git a/README.md b/README.md index d7ff7be..40b496b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Add mirror for maven repository: repositories { //... maven { - url = uri("https://effective-android.bytesafe.dev/maven/drawer/") + url = uri("https://repsy.io/mvn/effective/compose-debug-drawer/") } } ``` @@ -20,9 +20,9 @@ Add dependencies to `build.gradle.kts` of app: ```kotlin dependencies{ - debugImplementation("effective.band:drawer:$version") - debugImplementation("effective.band:drawer-modules:$version") - debugImplementation("effective.band:drawer-location:$version") + debugImplementation("band.effective:drawer:$version") + debugImplementation("band.effective:drawer-modules:$version") + debugImplementation("band.effective:drawer-location:$version") } ``` @@ -282,7 +282,7 @@ DebugDrawerLayout( Add publish credentials to `local.properties`: ```properties -myMavenRepoWriteUrl=https://effective-android.bytesafe.dev/maven/drawer/ +myMavenRepoWriteUrl=https://repsy.io/mvn/effective/compose-debug-drawer/ username=username password=password ``` diff --git a/app/build.gradle.kts b/app/build.gradle.kts index be4759d..3dcea7d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -56,9 +56,9 @@ android { } dependencies { - debugImplementation("effective.band:drawer-base:1.0.0") - debugImplementation("effective.band:drawer-modules:1.0.0") - debugImplementation("effective.band:drawer-location:1.0.0") + debugImplementation("band.effective:drawer-base:1.0.0") + debugImplementation("band.effective:drawer-modules:1.0.0") + debugImplementation("band.effective:drawer-location:1.0.0") implementation(libs.androidx.compose.activity) diff --git a/app/src/debug/kotlin/effective/band/compose/drawer/AppConfiguration.kt b/app/src/debug/kotlin/band/effective/compose/drawer/AppConfiguration.kt similarity index 81% rename from app/src/debug/kotlin/effective/band/compose/drawer/AppConfiguration.kt rename to app/src/debug/kotlin/band/effective/compose/drawer/AppConfiguration.kt index 61a6136..2cb4603 100644 --- a/app/src/debug/kotlin/effective/band/compose/drawer/AppConfiguration.kt +++ b/app/src/debug/kotlin/band/effective/compose/drawer/AppConfiguration.kt @@ -1,14 +1,14 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer import android.app.Application -import effective.band.compose.drawer_modules.okhttp.HttpLogger -import effective.band.compose.drawer_modules.retrofit.DebugRetrofitConfig -import effective.band.compose.drawer_modules.retrofit.Endpoint +import band.effective.compose.drawer.network.GamesApi +import band.effective.compose.drawer.network.HttpConfiguration +import band.effective.compose.drawer.network.HttpConfiguration.API_URL +import band.effective.compose.drawer_modules.okhttp.HttpLogger +import band.effective.compose.drawer_modules.retrofit.DebugRetrofitConfig +import band.effective.compose.drawer_modules.retrofit.Endpoint import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import effective.band.compose.drawer.network.GamesApi -import effective.band.compose.drawer.network.HttpConfiguration -import effective.band.compose.drawer.network.HttpConfiguration.API_URL import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory import retrofit2.mock.MockRetrofit diff --git a/app/src/debug/kotlin/effective/band/compose/drawer/DrawerWrapper.kt b/app/src/debug/kotlin/band/effective/compose/drawer/DrawerWrapper.kt similarity index 70% rename from app/src/debug/kotlin/effective/band/compose/drawer/DrawerWrapper.kt rename to app/src/debug/kotlin/band/effective/compose/drawer/DrawerWrapper.kt index 8e6a38c..222a058 100644 --- a/app/src/debug/kotlin/effective/band/compose/drawer/DrawerWrapper.kt +++ b/app/src/debug/kotlin/band/effective/compose/drawer/DrawerWrapper.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -8,23 +8,27 @@ import androidx.compose.material.LocalContentAlpha import androidx.compose.material.MaterialTheme import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Settings -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp +import band.effective.compose.drawer_modules.BuildModule +import band.effective.compose.drawer_modules.DeviceModule +import band.effective.compose.drawer_modules.design.DebugGridLayer +import band.effective.compose.drawer_modules.design.DebugGridStateConfig +import band.effective.compose.drawer_modules.design.DesignModule +import band.effective.compose.drawer_modules.leak.LeakCanaryModule +import band.effective.compose.drawer_modules.okhttp.OkHttpLoggerModule +import band.effective.compose.drawer_modules.retrofit.RetrofitModule +import band.effective.drawer_base.ActionsModule +import band.effective.drawer_base.DebugDrawerLayout +import band.effective.drawer_base.actions.ButtonAction +import band.effective.drawer_base.actions.SwitchAction import band.effective.drawer_location.LocationModule -import effective.band.compose.drawer_modules.BuildModule -import effective.band.compose.drawer_modules.DeviceModule -import effective.band.compose.drawer_modules.design.DebugGridLayer -import effective.band.compose.drawer_modules.design.DebugGridStateConfig -import effective.band.compose.drawer_modules.design.DesignModule -import effective.band.compose.drawer_modules.leak.LeakCanaryModule -import effective.band.compose.drawer_modules.okhttp.OkHttpLoggerModule -import effective.band.compose.drawer_modules.retrofit.RetrofitModule -import effective.band.drawer_base.ActionsModule -import effective.band.drawer_base.DebugDrawerLayout -import effective.band.drawer_base.actions.ButtonAction -import effective.band.drawer_base.actions.SwitchAction @Composable fun ConfigureScreen(bodyContent: @Composable (isDrawerOpen: Boolean) -> Unit) { diff --git a/app/src/debug/kotlin/effective/band/compose/drawer/MockGamesApi.kt b/app/src/debug/kotlin/band/effective/compose/drawer/MockGamesApi.kt similarity index 97% rename from app/src/debug/kotlin/effective/band/compose/drawer/MockGamesApi.kt rename to app/src/debug/kotlin/band/effective/compose/drawer/MockGamesApi.kt index d071c89..80244d1 100644 --- a/app/src/debug/kotlin/effective/band/compose/drawer/MockGamesApi.kt +++ b/app/src/debug/kotlin/band/effective/compose/drawer/MockGamesApi.kt @@ -1,10 +1,10 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer -import effective.band.compose.drawer.domain.Game -import effective.band.compose.drawer.domain.GamesResponse -import effective.band.compose.drawer.domain.Image -import effective.band.compose.drawer.domain.Platform -import effective.band.compose.drawer.network.GamesApi +import band.effective.compose.drawer.domain.Game +import band.effective.compose.drawer.domain.GamesResponse +import band.effective.compose.drawer.domain.Image +import band.effective.compose.drawer.domain.Platform +import band.effective.compose.drawer.network.GamesApi import retrofit2.mock.BehaviorDelegate import retrofit2.mock.MockRetrofit diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 93f1e7c..f9a1e7f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="band.effective.compose.drawer"> @@ -11,9 +11,9 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:name=".DrawerApplication"> + android:name="band.effective.compose.drawer.DrawerApplication"> diff --git a/app/src/main/kotlin/effective/band/compose/drawer/DrawerApplication.kt b/app/src/main/kotlin/band/effective/compose/drawer/DrawerApplication.kt similarity index 89% rename from app/src/main/kotlin/effective/band/compose/drawer/DrawerApplication.kt rename to app/src/main/kotlin/band/effective/compose/drawer/DrawerApplication.kt index 06231ab..7a62357 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/DrawerApplication.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/DrawerApplication.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer import android.app.Application import timber.log.Timber diff --git a/app/src/main/kotlin/effective/band/compose/drawer/GamesScreen.kt b/app/src/main/kotlin/band/effective/compose/drawer/GamesScreen.kt similarity index 97% rename from app/src/main/kotlin/effective/band/compose/drawer/GamesScreen.kt rename to app/src/main/kotlin/band/effective/compose/drawer/GamesScreen.kt index db5a0bd..aa5f6bd 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/GamesScreen.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/GamesScreen.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -24,10 +24,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import band.effective.compose.drawer.domain.Game import coil.compose.AsyncImage import com.google.accompanist.swiperefresh.SwipeRefresh import com.google.accompanist.swiperefresh.rememberSwipeRefreshState -import effective.band.compose.drawer.domain.Game @Composable fun GamesScreen() { diff --git a/app/src/main/kotlin/effective/band/compose/drawer/GamesViewModel.kt b/app/src/main/kotlin/band/effective/compose/drawer/GamesViewModel.kt similarity index 85% rename from app/src/main/kotlin/effective/band/compose/drawer/GamesViewModel.kt rename to app/src/main/kotlin/band/effective/compose/drawer/GamesViewModel.kt index 5acf1d0..972ab53 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/GamesViewModel.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/GamesViewModel.kt @@ -1,10 +1,11 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import effective.band.compose.drawer.domain.Game -import effective.band.compose.drawer.domain.GamesResponse -import effective.band.compose.drawer.network.GamesApi +import band.effective.compose.drawer.AppConfiguration +import band.effective.compose.drawer.domain.Game +import band.effective.compose.drawer.domain.GamesResponse +import band.effective.compose.drawer.network.GamesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/kotlin/effective/band/compose/drawer/MainActivity.kt b/app/src/main/kotlin/band/effective/compose/drawer/MainActivity.kt similarity index 79% rename from app/src/main/kotlin/effective/band/compose/drawer/MainActivity.kt rename to app/src/main/kotlin/band/effective/compose/drawer/MainActivity.kt index 1a7ad7c..eb08c67 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/MainActivity.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/MainActivity.kt @@ -1,9 +1,9 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import effective.band.compose.drawer.ui.ComposeDrawerTheme +import band.effective.compose.drawer.ui.ComposeDrawerTheme class MainActivity : ComponentActivity() { diff --git a/app/src/main/kotlin/effective/band/compose/drawer/domain/Models.kt b/app/src/main/kotlin/band/effective/compose/drawer/domain/Models.kt similarity index 90% rename from app/src/main/kotlin/effective/band/compose/drawer/domain/Models.kt rename to app/src/main/kotlin/band/effective/compose/drawer/domain/Models.kt index 1a61216..d2476d6 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/domain/Models.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/domain/Models.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer.domain +package band.effective.compose.drawer.domain data class GamesResponse(val results: List) diff --git a/app/src/main/kotlin/effective/band/compose/drawer/network/GamesApi.kt b/app/src/main/kotlin/band/effective/compose/drawer/network/GamesApi.kt similarity index 66% rename from app/src/main/kotlin/effective/band/compose/drawer/network/GamesApi.kt rename to app/src/main/kotlin/band/effective/compose/drawer/network/GamesApi.kt index cb33b70..ccb1946 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/network/GamesApi.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/network/GamesApi.kt @@ -1,6 +1,6 @@ -package effective.band.compose.drawer.network +package band.effective.compose.drawer.network -import effective.band.compose.drawer.domain.GamesResponse +import band.effective.compose.drawer.domain.GamesResponse import retrofit2.http.GET interface GamesApi { diff --git a/app/src/main/kotlin/effective/band/compose/drawer/network/HttpConfiguration.kt b/app/src/main/kotlin/band/effective/compose/drawer/network/HttpConfiguration.kt similarity index 94% rename from app/src/main/kotlin/effective/band/compose/drawer/network/HttpConfiguration.kt rename to app/src/main/kotlin/band/effective/compose/drawer/network/HttpConfiguration.kt index d28d502..4470722 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/network/HttpConfiguration.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/network/HttpConfiguration.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer.network +package band.effective.compose.drawer.network import okhttp3.HttpUrl import okhttp3.Interceptor diff --git a/app/src/main/kotlin/effective/band/compose/drawer/ui/Color.kt b/app/src/main/kotlin/band/effective/compose/drawer/ui/Color.kt similarity index 81% rename from app/src/main/kotlin/effective/band/compose/drawer/ui/Color.kt rename to app/src/main/kotlin/band/effective/compose/drawer/ui/Color.kt index b547e84..1f586a0 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/ui/Color.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/ui/Color.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer.ui +package band.effective.compose.drawer.ui import androidx.compose.ui.graphics.Color diff --git a/app/src/main/kotlin/effective/band/compose/drawer/ui/Shape.kt b/app/src/main/kotlin/band/effective/compose/drawer/ui/Shape.kt similarity index 87% rename from app/src/main/kotlin/effective/band/compose/drawer/ui/Shape.kt rename to app/src/main/kotlin/band/effective/compose/drawer/ui/Shape.kt index 75a7c60..9a7a17b 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/ui/Shape.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/ui/Shape.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer.ui +package band.effective.compose.drawer.ui import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Shapes diff --git a/app/src/main/kotlin/effective/band/compose/drawer/ui/Theme.kt b/app/src/main/kotlin/band/effective/compose/drawer/ui/Theme.kt similarity index 96% rename from app/src/main/kotlin/effective/band/compose/drawer/ui/Theme.kt rename to app/src/main/kotlin/band/effective/compose/drawer/ui/Theme.kt index 619b3e3..f4626c1 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/ui/Theme.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/ui/Theme.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer.ui +package band.effective.compose.drawer.ui import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material.MaterialTheme diff --git a/app/src/main/kotlin/effective/band/compose/drawer/ui/Type.kt b/app/src/main/kotlin/band/effective/compose/drawer/ui/Type.kt similarity index 95% rename from app/src/main/kotlin/effective/band/compose/drawer/ui/Type.kt rename to app/src/main/kotlin/band/effective/compose/drawer/ui/Type.kt index bbf8024..a7f67f1 100644 --- a/app/src/main/kotlin/effective/band/compose/drawer/ui/Type.kt +++ b/app/src/main/kotlin/band/effective/compose/drawer/ui/Type.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer.ui +package band.effective.compose.drawer.ui import androidx.compose.material.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/release/kotlin/effective/band/compose/drawer/AppConfiguration.kt b/app/src/release/kotlin/band/effective/compose/drawer/AppConfiguration.kt similarity index 73% rename from app/src/release/kotlin/effective/band/compose/drawer/AppConfiguration.kt rename to app/src/release/kotlin/band/effective/compose/drawer/AppConfiguration.kt index f6b2cf1..92ef9f6 100644 --- a/app/src/release/kotlin/effective/band/compose/drawer/AppConfiguration.kt +++ b/app/src/release/kotlin/band/effective/compose/drawer/AppConfiguration.kt @@ -1,13 +1,11 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer -import android.app.Activity import android.app.Application -import android.view.ViewGroup +import band.effective.compose.drawer.network.GamesApi +import band.effective.compose.drawer.network.HttpConfiguration +import band.effective.compose.drawer.network.HttpConfiguration.API_URL import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import effective.band.compose.drawer.network.GamesApi -import effective.band.compose.drawer.network.HttpConfiguration -import effective.band.compose.drawer.network.HttpConfiguration.API_URL import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/app/src/release/kotlin/effective/band/compose/drawer/DrawerWrapper.kt b/app/src/release/kotlin/band/effective/compose/drawer/DrawerWrapper.kt similarity index 80% rename from app/src/release/kotlin/effective/band/compose/drawer/DrawerWrapper.kt rename to app/src/release/kotlin/band/effective/compose/drawer/DrawerWrapper.kt index d562d56..76fcce1 100644 --- a/app/src/release/kotlin/effective/band/compose/drawer/DrawerWrapper.kt +++ b/app/src/release/kotlin/band/effective/compose/drawer/DrawerWrapper.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer +package band.effective.compose.drawer import androidx.compose.runtime.Composable diff --git a/buildSrc/src/main/kotlin/PublishConfig.kt b/buildSrc/src/main/kotlin/PublishConfig.kt index 175d0cb..1a06c89 100644 --- a/buildSrc/src/main/kotlin/PublishConfig.kt +++ b/buildSrc/src/main/kotlin/PublishConfig.kt @@ -1,6 +1,6 @@ object PublishConfig { const val drawerVersion = "1.0.0" - const val groupId = "effective.band" + const val groupId = "band.effective" object Drawer{ diff --git a/drawer-base/build.gradle.kts b/drawer-base/build.gradle.kts index 6304554..0d63413 100644 --- a/drawer-base/build.gradle.kts +++ b/drawer-base/build.gradle.kts @@ -17,11 +17,7 @@ android { buildTypes { release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + } } compileOptions { diff --git a/drawer-base/src/main/AndroidManifest.xml b/drawer-base/src/main/AndroidManifest.xml index 975c5ea..c0fd458 100644 --- a/drawer-base/src/main/AndroidManifest.xml +++ b/drawer-base/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/ActionsModule.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/ActionsModule.kt similarity index 94% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/ActionsModule.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/ActionsModule.kt index 775a767..7360081 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/ActionsModule.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/ActionsModule.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/CommonComposables.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/CommonComposables.kt similarity index 93% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/CommonComposables.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/CommonComposables.kt index 6cd0326..85063a2 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/CommonComposables.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/CommonComposables.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import androidx.compose.material.ContentAlpha import androidx.compose.material.LocalContentAlpha diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/DebugDrawer.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/DebugDrawer.kt similarity index 99% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/DebugDrawer.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/DebugDrawer.kt index 300391e..3e7a562 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/DebugDrawer.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/DebugDrawer.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import android.content.Context import android.hardware.Sensor diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/DebugDrawerHeader.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/DebugDrawerHeader.kt similarity index 99% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/DebugDrawerHeader.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/DebugDrawerHeader.kt index 8c6d1d8..87952e3 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/DebugDrawerHeader.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/DebugDrawerHeader.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/DebugModule.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/DebugModule.kt similarity index 98% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/DebugModule.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/DebugModule.kt index 184506a..e022ac5 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/DebugModule.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/DebugModule.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Column diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/DrawerDivider.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/DrawerDivider.kt similarity index 94% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/DrawerDivider.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/DrawerDivider.kt index 8749281..af98ecf 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/DrawerDivider.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/DrawerDivider.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.requiredHeight diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/DrawerUtils.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/DrawerUtils.kt similarity index 92% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/DrawerUtils.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/DrawerUtils.kt index d5fc649..e6afe37 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/DrawerUtils.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/DrawerUtils.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/InfoModule.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/InfoModule.kt similarity index 98% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/InfoModule.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/InfoModule.kt index e2bcc9b..071a41b 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/InfoModule.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/InfoModule.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import androidx.compose.foundation.layout.* import androidx.compose.material.ContentAlpha diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/ShakeDetector.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/ShakeDetector.kt similarity index 97% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/ShakeDetector.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/ShakeDetector.kt index 19fb6e6..6b70536 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/ShakeDetector.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/ShakeDetector.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base +package band.effective.drawer_base import android.hardware.Sensor import android.hardware.SensorEvent diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/ButtonAction.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/ButtonAction.kt similarity index 95% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/actions/ButtonAction.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/actions/ButtonAction.kt index e7a6bf5..ea88005 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/ButtonAction.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/ButtonAction.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base.actions +package band.effective.drawer_base.actions import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownAction.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownAction.kt similarity index 96% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownAction.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownAction.kt index 1ac6e6a..01c31d5 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownAction.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownAction.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base.actions +package band.effective.drawer_base.actions import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownIcon.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownIcon.kt similarity index 91% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownIcon.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownIcon.kt index 6e0f2d0..3224806 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownIcon.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownIcon.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base.actions +package band.effective.drawer_base.actions import androidx.compose.material.Icon import androidx.compose.material.icons.Icons diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownSelectorAction.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownSelectorAction.kt similarity index 98% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownSelectorAction.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownSelectorAction.kt index c016fdc..27d1409 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/DropdownSelectorAction.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/DropdownSelectorAction.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base.actions +package band.effective.drawer_base.actions import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/SwitchAction.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/SwitchAction.kt similarity index 98% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/actions/SwitchAction.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/actions/SwitchAction.kt index 81434f3..6c53f36 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/SwitchAction.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/SwitchAction.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base.actions +package band.effective.drawer_base.actions import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer diff --git a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/TextAction.kt b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/TextAction.kt similarity index 95% rename from drawer-base/src/main/kotlin/effective/band/drawer_base/actions/TextAction.kt rename to drawer-base/src/main/kotlin/band/effective/drawer_base/actions/TextAction.kt index e1e2efa..863c426 100644 --- a/drawer-base/src/main/kotlin/effective/band/drawer_base/actions/TextAction.kt +++ b/drawer-base/src/main/kotlin/band/effective/drawer_base/actions/TextAction.kt @@ -1,4 +1,4 @@ -package effective.band.drawer_base.actions +package band.effective.drawer_base.actions import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth diff --git a/drawer-location/build.gradle.kts b/drawer-location/build.gradle.kts index 506c723..f8653c1 100644 --- a/drawer-location/build.gradle.kts +++ b/drawer-location/build.gradle.kts @@ -74,7 +74,7 @@ publishing { } dependencies { - implementation("effective.band:drawer-base:1.0.0") + implementation("band.effective:drawer-base:1.0.0") implementation(libs.androidx.compose.foundation) implementation(libs.androidx.compose.foundation.layout) diff --git a/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModule.kt b/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModule.kt index 09b92e7..155d318 100644 --- a/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModule.kt +++ b/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModule.kt @@ -9,7 +9,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import effective.band.drawer_base.InfoModule +import band.effective.drawer_base.InfoModule @Composable fun LocationModule( diff --git a/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModuleViewModel.kt b/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModuleViewModel.kt index ca916cf..187e35a 100644 --- a/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModuleViewModel.kt +++ b/drawer-location/src/main/kotlin/band/effective/drawer_location/LocationModuleViewModel.kt @@ -11,16 +11,12 @@ import com.google.android.gms.location.LocationCallback import com.google.android.gms.location.LocationRequest import com.google.android.gms.location.LocationResult import com.google.android.gms.location.LocationServices -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.launch import timber.log.Timber class LocationModuleViewModel(private val context: Context) { - private val scope = CoroutineScope(Dispatchers.Main) private val mutableState = MutableStateFlow(null) val state = mutableState.asStateFlow() diff --git a/drawer-modules/build.gradle.kts b/drawer-modules/build.gradle.kts index 7a4e6eb..4c703de 100644 --- a/drawer-modules/build.gradle.kts +++ b/drawer-modules/build.gradle.kts @@ -86,7 +86,7 @@ publishing { dependencies { - implementation("effective.band:drawer-base:1.0.0") + implementation("band.effective:drawer-base:1.0.0") implementation(libs.androidx.compose.foundation) implementation(libs.androidx.compose.foundation.layout) diff --git a/drawer-modules/src/main/AndroidManifest.xml b/drawer-modules/src/main/AndroidManifest.xml index 80a0d5a..f1f3ed4 100644 --- a/drawer-modules/src/main/AndroidManifest.xml +++ b/drawer-modules/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/BuildModule.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/BuildModule.kt similarity index 95% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/BuildModule.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/BuildModule.kt index b1e2cdb..029f792 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/BuildModule.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/BuildModule.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules +package band.effective.compose.drawer_modules import android.content.Context import android.os.Build @@ -8,7 +8,7 @@ import androidx.compose.material.icons.filled.Settings import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import effective.band.drawer_base.InfoModule +import band.effective.drawer_base.InfoModule @Composable fun BuildModule(modifier: Modifier = Modifier) { diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/DeviceModule.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/DeviceModule.kt similarity index 95% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/DeviceModule.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/DeviceModule.kt index a904d22..c3414db 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/DeviceModule.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/DeviceModule.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules +package band.effective.compose.drawer_modules import android.os.Build import android.util.DisplayMetrics @@ -8,7 +8,7 @@ import androidx.compose.material.icons.filled.DeviceUnknown import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import effective.band.drawer_base.InfoModule +import band.effective.drawer_base.InfoModule @Composable fun DeviceModule(modifier: Modifier = Modifier) { diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridAmbient.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridAmbient.kt similarity index 82% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridAmbient.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridAmbient.kt index f532558..a49634b 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridAmbient.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridAmbient.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.design +package band.effective.compose.drawer_modules.design import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.runtime.staticCompositionLocalOf diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridLayer.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridLayer.kt similarity index 96% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridLayer.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridLayer.kt index 1953c3a..e6e465a 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridLayer.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridLayer.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.design +package band.effective.compose.drawer_modules.design import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.fillMaxSize diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridStateConfig.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridStateConfig.kt similarity index 90% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridStateConfig.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridStateConfig.kt index ce6651f..61536e1 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DebugGridStateConfig.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DebugGridStateConfig.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.design +package band.effective.compose.drawer_modules.design import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DesignModule.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DesignModule.kt similarity index 95% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DesignModule.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DesignModule.kt index accef15..e90fa0a 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/design/DesignModule.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/design/DesignModule.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.design +package band.effective.compose.drawer_modules.design import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Column @@ -15,8 +15,8 @@ import androidx.compose.material.icons.filled.GridOn import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import effective.band.drawer_base.DebugDrawerModule -import effective.band.drawer_base.actions.SwitchAction +import band.effective.drawer_base.DebugDrawerModule +import band.effective.drawer_base.actions.SwitchAction import kotlin.math.roundToInt @Composable diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/leak/LeakCanaryActions.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/leak/LeakCanaryActions.kt similarity index 94% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/leak/LeakCanaryActions.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/leak/LeakCanaryActions.kt index 4bb8556..3424740 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/leak/LeakCanaryActions.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/leak/LeakCanaryActions.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.leak +package band.effective.compose.drawer_modules.leak import android.content.Context import android.content.Context.MODE_PRIVATE diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/leak/LeakCanaryModule.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/leak/LeakCanaryModule.kt similarity index 69% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/leak/LeakCanaryModule.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/leak/LeakCanaryModule.kt index bcecc0f..c802876 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/leak/LeakCanaryModule.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/leak/LeakCanaryModule.kt @@ -1,15 +1,20 @@ -package effective.band.compose.drawer_modules.leak +package band.effective.compose.drawer_modules.leak import androidx.compose.material.Icon -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import effective.band.compose.drawer_modules.R -import effective.band.drawer_base.ActionsModule -import effective.band.drawer_base.actions.ButtonAction -import effective.band.drawer_base.actions.SwitchAction +import band.effective.compose.drawer_modules.R +import band.effective.drawer_base.ActionsModule +import band.effective.drawer_base.actions.ButtonAction +import band.effective.drawer_base.actions.SwitchAction import leakcanary.LeakCanary @Composable diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/HttpLogger.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/HttpLogger.kt similarity index 97% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/HttpLogger.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/HttpLogger.kt index 8de6f77..ca9a54f 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/HttpLogger.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/HttpLogger.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.okhttp +package band.effective.compose.drawer_modules.okhttp import android.content.Context import android.content.Context.MODE_PRIVATE diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/HttpLoggerActions.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/HttpLoggerActions.kt similarity index 86% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/HttpLoggerActions.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/HttpLoggerActions.kt index cbd440d..f4f3c49 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/HttpLoggerActions.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/HttpLoggerActions.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.okhttp +package band.effective.compose.drawer_modules.okhttp import okhttp3.logging.HttpLoggingInterceptor diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/OkHttpLoggerModule.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/OkHttpLoggerModule.kt similarity index 76% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/OkHttpLoggerModule.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/OkHttpLoggerModule.kt index 6819d26..a1c6c2a 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/okhttp/OkHttpLoggerModule.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/okhttp/OkHttpLoggerModule.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.okhttp +package band.effective.compose.drawer_modules.okhttp import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -7,18 +7,22 @@ import androidx.compose.foundation.layout.width import androidx.compose.material.Icon import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Info -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import effective.band.compose.drawer_modules.R -import effective.band.compose.drawer_modules.timber.LogsAlertDialog -import effective.band.drawer_base.ActionsModule -import effective.band.drawer_base.MediumText -import effective.band.drawer_base.actions.ButtonAction -import effective.band.drawer_base.actions.DropdownSelectorAction +import band.effective.compose.drawer_modules.timber.LogsAlertDialog +import band.effective.drawer_base.ActionsModule +import band.effective.drawer_base.MediumText +import band.effective.drawer_base.actions.ButtonAction +import band.effective.drawer_base.actions.DropdownSelectorAction import okhttp3.logging.HttpLoggingInterceptor +import band.effective.compose.drawer_modules.R @Composable fun OkHttpLoggerModule(modifier: Modifier, httpLogger: HttpLogger) { diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/DebugRetrofitConfig.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/DebugRetrofitConfig.kt similarity index 99% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/DebugRetrofitConfig.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/DebugRetrofitConfig.kt index adb3ad4..b9946f1 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/DebugRetrofitConfig.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/DebugRetrofitConfig.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.retrofit +package band.effective.compose.drawer_modules.retrofit import android.content.Context import android.content.Context.MODE_PRIVATE diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/Endpoint.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/Endpoint.kt similarity index 88% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/Endpoint.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/Endpoint.kt index 988af2a..7ef510c 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/Endpoint.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/Endpoint.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.retrofit +package band.effective.compose.drawer_modules.retrofit import retrofit2.mock.NetworkBehavior diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/NetworkParams.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/NetworkParams.kt similarity index 89% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/NetworkParams.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/NetworkParams.kt index 0fdd0c4..4909a46 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/NetworkParams.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/NetworkParams.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.retrofit +package band.effective.compose.drawer_modules.retrofit object NetworkParams { val varianceValues: List = listOf(20, 40, 60) diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/RetrofitModule.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/RetrofitModule.kt similarity index 96% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/RetrofitModule.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/RetrofitModule.kt index 8fed3e9..5fd6975 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/RetrofitModule.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/RetrofitModule.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.retrofit +package band.effective.compose.drawer_modules.retrofit import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -12,10 +12,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import effective.band.compose.drawer_modules.R -import effective.band.drawer_base.ActionsModule -import effective.band.drawer_base.MediumText -import effective.band.drawer_base.actions.DropdownSelectorAction +import band.effective.drawer_base.ActionsModule +import band.effective.drawer_base.MediumText +import band.effective.drawer_base.actions.DropdownSelectorAction +import band.effective.compose.drawer_modules.R /** * Uses a [DebugRetrofitConfig] to display controls to modify the behaviour of diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/RetrofitModuleUtils.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/RetrofitModuleUtils.kt similarity index 92% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/RetrofitModuleUtils.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/RetrofitModuleUtils.kt index 08da98a..9374dd2 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/retrofit/RetrofitModuleUtils.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/retrofit/RetrofitModuleUtils.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.retrofit +package band.effective.compose.drawer_modules.retrofit import android.annotation.SuppressLint import android.content.SharedPreferences diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/DebugDrawerTimberFileProvider.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/DebugDrawerTimberFileProvider.kt similarity index 85% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/DebugDrawerTimberFileProvider.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/DebugDrawerTimberFileProvider.kt index 673d9aa..3c0e8c5 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/DebugDrawerTimberFileProvider.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/DebugDrawerTimberFileProvider.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.timber +package band.effective.compose.drawer_modules.timber import androidx.core.content.FileProvider diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/Entry.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/Entry.kt similarity index 94% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/Entry.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/Entry.kt index 27d31c4..d6db02f 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/Entry.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/Entry.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.timber +package band.effective.compose.drawer_modules.timber import android.util.Log import androidx.compose.ui.graphics.Color diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LogsAlertDialog.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LogsAlertDialog.kt similarity index 99% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LogsAlertDialog.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LogsAlertDialog.kt index 9e1eb7b..64a06a6 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LogsAlertDialog.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LogsAlertDialog.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.timber +package band.effective.compose.drawer_modules.timber import android.content.Context import android.content.Intent diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LumberYard.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LumberYard.kt similarity index 98% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LumberYard.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LumberYard.kt index ec9ea77..5a24954 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LumberYard.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LumberYard.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.timber +package band.effective.compose.drawer_modules.timber import android.app.Application import android.os.AsyncTask diff --git a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LumberYardInstaller.kt b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LumberYardInstaller.kt similarity index 94% rename from drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LumberYardInstaller.kt rename to drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LumberYardInstaller.kt index f78df4a..e2c88a5 100644 --- a/drawer-modules/src/main/kotlin/effective/band/compose/drawer_modules/timber/LumberYardInstaller.kt +++ b/drawer-modules/src/main/kotlin/band/effective/compose/drawer_modules/timber/LumberYardInstaller.kt @@ -1,4 +1,4 @@ -package effective.band.compose.drawer_modules.timber +package band.effective.compose.drawer_modules.timber import android.app.Application import android.content.ContentProvider diff --git a/settings.gradle.kts b/settings.gradle.kts index 90c8d9b..38d004c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ dependencyResolutionManagement { mavenCentral() gradlePluginPortal() maven { - url = uri("https://effective-android.bytesafe.dev/maven/drawer/") + url = uri("https://repsy.io/mvn/effective/compose-debug-drawer/") } } }