Merge pull request #61 from leandroBorgesFerreira/Sample_ModulesSepar…

…ation

Sample modules separation

app_sample/build.gradle.kts → sample/app_sample/build.gradle.kts

@@ -43,7 +43,7 @@ android {
 kotlin{
     sourceSets.all {
         languageSettings {
-            languageVersion = "1.9"
+            languageVersion = "1.8"
         }
     }
 }
@@ -55,37 +55,43 @@ dependencies {
     implementation(project(":storyteller"))
     implementation(project(":storyteller_persistence"))
 
+    implementation(project(":sample:note_menu"))
+    implementation(project(":sample:utils"))
+    implementation(project(":sample:resources"))
+    implementation(project(":sample:editor"))
+
     implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.9.0")
 
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1")
-    implementation("androidx.activity:activity-compose")
-    implementation("androidx.compose.material:material-icons-extended:1.4.3")
-    implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
-
-    implementation("io.coil-kt:coil-compose:$coilVersion")
-    implementation("io.coil-kt:coil-video:$coilVersion")
-
-    val roomVersion = "2.5.1"
+    val roomVersion = "2.5.2"
 
     implementation("androidx.room:room-runtime:$roomVersion")
     implementation("androidx.room:room-ktx:$roomVersion")
     implementation("androidx.room:room-paging:$roomVersion")
     ksp("androidx.room:room-compiler:$roomVersion")
 
+    implementation("io.coil-kt:coil-compose:$coilVersion")
+    implementation("io.coil-kt:coil-video:$coilVersion")
+
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1")
+    implementation("androidx.navigation:navigation-compose:2.6.0")
+    implementation("androidx.activity:activity-compose")
+    implementation("androidx.compose.material:material-icons-extended:1.4.3")
+
     implementation("androidx.compose.material3:material3")
     implementation("androidx.compose.material3:material3-window-size-class")
 
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 
     // Compose - Preview
     implementation("androidx.compose.ui:ui-tooling-preview")
     debugImplementation("androidx.compose.ui:ui-tooling")
 
     val composeBom = platform("androidx.compose:compose-bom:2023.06.00")
     implementation(composeBom)
+
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }

app_sample/src/main/java/br/com/leandroferreira/app_sample/navigation/NavigationActivity.kt → sample/app_sample/src/main/java/br/com/leandroferreira/app_sample/navigation/NavigationActivity.kt

@@ -12,13 +12,13 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
-import br.com.leandroferreira.app_sample.screens.menu.NotesUseCase
-import br.com.leandroferreira.app_sample.screens.menu.ui.screen.ChooseNoteScreen
-import br.com.leandroferreira.app_sample.screens.menu.viewmodel.ChooseNoteViewModel
-import br.com.leandroferreira.app_sample.screens.note.NoteDetailsScreen
-import br.com.leandroferreira.app_sample.screens.note.NoteDetailsViewModel
-import br.com.leandroferreira.app_sample.screens.note.NoteDetailsViewModelFactory
 import br.com.leandroferreira.app_sample.theme.ApplicationComposeTheme
+import br.com.leandroferreira.editor.NoteDetailsScreen
+import br.com.leandroferreira.editor.NoteDetailsViewModel
+import br.com.leandroferreira.editor.NoteDetailsViewModelFactory
+import br.com.leandroferreira.note_menu.data.usecase.NotesUseCase
+import br.com.leandroferreira.note_menu.ui.screen.ChooseNoteScreen
+import br.com.leandroferreira.note_menu.viewmodel.ChooseNoteViewModel
 import com.github.leandroborgesferreira.storyteller.manager.StoryTellerManager
 import com.github.leandroborgesferreira.storyteller.persistence.database.StoryTellerDatabase
 import com.github.leandroborgesferreira.storyteller.persistence.repository.DocumentRepositoryImpl
@@ -88,7 +88,6 @@ fun NavigationGraph() {
                         )
 
                     NoteDetailsScreen(
-
                         noteId.takeIf { it != "null" },
                         noteTitle.takeIf { it != "null" },
                         noteDetailsViewModel,

sample/app_sample/src/main/res/values/strings.xml

@@ -0,0 +1,2 @@
+<resources>
+</resources>

sample/editor/.gitignore

@@ -0,0 +1 @@
+/build

sample/editor/build.gradle.kts

@@ -0,0 +1,70 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "br.com.leandroferreira.editor"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.7"
+    }
+}
+
+dependencies {
+    implementation(project(":storyteller"))
+    implementation(project(":storyteller_persistence"))
+    implementation(project(":sample:resources"))
+    implementation(project(":sample:utils"))
+
+    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.9.0")
+
+    implementation("androidx.navigation:navigation-compose:2.6.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1")
+    implementation("androidx.activity:activity-compose")
+    implementation("androidx.compose.material:material-icons-extended:1.4.3")
+
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material3:material3-window-size-class")
+
+    // Compose - Preview
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+
+    val composeBom = platform("androidx.compose:compose-bom:2023.06.00")
+    implementation(composeBom)
+
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}

sample/editor/proguard-rules.pro

@@ -0,0 +1,21 @@
+# 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

sample/editor/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

app_sample/src/main/java/br/com/leandroferreira/app_sample/screens/note/NoteDetailsScreen.kt → sample/editor/src/main/java/br/com/leandroferreira/editor/NoteDetailsScreen.kt

@@ -1,4 +1,4 @@
-package br.com.leandroferreira.app_sample.screens.note
+package br.com.leandroferreira.editor
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ExperimentalAnimationApi
@@ -9,7 +9,6 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.with
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxSize
@@ -44,10 +43,8 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.rememberNavController
-import br.com.leandroferreira.app_sample.R
-import br.com.leandroferreira.app_sample.screens.note.input.InputScreen
-import br.com.leandroferreira.app_sample.theme.BACKGROUND_VARIATION
-import br.com.leandroferreira.app_sample.theme.BACKGROUND_VARIATION_DARK
+import br.com.leandroferreira.editor.input.InputScreen
+import br.com.leandroferreira.resourcers.R
 import com.github.leandroborgesferreira.storyteller.StoryTellerEditor
 import com.github.leandroborgesferreira.storyteller.drawer.DefaultDrawers
 import com.github.leandroborgesferreira.storyteller.uicomponents.EditionScreen
@@ -142,11 +139,7 @@ fun ColumnScope.TextEditor(noteDetailsViewModel: NoteDetailsViewModel) {
         drawers = DefaultDrawers.create(
             editable,
             noteDetailsViewModel.storyTellerManager,
-            groupsBackgroundColor = if (isSystemInDarkTheme()) {
-                BACKGROUND_VARIATION_DARK
-            } else {
-                BACKGROUND_VARIATION
-            }
+            groupsBackgroundColor = MaterialTheme.colorScheme.surface
         )
     )
 }

app_sample/src/main/java/br/com/leandroferreira/app_sample/screens/note/NoteDetailsViewModel.kt → sample/editor/src/main/java/br/com/leandroferreira/editor/NoteDetailsViewModel.kt

@@ -1,4 +1,4 @@
-package br.com.leandroferreira.app_sample.screens.note
+package br.com.leandroferreira.editor
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider

app_sample/src/main/java/br/com/leandroferreira/app_sample/screens/note/input/InputScreen.kt → sample/editor/src/main/java/br/com/leandroferreira/editor/input/InputScreen.kt

@@ -1,4 +1,4 @@
-package br.com.leandroferreira.app_sample.screens.note.input
+package br.com.leandroferreira.editor.input
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -24,7 +24,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import br.com.leandroferreira.app_sample.R
+import br.com.leandroferreira.resourcers.R
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 

sample/note_menu/.gitignore

@@ -0,0 +1 @@
+/build