added proguard-rules.pro and first alpha release

T8RIN · Mar 13, 2022 · 5d83cef · 5d83cef
1 parent a59bf5b
commit 5d83cef
Show file tree

Hide file tree

Showing 26 changed files with 86 additions and 102 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -54,16 +54,14 @@ android {
 
 dependencies {
 
+    //Android Essentials
     implementation("androidx.core:core-ktx:1.7.0")
     implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("com.google.android.material:material:1.6.0-alpha03")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
-
-    // Retrofit
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.squareup.okhttp3:okhttp:4.9.3")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.9.2")
+    implementation("androidx.window:window:1.0.0")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.4.1")
+    implementation("androidx.navigation:navigation-ui-ktx:2.4.1")
 
     // Coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
@@ -75,18 +73,7 @@ dependencies {
 
     //Dagger - Hilt
     implementation("com.google.dagger:hilt-android:2.38.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.hilt:hilt-navigation-fragment:1.0.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.4.1")
-    implementation("androidx.navigation:navigation-ui-ktx:2.4.1")
-    implementation("com.google.firebase:firebase-auth-ktx:21.0.1")
-    implementation("com.google.android.gms:play-services-auth:20.1.0")
-    implementation("com.google.firebase:firebase-database-ktx:20.0.3")
-    implementation("com.google.firebase:firebase-storage-ktx:20.0.0")
-    implementation("androidx.window:window:1.0.0-alpha09")
-    annotationProcessor("androidx.room:room-compiler:2.4.2")
-    implementation("androidx.room:room-common:2.4.2")
     kapt("com.google.dagger:hilt-android-compiler:2.38.1")
     implementation("androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03")
     kapt("androidx.hilt:hilt-compiler:1.0.0")
@@ -99,14 +86,19 @@ dependencies {
     implementation("androidx.activity:activity-compose:1.4.0")
     implementation("androidx.compose.ui:ui:1.2.0-alpha05")
     implementation("androidx.compose.ui:ui-tooling-preview:1.2.0-alpha05")
-    implementation("androidx.compose.material3:material3:1.0.0-alpha06")
+    implementation("androidx.compose.material3:material3:1.0.0-alpha07")
     implementation("androidx.compose.material:material:1.2.0-alpha05")
     implementation("androidx.compose.material:material-icons-core:1.1.1")
     implementation("androidx.compose.material:material-icons-extended:1.1.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0-alpha03")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0-alpha04")
     implementation("androidx.navigation:navigation-compose:2.5.0-alpha03")
     implementation("androidx.constraintlayout:constraintlayout-compose:1.0.0")
 
+    //Accompanist
+    implementation("com.google.accompanist:accompanist-systemuicontroller:0.24.2-alpha")
+    implementation("com.google.accompanist:accompanist-insets:0.24.2-alpha")
+    implementation("com.google.accompanist:accompanist-flowlayout:0.24.2-alpha")
+
     //Tests
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
@@ -123,7 +115,18 @@ dependencies {
     implementation("io.coil-kt:coil:2.0.0-rc01")
     implementation("io.coil-kt:coil-compose:2.0.0-rc01")
 
-
+    //Firebase
+    implementation("com.google.firebase:firebase-auth-ktx:21.0.2")
+    implementation("com.google.android.gms:play-services-auth:20.1.0")
+    implementation("com.google.firebase:firebase-database-ktx:20.0.4")
+    implementation("com.google.firebase:firebase-storage-ktx:20.0.1")
+
+//    //Retrofit
+//    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+//    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
+//    implementation("com.squareup.okhttp3:okhttp:4.9.3")
+//    implementation("com.squareup.okhttp3:logging-interceptor:4.9.2")
+//
 //    Koin
 //    implementation("io.insert-koin:koin-android:3.1.5")
 //    implementation("io.insert-koin:koin-androidx-workmanager:3.1.5")
@@ -135,9 +138,4 @@ dependencies {
 //    androidTestImplementation("androidx.work:work-testing:2.7.1")
 //    implementation("androidx.work:work-multiprocess:2.7.1")
 
-    //Accompanist
-    implementation("com.google.accompanist:accompanist-systemuicontroller:0.24.2-alpha")
-    implementation("com.google.accompanist:accompanist-insets:0.24.2-alpha")
-    implementation("com.google.accompanist:accompanist-flowlayout:0.24.2-alpha")
-
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,21 +1,2 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
-#
-# 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
+-keep class com.google.android.gms.** { *; }
+-keep class com.google.firebase.** { *; }
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "ru.tech.firenote",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/src/main/java/ru/tech/firenote/MainActivity.kt b/app/src/main/java/ru/tech/firenote/MainActivity.kt
@@ -34,13 +34,15 @@ import androidx.core.view.WindowCompat
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.insets.ProvideWindowInsets
 import dagger.hilt.android.AndroidEntryPoint
-import ru.tech.firenote.model.Screen
 import ru.tech.firenote.ui.composable.navigation.Navigation
 import ru.tech.firenote.ui.composable.provider.LocalSnackbarHost
 import ru.tech.firenote.ui.composable.provider.LocalWindowSize
 import ru.tech.firenote.ui.composable.screen.NoteCreationScreen
 import ru.tech.firenote.ui.composable.screen.auth.AuthScreen
 import ru.tech.firenote.ui.composable.single.*
+import ru.tech.firenote.ui.composable.utils.WindowSize
+import ru.tech.firenote.ui.composable.utils.rememberWindowSizeClass
+import ru.tech.firenote.ui.route.Screen
 import ru.tech.firenote.ui.theme.FirenoteTheme
 import ru.tech.firenote.viewModel.MainViewModel
 import kotlin.math.min
@@ -292,6 +294,7 @@ class MainActivity : ComponentActivity() {
                                 dismissText = R.string.close,
                                 dismissAction = { finishAffinity() }
                             )
+
                         }
                     }
                 }

diff --git a/app/src/main/java/ru/tech/firenote/model/ImageUri.kt b/app/src/main/java/ru/tech/firenote/model/ImageUri.kt
@@ -1,8 +1,8 @@
 package ru.tech.firenote.model
 
+import androidx.annotation.Keep
 import com.google.firebase.database.IgnoreExtraProperties
 
+@Keep
 @IgnoreExtraProperties
-data class ImageUri(
-    val uri: String? = null
-)
+data class ImageUri(val uri: String? = null)
diff --git a/app/src/main/java/ru/tech/firenote/model/Note.kt b/app/src/main/java/ru/tech/firenote/model/Note.kt
@@ -1,7 +1,9 @@
 package ru.tech.firenote.model
 
+import androidx.annotation.Keep
 import com.google.firebase.database.IgnoreExtraProperties
 
+@Keep
 @IgnoreExtraProperties
 data class Note(
     val title: String? = null,

diff --git a/app/src/main/java/ru/tech/firenote/model/Username.kt b/app/src/main/java/ru/tech/firenote/model/Username.kt
@@ -1,6 +1,8 @@
 package ru.tech.firenote.model
 
+import androidx.annotation.Keep
 import com.google.firebase.database.IgnoreExtraProperties
 
+@Keep
 @IgnoreExtraProperties
 data class Username(val username: String? = null)
diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/navigation/Navigation.kt b/app/src/main/java/ru/tech/firenote/ui/composable/navigation/Navigation.kt
@@ -7,10 +7,10 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import ru.tech.firenote.model.Screen
 import ru.tech.firenote.ui.composable.screen.base.AlarmListScreen
 import ru.tech.firenote.ui.composable.screen.base.NoteListScreen
 import ru.tech.firenote.ui.composable.screen.base.ProfileScreen
+import ru.tech.firenote.ui.route.Screen
 import ru.tech.firenote.viewModel.MainViewModel
 
 @Composable

diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/provider/LocalWindowSize.kt b/app/src/main/java/ru/tech/firenote/ui/composable/provider/LocalWindowSize.kt
@@ -1,6 +1,6 @@
 package ru.tech.firenote.ui.composable.provider
 
 import androidx.compose.runtime.compositionLocalOf
-import ru.tech.firenote.WindowSize
+import ru.tech.firenote.ui.composable.utils.WindowSize
 
 val LocalWindowSize = compositionLocalOf { WindowSize.Compact }
diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/AuthScreen.kt b/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/AuthScreen.kt
@@ -16,9 +16,9 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import ru.tech.firenote.R
-import ru.tech.firenote.WindowSize
-import ru.tech.firenote.model.Screen
 import ru.tech.firenote.ui.composable.provider.LocalWindowSize
+import ru.tech.firenote.ui.composable.utils.WindowSize
+import ru.tech.firenote.ui.route.Screen
 import ru.tech.firenote.viewModel.AuthViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -35,11 +35,11 @@ fun AuthScreen(visible: MutableState<Boolean>, viewModel: AuthViewModel = viewMo
             modifier = Modifier
                 .fillMaxSize()
                 .background(MaterialTheme.colorScheme.background)
+                .systemBarsPadding()
         ) {
             Column(
                 Modifier
-                    .fillMaxSize()
-                    .systemBarsPadding(),
+                    .fillMaxSize(),
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Top
             ) {

diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/ForgotPasswordScreen.kt b/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/ForgotPasswordScreen.kt
@@ -22,8 +22,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import ru.tech.firenote.R
-import ru.tech.firenote.model.Screen
 import ru.tech.firenote.ui.composable.single.MaterialTextField
+import ru.tech.firenote.ui.route.Screen
 import ru.tech.firenote.viewModel.AuthViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/LoginScreen.kt b/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/LoginScreen.kt
@@ -26,10 +26,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import ru.tech.firenote.R
-import ru.tech.firenote.model.Screen
-import ru.tech.firenote.model.UIState
 import ru.tech.firenote.ui.composable.single.MaterialTextField
 import ru.tech.firenote.ui.composable.single.Toast
+import ru.tech.firenote.ui.route.Screen
+import ru.tech.firenote.ui.state.UIState
 import ru.tech.firenote.viewModel.AuthViewModel
 
 

diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/RegistrationScreen.kt b/app/src/main/java/ru/tech/firenote/ui/composable/screen/auth/RegistrationScreen.kt
@@ -24,10 +24,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import ru.tech.firenote.R
-import ru.tech.firenote.model.Screen
-import ru.tech.firenote.model.UIState
 import ru.tech.firenote.ui.composable.single.MaterialTextField
 import ru.tech.firenote.ui.composable.single.Toast
+import ru.tech.firenote.ui.route.Screen
+import ru.tech.firenote.ui.state.UIState
 import ru.tech.firenote.viewModel.AuthViewModel
 
 

diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/screen/base/NoteListScreen.kt b/app/src/main/java/ru/tech/firenote/ui/composable/screen/base/NoteListScreen.kt
@@ -23,11 +23,11 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import ru.tech.firenote.R
 import ru.tech.firenote.model.Note
-import ru.tech.firenote.model.UIState
 import ru.tech.firenote.ui.composable.provider.LocalSnackbarHost
 import ru.tech.firenote.ui.composable.single.MaterialDialog
 import ru.tech.firenote.ui.composable.single.NoteItem
 import ru.tech.firenote.ui.composable.single.Toast
+import ru.tech.firenote.ui.state.UIState
 import ru.tech.firenote.ui.theme.priority
 import ru.tech.firenote.viewModel.NoteListViewModel
 

diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/screen/base/ProfileScreen.kt b/app/src/main/java/ru/tech/firenote/ui/composable/screen/base/ProfileScreen.kt
@@ -49,15 +49,15 @@ import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.google.accompanist.flowlayout.FlowRow
 import ru.tech.firenote.R
-import ru.tech.firenote.WindowSize
-import ru.tech.firenote.model.Screen
-import ru.tech.firenote.model.UIState
 import ru.tech.firenote.ui.composable.provider.LocalWindowSize
 import ru.tech.firenote.ui.composable.screen.auth.isValid
 import ru.tech.firenote.ui.composable.single.MaterialDialog
 import ru.tech.firenote.ui.composable.single.MaterialTextField
 import ru.tech.firenote.ui.composable.single.ProfileNoteItem
 import ru.tech.firenote.ui.composable.single.Toast
+import ru.tech.firenote.ui.composable.utils.WindowSize
+import ru.tech.firenote.ui.route.Screen
+import ru.tech.firenote.ui.state.UIState
 import ru.tech.firenote.ui.theme.noteColors
 import ru.tech.firenote.viewModel.ProfileViewModel
 

diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/single/BottomNavigationBar.kt b/app/src/main/java/ru/tech/firenote/ui/composable/single/BottomNavigationBar.kt
@@ -7,7 +7,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavHostController
-import ru.tech.firenote.model.Screen
+import ru.tech.firenote.ui.route.Screen
 
 @Composable
 fun BottomNavigationBar(

diff --git a/.../main/java/ru/tech/firenote/WindowSize.kt → ...irenote/ui/composable/utils/WindowSize.kt b/.../main/java/ru/tech/firenote/WindowSize.kt → ...irenote/ui/composable/utils/WindowSize.kt
@@ -1,4 +1,4 @@
-package ru.tech.firenote
+package ru.tech.firenote.ui.composable.utils
 
 import android.app.Activity
 import androidx.compose.runtime.Composable
@@ -11,11 +11,11 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.window.layout.WindowMetricsCalculator
 
-
 /**
  * Opinionated set of viewport breakpoints
+ *
  *     - Compact: Most phones in portrait mode
- *     - Medium: Most foldables and tablets in portrait mode
+ *     - Medium: Most fold devices and tablets in portrait mode
  *     - Expanded: Most tablets in landscape mode
  *
  */

diff --git a/...ain/java/ru/tech/firenote/model/Screen.kt → .../java/ru/tech/firenote/ui/route/Screen.kt b/...ain/java/ru/tech/firenote/model/Screen.kt → .../java/ru/tech/firenote/ui/route/Screen.kt
@@ -1,4 +1,4 @@
-package ru.tech.firenote.model
+package ru.tech.firenote.ui.route
 
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons

diff --git a/...in/java/ru/tech/firenote/model/UIState.kt → ...java/ru/tech/firenote/ui/state/UIState.kt b/...in/java/ru/tech/firenote/model/UIState.kt → ...java/ru/tech/firenote/ui/state/UIState.kt
@@ -1,4 +1,4 @@
-package ru.tech.firenote.model
+package ru.tech.firenote.ui.state
 
 sealed class UIState {
     class Empty(var message: String? = null) : UIState()