Merge remote-tracking branch 'origin/scan_nota' into scan_nota

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/drawable/iv_picture.xml

app/build.gradle.kts

@@ -18,6 +18,8 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+//
+
     buildTypes {
         release {
             isMinifyEnabled = true
@@ -55,4 +57,5 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+
 }
\ No newline at end of file