From 7bb1fd6947828231af658765fd39d9b57c8e754a Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 22 Sep 2020 04:20:25 +0530 Subject: [PATCH] all: refactor package structure and naming Signed-off-by: Harsh Shandilya --- app/build.gradle | 2 +- .../{todo => lobsters}/MainActivityTest.kt | 6 +- app/src/main/AndroidManifest.xml | 6 +- .../{todo => lobsters}/Application.kt | 2 +- .../{todo => lobsters}/MainActivity.kt | 14 ++-- .../compose/utils/DeferredIcon.kt | 2 +- .../di/PersistenceModule.kt | 4 +- .../di/UrlLauncherModule.kt | 6 +- .../ui/AnimatedSwipeDismiss.kt | 2 +- .../{todo => lobsters}/ui/ListContent.kt | 4 +- .../{todo => lobsters}/ui/TodoRow.kt | 4 +- .../{todo => lobsters}/ui/TodoTheme.kt | 2 +- .../urllauncher/UrlLauncher.kt | 2 +- .../urllauncher/UrlLauncherImpl.kt | 2 +- .../dev/msfjarvis/todo/ui/WireGuardItem.kt | 64 ------------------- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 8 +-- .../{todo => lobsters}/data/model/TodoItem.kt | 2 +- .../data/source/DateTimeTypeConverters.kt | 2 +- .../data/source/TodoDatabase.kt | 4 +- .../data/source/TodoItemDao.kt | 4 +- settings.gradle | 2 +- 23 files changed, 42 insertions(+), 106 deletions(-) rename app/src/androidTest/java/dev/msfjarvis/{todo => lobsters}/MainActivityTest.kt (94%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/Application.kt (80%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/MainActivity.kt (93%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/compose/utils/DeferredIcon.kt (96%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/di/PersistenceModule.kt (85%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/di/UrlLauncherModule.kt (74%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/ui/AnimatedSwipeDismiss.kt (98%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/ui/ListContent.kt (95%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/ui/TodoRow.kt (93%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/ui/TodoTheme.kt (96%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/urllauncher/UrlLauncher.kt (55%) rename app/src/main/java/dev/msfjarvis/{todo => lobsters}/urllauncher/UrlLauncherImpl.kt (90%) delete mode 100644 app/src/main/java/dev/msfjarvis/todo/ui/WireGuardItem.kt rename data/src/main/java/dev/msfjarvis/{todo => lobsters}/data/model/TodoItem.kt (86%) rename data/src/main/java/dev/msfjarvis/{todo => lobsters}/data/source/DateTimeTypeConverters.kt (96%) rename data/src/main/java/dev/msfjarvis/{todo => lobsters}/data/source/TodoDatabase.kt (78%) rename data/src/main/java/dev/msfjarvis/{todo => lobsters}/data/source/TodoItemDao.kt (90%) diff --git a/app/build.gradle b/app/build.gradle index 76efb824..4abbbe0d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ plugins { android { defaultConfig { - applicationId "dev.msfjarvis.todo" + applicationId "dev.msfjarvis.lobsters" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/androidTest/java/dev/msfjarvis/todo/MainActivityTest.kt b/app/src/androidTest/java/dev/msfjarvis/lobsters/MainActivityTest.kt similarity index 94% rename from app/src/androidTest/java/dev/msfjarvis/todo/MainActivityTest.kt rename to app/src/androidTest/java/dev/msfjarvis/lobsters/MainActivityTest.kt index 6966327d..be23fdb9 100644 --- a/app/src/androidTest/java/dev/msfjarvis/todo/MainActivityTest.kt +++ b/app/src/androidTest/java/dev/msfjarvis/lobsters/MainActivityTest.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo +package dev.msfjarvis.lobsters import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -8,8 +8,8 @@ import androidx.ui.test.onNodeWithTag import androidx.ui.test.onNodeWithText import androidx.ui.test.performClick import androidx.ui.test.performTextInput -import dev.msfjarvis.todo.data.model.TodoItem -import dev.msfjarvis.todo.ui.TodoTheme +import dev.msfjarvis.lobsters.data.model.TodoItem +import dev.msfjarvis.lobsters.ui.TodoTheme import org.junit.Ignore import org.junit.Rule import org.junit.Test diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a2915cbf..bc8152c0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="dev.msfjarvis.lobsters"> + android:theme="@style/Theme.Lobsters"> + android:theme="@style/Theme.Lobsters.NoActionBar"> diff --git a/app/src/main/java/dev/msfjarvis/todo/Application.kt b/app/src/main/java/dev/msfjarvis/lobsters/Application.kt similarity index 80% rename from app/src/main/java/dev/msfjarvis/todo/Application.kt rename to app/src/main/java/dev/msfjarvis/lobsters/Application.kt index 4ff3cad9..f59583cc 100644 --- a/app/src/main/java/dev/msfjarvis/todo/Application.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/Application.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo +package dev.msfjarvis.lobsters import android.app.Application import dagger.hilt.android.HiltAndroidApp diff --git a/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt similarity index 93% rename from app/src/main/java/dev/msfjarvis/todo/MainActivity.kt rename to app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt index ed4447e9..3a25555a 100644 --- a/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo +package dev.msfjarvis.lobsters import android.os.Bundle import androidx.appcompat.app.AppCompatActivity @@ -30,12 +30,12 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp import androidx.ui.tooling.preview.Preview import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.todo.compose.utils.IconResource -import dev.msfjarvis.todo.data.model.TodoItem -import dev.msfjarvis.todo.data.source.TodoDatabase -import dev.msfjarvis.todo.ui.ListContent -import dev.msfjarvis.todo.ui.TodoTheme -import dev.msfjarvis.todo.urllauncher.UrlLauncher +import dev.msfjarvis.lobsters.compose.utils.IconResource +import dev.msfjarvis.lobsters.data.model.TodoItem +import dev.msfjarvis.lobsters.data.source.TodoDatabase +import dev.msfjarvis.lobsters.ui.ListContent +import dev.msfjarvis.lobsters.ui.TodoTheme +import dev.msfjarvis.lobsters.urllauncher.UrlLauncher import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/dev/msfjarvis/todo/compose/utils/DeferredIcon.kt b/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt similarity index 96% rename from app/src/main/java/dev/msfjarvis/todo/compose/utils/DeferredIcon.kt rename to app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt index 99b6023a..73c0f126 100644 --- a/app/src/main/java/dev/msfjarvis/todo/compose/utils/DeferredIcon.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.msfjarvis.todo.compose.utils +package dev.msfjarvis.lobsters.compose.utils import androidx.annotation.DrawableRes import androidx.compose.foundation.Icon diff --git a/app/src/main/java/dev/msfjarvis/todo/di/PersistenceModule.kt b/app/src/main/java/dev/msfjarvis/lobsters/di/PersistenceModule.kt similarity index 85% rename from app/src/main/java/dev/msfjarvis/todo/di/PersistenceModule.kt rename to app/src/main/java/dev/msfjarvis/lobsters/di/PersistenceModule.kt index 28974b7b..9358ff9f 100644 --- a/app/src/main/java/dev/msfjarvis/todo/di/PersistenceModule.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/di/PersistenceModule.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.di +package dev.msfjarvis.lobsters.di import android.content.Context import androidx.room.Room @@ -7,7 +7,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.todo.data.source.TodoDatabase +import dev.msfjarvis.lobsters.data.source.TodoDatabase @InstallIn(SingletonComponent::class) @Module diff --git a/app/src/main/java/dev/msfjarvis/todo/di/UrlLauncherModule.kt b/app/src/main/java/dev/msfjarvis/lobsters/di/UrlLauncherModule.kt similarity index 74% rename from app/src/main/java/dev/msfjarvis/todo/di/UrlLauncherModule.kt rename to app/src/main/java/dev/msfjarvis/lobsters/di/UrlLauncherModule.kt index 806aba97..135a2091 100644 --- a/app/src/main/java/dev/msfjarvis/todo/di/UrlLauncherModule.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/di/UrlLauncherModule.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.di +package dev.msfjarvis.lobsters.di import android.content.Context import dagger.Module @@ -6,8 +6,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.components.ActivityComponent import dagger.hilt.android.qualifiers.ActivityContext -import dev.msfjarvis.todo.urllauncher.UrlLauncher -import dev.msfjarvis.todo.urllauncher.UrlLauncherImpl +import dev.msfjarvis.lobsters.urllauncher.UrlLauncher +import dev.msfjarvis.lobsters.urllauncher.UrlLauncherImpl @InstallIn(ActivityComponent::class) @Module diff --git a/app/src/main/java/dev/msfjarvis/todo/ui/AnimatedSwipeDismiss.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/AnimatedSwipeDismiss.kt similarity index 98% rename from app/src/main/java/dev/msfjarvis/todo/ui/AnimatedSwipeDismiss.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/AnimatedSwipeDismiss.kt index ee3c775c..d9298948 100644 --- a/app/src/main/java/dev/msfjarvis/todo/ui/AnimatedSwipeDismiss.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/AnimatedSwipeDismiss.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.ui +package dev.msfjarvis.lobsters.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.EnterTransition diff --git a/app/src/main/java/dev/msfjarvis/todo/ui/ListContent.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/ListContent.kt similarity index 95% rename from app/src/main/java/dev/msfjarvis/todo/ui/ListContent.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/ListContent.kt index a0c6a70e..b214cbce 100644 --- a/app/src/main/java/dev/msfjarvis/todo/ui/ListContent.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/ListContent.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.ui +package dev.msfjarvis.lobsters.ui import androidx.compose.animation.animate import androidx.compose.foundation.Box @@ -17,7 +17,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import dev.msfjarvis.todo.data.model.TodoItem +import dev.msfjarvis.lobsters.data.model.TodoItem @Composable fun ListContent( diff --git a/app/src/main/java/dev/msfjarvis/todo/ui/TodoRow.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/TodoRow.kt similarity index 93% rename from app/src/main/java/dev/msfjarvis/todo/ui/TodoRow.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/TodoRow.kt index 3a85aa1d..4901ab85 100644 --- a/app/src/main/java/dev/msfjarvis/todo/ui/TodoRow.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/TodoRow.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.ui +package dev.msfjarvis.lobsters.ui import androidx.compose.foundation.Text import androidx.compose.foundation.clickable @@ -14,7 +14,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import dev.msfjarvis.todo.data.model.TodoItem +import dev.msfjarvis.lobsters.data.model.TodoItem @Composable fun LazyItemScope.TodoRowItem( diff --git a/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/TodoTheme.kt similarity index 96% rename from app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/TodoTheme.kt index c31dc5a7..5d5035a4 100644 --- a/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/TodoTheme.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.ui +package dev.msfjarvis.lobsters.ui import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material.MaterialTheme diff --git a/app/src/main/java/dev/msfjarvis/todo/urllauncher/UrlLauncher.kt b/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncher.kt similarity index 55% rename from app/src/main/java/dev/msfjarvis/todo/urllauncher/UrlLauncher.kt rename to app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncher.kt index 16002181..5fc0c4e8 100644 --- a/app/src/main/java/dev/msfjarvis/todo/urllauncher/UrlLauncher.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncher.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.urllauncher +package dev.msfjarvis.lobsters.urllauncher interface UrlLauncher { fun launch(url: String) diff --git a/app/src/main/java/dev/msfjarvis/todo/urllauncher/UrlLauncherImpl.kt b/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt similarity index 90% rename from app/src/main/java/dev/msfjarvis/todo/urllauncher/UrlLauncherImpl.kt rename to app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt index 67c5b98c..b37e29cd 100644 --- a/app/src/main/java/dev/msfjarvis/todo/urllauncher/UrlLauncherImpl.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.todo.urllauncher +package dev.msfjarvis.lobsters.urllauncher import android.content.Context import android.content.Intent diff --git a/app/src/main/java/dev/msfjarvis/todo/ui/WireGuardItem.kt b/app/src/main/java/dev/msfjarvis/todo/ui/WireGuardItem.kt deleted file mode 100644 index 38831de0..00000000 --- a/app/src/main/java/dev/msfjarvis/todo/ui/WireGuardItem.kt +++ /dev/null @@ -1,64 +0,0 @@ -package dev.msfjarvis.todo.ui - -import androidx.compose.foundation.Text -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyItemScope -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Card -import androidx.compose.material.ListItem -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Switch -import androidx.compose.material.ripple.RippleIndication -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.text.TextStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import dev.msfjarvis.todo.data.model.TodoItem - -@Suppress("Unused") -@Composable -fun LazyItemScope.WireGuardItem(item: TodoItem) { - var checked by remember { mutableStateOf(false) } - Row( - modifier = Modifier - .padding(vertical = 8.dp) - .fillParentMaxWidth(), - ) { - Card( - shape = RoundedCornerShape(8.dp), - modifier = Modifier - .clickable(onClick = { checked = !checked }, indication = RippleIndication()) - .fillParentMaxWidth(), - backgroundColor = MaterialTheme.colors.secondary - ) { - ListItem( - text = { - Text( - text = item.title, - style = TextStyle( - fontSize = 20.sp, - textAlign = TextAlign.Left - ), - modifier = Modifier.padding(horizontal = 8.dp, vertical = 16.dp), - color = MaterialTheme.colors.onSecondary - ) - }, - trailing = { - Switch( - checked = checked, - onCheckedChange = { checked = it }, - color = MaterialTheme.colors.onSecondary, - ) - }, - ) - } - } -} diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index f4111761..e7c6378c 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ - - -