Merge pull request #48 from dmitriy-ilchenko/develop

Develop
wewewe718 · Nov 2, 2020 · 38e599c · 38e599c
2 parents 488c974 + e2d62fc
commit 38e599c
Show file tree

Hide file tree

Showing 52 changed files with 817 additions and 165 deletions.
diff --git a/.gitignore b/.gitignore
@@ -92,3 +92,6 @@ atlassian-ide-plugin.xml
 
 # Mongo Explorer plugin
 .idea/mongoSettings.xml
+
+# Sentry
+/sentry.properties
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.6
+* Add a setting to avoid duplicates in history
+* Add an option to manually save to history
+* Add an option to set a name to a history item
+* Bug fix: app shortcuts were not working
+* Bug fix: Wi-Fi QR code passwords were scanned wrong
+
 ## 1.5
 * Add Chinese (Taiwan) translation
 * Add a Quick Settings tile for the app

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.example.barcodescanner"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 7
-        versionName "1.5"
+        versionCode 8
+        versionName "1.6"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary  true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -24,6 +24,10 @@ android {
             }
         }
 
+        Properties properties = new Properties()
+        properties.load(project.rootProject.file("local.properties").newDataInputStream())
+
+        resValue "string", "sentryDSN", properties.getProperty("sentryDSN")
         buildConfigField "boolean", "ERROR_REPORTS_ENABLED_BY_DEFAULT", "true"
     }
 
@@ -76,7 +80,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Android
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'

diff --git a/app/src/amazon/res/xml/shortcuts.xml b/app/src/amazon/res/xml/shortcuts.xml
@@ -0,0 +1,59 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:shortcutId="scanFromCamera"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_scan_from_camera"
+        android:shortcutShortLabel="@string/shortcut_scan_from_camera"
+        android:shortcutLongLabel="@string/shortcut_scan_from_camera"
+        >
+        <intent
+            android:action="org.barcodescanner.SCAN_FROM_CAMERA"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="scanFromFile"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_scan_from_file"
+        android:shortcutShortLabel="@string/shortcut_scan_from_file"
+        android:shortcutLongLabel="@string/shortcut_scan_from_file"
+        >
+        <intent
+            android:action="org.barcodescanner.SCAN_FROM_FILE"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.scan.file.ScanBarcodeFromFileActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="createBarcode"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_create_barcode"
+        android:shortcutShortLabel="@string/shortcut_create_barcode"
+        android:shortcutLongLabel="@string/shortcut_create_barcode"
+        >
+        <intent
+            android:action="org.barcodescanner.CREATE_BARCODE"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="history"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_history"
+        android:shortcutShortLabel="@string/shortcut_history"
+        android:shortcutLongLabel="@string/shortcut_history"
+        >
+        <intent
+            android:action="org.barcodescanner.HISTORY"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+</shortcuts>
diff --git a/app/src/aptoide/res/xml/shortcuts.xml b/app/src/aptoide/res/xml/shortcuts.xml
@@ -0,0 +1,59 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:shortcutId="scanFromCamera"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_scan_from_camera"
+        android:shortcutShortLabel="@string/shortcut_scan_from_camera"
+        android:shortcutLongLabel="@string/shortcut_scan_from_camera"
+        >
+        <intent
+            android:action="org.barcodescanner.SCAN_FROM_CAMERA"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="scanFromFile"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_scan_from_file"
+        android:shortcutShortLabel="@string/shortcut_scan_from_file"
+        android:shortcutLongLabel="@string/shortcut_scan_from_file"
+        >
+        <intent
+            android:action="org.barcodescanner.SCAN_FROM_FILE"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.scan.file.ScanBarcodeFromFileActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="createBarcode"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_create_barcode"
+        android:shortcutShortLabel="@string/shortcut_create_barcode"
+        android:shortcutLongLabel="@string/shortcut_create_barcode"
+        >
+        <intent
+            android:action="org.barcodescanner.CREATE_BARCODE"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="history"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_history"
+        android:shortcutShortLabel="@string/shortcut_history"
+        android:shortcutLongLabel="@string/shortcut_history"
+        >
+        <intent
+            android:action="org.barcodescanner.HISTORY"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+</shortcuts>
diff --git a/app/src/googlePlay/res/xml/shortcuts.xml b/app/src/googlePlay/res/xml/shortcuts.xml
@@ -0,0 +1,59 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:shortcutId="scanFromCamera"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_scan_from_camera"
+        android:shortcutShortLabel="@string/shortcut_scan_from_camera"
+        android:shortcutLongLabel="@string/shortcut_scan_from_camera"
+        >
+        <intent
+            android:action="org.barcodescanner.SCAN_FROM_CAMERA"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="scanFromFile"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_scan_from_file"
+        android:shortcutShortLabel="@string/shortcut_scan_from_file"
+        android:shortcutLongLabel="@string/shortcut_scan_from_file"
+        >
+        <intent
+            android:action="org.barcodescanner.SCAN_FROM_FILE"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.scan.file.ScanBarcodeFromFileActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="createBarcode"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_create_barcode"
+        android:shortcutShortLabel="@string/shortcut_create_barcode"
+        android:shortcutLongLabel="@string/shortcut_create_barcode"
+        >
+        <intent
+            android:action="org.barcodescanner.CREATE_BARCODE"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="history"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_history"
+        android:shortcutShortLabel="@string/shortcut_history"
+        android:shortcutLongLabel="@string/shortcut_history"
+        >
+        <intent
+            android:action="org.barcodescanner.HISTORY"
+            android:targetPackage="org.barcodescanner"
+            android:targetClass="com.example.barcodescanner.feature.tabs.BottomTabsActivity"
+            />
+    </shortcut>
+
+</shortcuts>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,12 +23,12 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name="com.example.barcodescanner.App"
+        android:name=".App"
         >
 
         <meta-data
             android:name="io.sentry.dsn"
-            android:value="https://[email protected]/5384638"
+            android:value="@string/sentryDSN"
             />
 
         <provider