Merge pull request #8 from developer-kaczmarek/feature/compose_version

Версия 3.0:
- Обновлен дизайн;
- Добавлена возможность настройки темы приложения;
- Добавлена кнопка реестра на Главном экране для просмотра деталей сессии без сохранения в историю;
- Добавили экран Детализации сессии, в котором отображается общая сумма, общее количество купюр и информация по конкретным номиналам;
- Добавлена раздел Политика конфиденциальности;

Author: developer-kaczmarek

README.md

@@ -1,5 +1,5 @@
 # Калькулятор купюр
-[![LICENSE](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/images/downloads.svg)](https://play.google.com/store/apps/details?id=kaczmarek.moneycalculator ) [![LICENSE](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/images/license-GPLv3-blue.svg)](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/LICENSE)
+[![LICENSE](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/images/license-GPLv3-blue.svg)](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/LICENSE)
 
 "Калькулятор купюр" - удобное приложение, предназначенное для подсчета наличности в кассе или сейфе и значительно облегчающее работу кассира. В новой версии добавлена история подсчетов.
 
@@ -11,7 +11,8 @@
 * [Версия 1.2](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/downloads/money_calculator_v1_2.apk)
 
 ## Как это выглядит?
-![UI](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/images/UI.png)
+![UI](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/images/UI_V3.png)
+![UI_THEMES](https://github.com/developer-kaczmarek/MoneyCalculator/blob/master/images/UI_V3_THEMES.png)
 
 ## Баги / Вопросы /  Предложения
 

app/build.gradle

@@ -1,22 +1,27 @@
-apply plugin: 'com.android.application'
-
-apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
-
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlinx-serialization'
+    id 'kotlin-parcelize'
+    id 'kotlin-kapt'
+}
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdk target_sdk_version
+
     defaultConfig {
         applicationId "kaczmarek.moneycalculator"
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 4
-        versionName "2.0"
+        minSdk min_sdk_version
+        targetSdk target_sdk_version
+        versionCode 5
+        versionName "3.0"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -25,75 +30,68 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-}
 
-def verMoxy = "2.0.2"
-def verRoom = "2.2.3"
-def verDagger = "2.25.2"
-def verCoroutines = "1.2.2"
-def navVersion = "2.1.0"
-def stechoVersion = '1.5.1'
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    // Test
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-
-    // Kotlin-stdlib
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    // AndroidX libraries
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    sourceSets {
+        main.kotlin.srcDirs += "src/main/kotlin"
+        debug.kotlin.srcDirs += "src/debug/kotlin"
+        androidTest.kotlin.srcDirs += "src/androidTest/kotlin"
+        test.kotlin.srcDirs += "src/test/kotlin"
+    }
 
-    // Room
-    implementation "androidx.room:room-runtime:$verRoom"
-    implementation "androidx.room:room-ktx:$verRoom"
+    kotlinOptions {
+        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs += "-Xopt-in=kotlin.ExperimentalStdlibApi"
+        freeCompilerArgs += "-Xopt-in=kotlin.time.ExperimentalTime"
+    }
 
-    // Navigation
-    implementation "androidx.navigation:navigation-fragment-ktx:$navVersion"
-    implementation "androidx.navigation:navigation-ui-ktx:$navVersion"
+    buildFeatures {
+        compose true
+    }
 
-    //Google material
-    implementation 'com.google.android.material:material:1.0.0'
+    composeOptions {
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
+    }
 
-    //Moxy
-    implementation "com.github.moxy-community:moxy:$verMoxy"
-    implementation "com.github.moxy-community:moxy-androidx:$verMoxy"
-    implementation "com.github.moxy-community:moxy-material:$verMoxy"
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
+    }
+}
 
-    //Kotlin coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$verCoroutines"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$verCoroutines"
+dependencies {
+    coreLibraryDesugaring libs.android.desugar
 
-    //Dagger 2
-    implementation "com.google.dagger:dagger:$verDagger"
-    implementation "com.google.dagger:dagger-android:$verDagger"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$verDagger"
+    // Kotlin
+    implementation libs.kotlin.datetime
+    implementation libs.coroutines.core
+    implementation libs.coroutines.android
 
-    //Gson
-    implementation 'com.google.code.gson:gson:2.8.5'
+    // UI
+    implementation libs.compose.ui
+    implementation libs.compose.material
+    implementation libs.activity.compose
+    implementation libs.splashscreen
+    debugImplementation libs.compose.tooling
 
-    //Stecho
-    implementation "com.facebook.stetho:stetho:$stechoVersion"
+    // Architecture
+    implementation libs.bundles.sesame
+    implementation libs.bundles.decompose
 
-    //TapTargetView
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
+    // DI
+    implementation libs.koin.android
 
-    //Kapts
-    kapt "com.github.moxy-community:moxy-compiler:$verMoxy"
-    kapt "com.google.dagger:dagger-android-processor:$verDagger"
-    kapt "com.google.dagger:dagger-compiler:$verDagger"
-    kapt "androidx.room:room-compiler:$verRoom"
-}
+    // Serialization
+    implementation libs.serialization.json
+
+    // Accompanist
+    implementation libs.accompanist.systemuicontroller
+
+    // Room
+    implementation libs.bundles.room
+    kapt libs.room.compiler
+}

app/proguard-rules.pro

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

app/src/androidTest/java/com/kaczmarek/moneycalculator/ExampleInstrumentedTest.kt

@@ -2,28 +2,36 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="kaczmarek.moneycalculator">
+
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <application
-        android:name=".BaseApplication"
-        android:allowBackup="false"
+        android:name=".App"
+        tools:targetApi="n"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:resizeableActivity="false"
-        tools:ignore="GoogleAppIndexingWarning"
-        tools:targetApi="n">
-        <activity android:name=".ui.main.ActivityMain"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:name=".MainActivity"
+            tools:ignore="LockedOrientationActivity,NonResizeableActivity"
+            android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
+            android:exported="true"
+            android:launchMode="singleTask"
             android:windowSoftInputMode="stateAlwaysHidden"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            android:screenOrientation="portrait"
+            android:resizeableActivity="false"
+            android:theme="@style/SplashTheme">
 
-                <category android:name="android.intent.category.LAUNCHER" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>