Develop to Main

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Secur1ty-21

.github/workflows/dv-ci.yml

@@ -0,0 +1,38 @@
+name: Check build
+
+on:
+  push:
+    branches: [ "main", "develop" ]
+
+  pull_request:
+    branches: [ "main", "develop" ]
+
+  workflow_dispatch:
+
+jobs:
+  check_pull_request:
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v1
+        with: 
+          java-version: '1.17'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: run detekt
+        run: ./gradlew detekt
+
+      - name: Run check out script
+        run: ./gradlew build
+
+      - name: Check status
+        run: echo "Check build status"
+
+      - name: Set failed if build failed
+        if: failure()
+        run: echo "::error::Build failed"

.gitignore

@@ -1,17 +1,36 @@
 *.iml
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/captures
-.externalNativeBuild
-.cxx
-local.properties
+
+/.idea
+
+# Gradle files
 .gradle/
 build/
 out/
-/.idea
+
+# Local configuration file (sdk path, etc)
+local.properties
+develop.properties
+
+# Gradle-profiler data
+profile-out*/
+gradle-user-home/
+*.hprof
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+output.json
+
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# OS specific
+.DS_Store
+*.log

app/build.gradle.kts

@@ -1,18 +1,22 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.serialization)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.navigationSafeArgs)
+    alias(libs.plugins.kotlinParcelize)
 }
 
 android {
     namespace = "com.davay.android"
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.davay.android"
-        minSdk = 26
-        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -27,11 +31,20 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.valueOf(libs.versions.java.get())
+        targetCompatibility = JavaVersion.valueOf(libs.versions.java.get())
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.valueOf(libs.versions.java.get()).toString()
+    }
+
+    buildFeatures {
+        viewBinding = true
+        buildConfig = true
+    }
+
+    kotlin {
+        jvmToolchain(JavaVersion.valueOf(libs.versions.java.get()).majorVersion.toInt())
     }
 }
 
@@ -45,4 +58,21 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
+    implementation(libs.dagger.impl)
+    ksp(libs.dagger.compiler)
+    implementation(libs.navigation.fragment)
+    implementation(libs.navigation.ui)
+    implementation(libs.coil)
+    implementation(libs.flexbox)
+    implementation(libs.circle.indicator)
+    implementation(libs.physicslayout)
+
+    ksp(libs.room.compiler)
+    implementation(libs.bundles.room)
+    implementation(libs.encrypted.sharedpreferences)
+
+    implementation(libs.bundles.ktor)
+
+    implementation(project(":uikit"))
+    implementation(project(":util"))
 }

app/src/androidTest/java/com/davay/android/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package com.davay.android
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -2,19 +2,25 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
-        android:allowBackup="true"
+        android:name=".core.presentation.App"
+        android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DavayPosmotrim"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
-            android:exported="true">
+            android:name=".core.presentation.MainActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/davay/android/base/BaseBottomSheetFragment.kt

@@ -0,0 +1,118 @@
+package com.davay.android.base
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
+import androidx.navigation.fragment.findNavController
+import androidx.viewbinding.ViewBinding
+import com.davay.android.di.ScreenComponent
+import com.davay.android.extensions.animateBottom
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+abstract class BaseBottomSheetFragment<VB : ViewBinding, VM : BaseViewModel>(
+    private val inflate: Inflate<VB>,
+) : BottomSheetDialogFragment() {
+
+    private var _binding: VB? = null
+    protected val binding: VB get() = _binding!!
+
+    abstract val viewModel: VM
+
+    open val viewModelFactory: ViewModelProvider.Factory by lazy {
+        with(diComponent()) {
+            viewModelFactory
+        }
+    }
+
+    protected abstract fun diComponent(): ScreenComponent
+
+    inline fun <reified VM : BaseViewModel> injectViewModel() = viewModels<VM>(
+        factoryProducer = { viewModelFactory }
+    )
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        observeNavigation()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = inflate.invoke(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private fun observeNavigation() {
+        viewModel.navigation.observeNonNull(viewLifecycleOwner) {
+            it.getContentIfNotHandled()?.let { navigationCommand ->
+                handleNavigation(navigationCommand)
+            }
+        }
+    }
+
+    private fun handleNavigation(navCommand: NavigationCommand) {
+        when (navCommand) {
+            is NavigationCommand.ToDirection -> findNavController().navigate(
+                navCommand.directions,
+                navCommand.navOptions
+            )
+
+            is NavigationCommand.Back -> findNavController().navigateUp()
+        }
+    }
+
+    // для диалогов с клавиатурой
+    protected fun makeDialogWithKeyboard(savedInstanceState: Bundle?): Dialog {
+        val thisDialog = super.onCreateDialog(savedInstanceState)
+        thisDialog.window?.also {
+            it.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
+        return thisDialog
+    }
+
+    // для диалогов с клавиатурой
+    protected fun moveBottomView(movingView: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(requireActivity().window.decorView) { _, windowInsets ->
+            @Suppress("TooGenericExceptionCaught")
+            try {
+                val insetsIme = windowInsets.getInsets(WindowInsetsCompat.Type.ime())
+                val insetsNav = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
+                movingView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                    bottomMargin = if (windowInsets.isVisible(WindowInsetsCompat.Type.ime())) {
+                        insetsIme.bottom - insetsNav.bottom
+                    } else {
+                        0
+                    }
+                }
+            } catch (e: NullPointerException) {
+                // ничего не делаем
+                e.printStackTrace()
+            }
+            windowInsets
+        }
+
+        animateBottom(
+            listenableView = binding.root.rootView,
+            startBottomView = binding.root.rootView,
+            endBottomView = binding.root,
+            animateView = movingView
+        )
+    }
+}