Merge pull request #127 from wewewe718/develop

v1.10

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.10
+* Add support for Airline Boarding Pass barcodes
+* Update translations
+
 ## 1.9
 * Add support for New Zealand Covid Tracer QR Codes
 * Update translations

README.md

@@ -1,16 +1,16 @@
 ## Overview
 [![License: Unlicense](https://img.shields.io/badge/license-Unlicense-blue.svg)](http://unlicense.org/)
-[![](https://img.shields.io/github/v/release/dmitriy-ilchenko/QrAndBarcodeScanner)](https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/releases/latest)
+[![](https://img.shields.io/github/v/release/wewewe718/QrAndBarcodeScanner)](https://github.com/wewewe718/QrAndBarcodeScanner/releases/latest)
 
 QR & Barcode Scanner is an ad-free, open-source scanner app. It uses the [ZXing][zxing] scanning library.
 
 ## Download
 
-<a href="https://play.google.com/store/apps/details?id=org.barcodescanner"><img alt="Get it on Google Play" src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/google_play/badge.png" height="60"/></a>   <a href="https://appgallery7.huawei.com/#/app/C102717909"><img alt="Explore it on AppGallery" src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/app_gallery/badge.png" height="60"/></a>   <a href="https://www.f-droid.org/en/packages/com.example.barcodescanner/"><img alt="Get it on FDroid" src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/fdroid_badge.png" height="60"/></a>   <a href="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/releases"><img alt="Get it on Github" src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/get-it-on-github.png" height="60"/></a>
+<a href="https://play.google.com/store/apps/details?id=org.barcodescanner"><img alt="Get it on Google Play" src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/google_play/badge.png" height="60"/></a>   <a href="https://appgallery7.huawei.com/#/app/C102717909"><img alt="Explore it on AppGallery" src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/app_gallery/badge.png" height="60"/></a>   <a href="https://www.f-droid.org/en/packages/com.example.barcodescanner/"><img alt="Get it on FDroid" src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/fdroid_badge.png" height="60"/></a>   <a href="https://github.com/wewewe718/QrAndBarcodeScanner/releases"><img alt="Get it on Github" src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/get-it-on-github.png" height="60"/></a>
 
 ## Screenshots
 
-<img src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/screenshots/en/1_scan.png" width="180" height="320"/> <img src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/screenshots/en/2_scan_from_file.png" width="180" height="320"/> <img src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/screenshots/en/3_result.png" width="180" height="320"/> <img src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/screenshots/en/4_result_dark_theme.png" width="180" height="320"/> <img src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/screenshots/en/5_create.png" width="180" height="320"/> <img src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/screenshots/en/6_history.png" width="180" height="320"/> <img src="https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner/blob/develop/images/screenshots/en/7_settings.png" width="180" height="320"/>
+<img src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/screenshots/en/1_scan.png" width="180" height="320"/> <img src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/screenshots/en/2_scan_from_file.png" width="180" height="320"/> <img src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/screenshots/en/3_result.png" width="180" height="320"/> <img src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/screenshots/en/4_result_dark_theme.png" width="180" height="320"/> <img src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/screenshots/en/5_create.png" width="180" height="320"/> <img src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/screenshots/en/6_history.png" width="180" height="320"/> <img src="https://github.com/wewewe718/QrAndBarcodeScanner/blob/develop/images/screenshots/en/7_settings.png" width="180" height="320"/>
 
 ## Contributing
 

app/build.gradle

@@ -1,19 +1,26 @@
-apply plugin: 'io.sentry.android.gradle'
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id("io.sentry.android.gradle") version "3.0.1"
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+}
+
+sentry {
+    includeProguardMapping = true
+    autoUploadProguardMapping = true
+}
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.example.barcodescanner"
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 11
-        versionName "1.9"
+        targetSdkVersion 31
+        versionCode 12
+        versionName "1.10"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary  true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -54,11 +61,6 @@ android {
             buildConfigField "boolean", "ERROR_REPORTS_ENABLED_BY_DEFAULT", "false"
         }
     }
-
-    sentry {
-        autoProguardConfig true
-        autoUpload true
-    }
 }
 
 dependencies {
@@ -68,14 +70,14 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Android
-    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'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.multidex:multidex:2.0.1'
 
     // Room
-    final roomVersion = "2.2.5"
+    final roomVersion = "2.4.2"
     kapt "androidx.room:room-compiler:$roomVersion"
     implementation "androidx.room:room-runtime:$roomVersion"
     implementation "androidx.room:room-rxjava2:$roomVersion"
@@ -112,5 +114,5 @@ dependencies {
     implementation 'com.github.florent37:singledateandtimepicker:2.2.6'
 
     // Sentry
-    implementation 'io.sentry:sentry-android:2.3.1'
+    implementation 'io.sentry:sentry-android:5.7.1'
 }

app/src/main/AndroidManifest.xml

@@ -47,6 +47,7 @@
             android:name=".feature.tile.QuickSettingsTileService"
             android:icon="@drawable/ic_scan"
             android:label="@string/app_name"
+            android:exported="true"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action
@@ -58,6 +59,7 @@
             android:name=".feature.tabs.BottomTabsActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             >
 
             <intent-filter>
@@ -81,6 +83,7 @@
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
             tools:ignore="AppLinkUrlError"
+            android:exported="true"
             >
 
             <intent-filter android:label="@string/intent_filter_scan_image">
@@ -102,6 +105,7 @@
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateVisible"
+            android:exported="true"
             >
             <intent-filter android:label="@string/intent_filter_create_qr_code_text">
                 <action android:name="android.intent.action.SEND"/>
@@ -119,69 +123,82 @@
             android:name=".feature.tabs.create.qr.CreateQrCodeAllActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.create.barcode.CreateBarcodeAllActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
         <activity
             android:name="com.example.barcodescanner.feature.barcode.BarcodeActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name="com.example.barcodescanner.feature.barcode.BarcodeImageActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.barcode.otp.OtpActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.barcode.save.SaveBarcodeAsTextActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.barcode.save.SaveBarcodeAsImageActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
         <activity
             android:name=".feature.tabs.history.export.ExportHistoryActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
         <activity
             android:name=".feature.tabs.settings.theme.ChooseThemeActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.camera.ChooseCameraActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.formats.SupportedFormatsActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.search.ChooseSearchEngineActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.permissions.AllPermissionsActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
     </application>

app/src/main/java/com/example/barcodescanner/extension/BarcodeSchema.kt

@@ -20,6 +20,7 @@ fun BarcodeSchema.toImageId(): Int? {
         BarcodeSchema.VCARD -> R.drawable.ic_contact
         BarcodeSchema.WIFI -> R.drawable.ic_wifi
         BarcodeSchema.YOUTUBE -> R.drawable.ic_youtube
+        BarcodeSchema.BOARDINGPASS -> R.drawable.ic_boardingpass
         else -> null
     }
 }
@@ -41,6 +42,7 @@ fun BarcodeSchema.toStringId(): Int? {
         BarcodeSchema.VCARD -> R.string.barcode_schema_v_card
         BarcodeSchema.WIFI -> R.string.barcode_schema_wifi
         BarcodeSchema.YOUTUBE -> R.string.barcode_schema_youtube
+        BarcodeSchema.BOARDINGPASS -> R.string.barcode_schema_boardingpass
         BarcodeSchema.OTHER -> R.string.barcode_schema_other
         else -> null
     }

app/src/main/java/com/example/barcodescanner/feature/barcode/BarcodeActivity.kt

@@ -148,6 +148,7 @@ class BarcodeActivity : BaseActivity(), DeleteConfirmationDialogFragment.Listene
             BarcodeSchema.WIFI -> connectToWifi()
             BarcodeSchema.YOUTUBE -> openInYoutube()
             BarcodeSchema.NZCOVIDTRACER -> openLink()
+            BarcodeSchema.BOARDINGPASS -> return
             else -> return
         }
     }

app/src/main/java/com/example/barcodescanner/feature/common/dialog/ChooseSearchEngineDialogFragment.kt

@@ -16,6 +16,7 @@ class ChooseSearchEngineDialogFragment : DialogFragment() {
             SearchEngine.DUCK_DUCK_GO,
             SearchEngine.GOOGLE,
             SearchEngine.QWANT,
+            SearchEngine.STARTPAGE,
             SearchEngine.YAHOO,
             SearchEngine.YANDEX
         )
@@ -33,6 +34,7 @@ class ChooseSearchEngineDialogFragment : DialogFragment() {
             getString(R.string.activity_choose_search_engine_duck_duck_go),
             getString(R.string.activity_choose_search_engine_google),
             getString(R.string.activity_choose_search_engine_qwant),
+            getString(R.string.activity_choose_search_engine_startpage),
             getString(R.string.activity_choose_search_engine_yahoo),
             getString(R.string.activity_choose_search_engine_yandex)
         )

app/src/main/java/com/example/barcodescanner/feature/tabs/settings/SettingsFragment.kt

@@ -137,7 +137,7 @@ class SettingsFragment : Fragment(), DeleteConfirmationDialogFragment.Listener {
     }
 
     private fun showSourceCode() {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/dmitriy-ilchenko/QrAndBarcodeScanner"))
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/wewewe718/QrAndBarcodeScanner"))
         if (intent.resolveActivity(packageManager) != null) {
             startActivity(intent)
         }

app/src/main/java/com/example/barcodescanner/feature/tabs/settings/search/ChooseSearchEngineActivity.kt

@@ -23,7 +23,7 @@ class ChooseSearchEngineActivity : BaseActivity() {
     }
 
     private val buttons by unsafeLazy {
-        listOf(button_none, button_ask_every_time, button_bing, button_duck_duck_go, button_google, button_qwant, button_yahoo, button_yandex)
+        listOf(button_none, button_ask_every_time, button_bing, button_duck_duck_go, button_google, button_qwant, button_startpage, button_yahoo, button_yandex)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -51,6 +51,7 @@ class ChooseSearchEngineActivity : BaseActivity() {
             SearchEngine.DUCK_DUCK_GO -> button_duck_duck_go.isChecked = true
             SearchEngine.GOOGLE -> button_google.isChecked = true
             SearchEngine.QWANT -> button_qwant.isChecked = true
+            SearchEngine.STARTPAGE -> button_startpage.isChecked = true
             SearchEngine.YAHOO -> button_yahoo.isChecked = true
             SearchEngine.YANDEX -> button_yandex.isChecked = true
         }
@@ -63,6 +64,7 @@ class ChooseSearchEngineActivity : BaseActivity() {
         button_duck_duck_go.setCheckedChangedListener(SearchEngine.DUCK_DUCK_GO)
         button_google.setCheckedChangedListener(SearchEngine.GOOGLE)
         button_qwant.setCheckedChangedListener(SearchEngine.QWANT)
+        button_startpage.setCheckedChangedListener(SearchEngine.STARTPAGE)
         button_yahoo.setCheckedChangedListener(SearchEngine.YAHOO)
         button_yandex.setCheckedChangedListener(SearchEngine.YANDEX)
     }
@@ -83,4 +85,4 @@ class ChooseSearchEngineActivity : BaseActivity() {
             }
         }
     }
-}
+}

app/src/main/java/com/example/barcodescanner/model/ParsedBarcode.kt

@@ -95,7 +95,9 @@ class ParsedBarcode(barcode: Barcode) {
             BarcodeSchema.CRYPTOCURRENCY -> parseBitcoin()
             BarcodeSchema.OTP_AUTH -> parseOtp()
             BarcodeSchema.NZCOVIDTRACER -> parseNZCovidTracer()
+            BarcodeSchema.BOARDINGPASS,
             BarcodeSchema.URL -> parseUrl()
+            else -> {}
         }
     }
 

app/src/main/java/com/example/barcodescanner/model/SearchEngine.kt

@@ -7,6 +7,7 @@ enum class SearchEngine(val templateUrl: String) {
     DUCK_DUCK_GO("https://duckduckgo.com/?q="),
     GOOGLE("https://www.google.com/search?q="),
     QWANT("https://www.qwant.com/?q="),
+    STARTPAGE("https://www.startpage.com/sp/search?query="),
     YAHOO("https://search.yahoo.com/search?p="),
     YANDEX("https://www.yandex.ru/search/?text="),
 }