From 14a744d0afb4065568244d44819904e6965fb9cf Mon Sep 17 00:00:00 2001 From: Julian Finkler Date: Wed, 19 Feb 2020 23:19:14 +0100 Subject: [PATCH] Owner changes: Android: Kotlin Package: `com.apptreesoftware.barcodescan` -> `de.mintware.barcode_scan` Manifest-Package: `com.yourcompany.barcodescan` -> `de.mintware.barcodescan` Activity: `com.apptreesoftware.barcodescan.BarcodeScannerActivity` -> `de.mintware.barcode_scan.BarcodeScannerActivity` iOS: Bundle ID: `com.apptreesoftware.barcode.plugin.example` -> `de.mintware.barcode_scan.plugin.example` Flutter: Method channel: `com.apptreesoftware.barcode_scan` -> `de.mintware.barcode_scan` pubspec.yaml: - homepage updated - deprecated author entry removed - comments removed - flutter.plugin.androidPackage: `com.apptreesoftware.barcode_scan` -> `de.mintware.barcode_scan` README.md updated and UPGRADE.md added --- .gitignore | 1 + CHANGELOG.md | 26 ++++---- LICENSE | 3 +- README.md | 61 +++++++++++-------- UPGRADE.md | 25 ++++++++ android/build.gradle | 6 +- android/src/main/AndroidManifest.xml | 4 +- .../barcode_scan}/BarcodeScanPlugin.kt | 4 +- .../barcode_scan}/BarcodeScannerActivity.kt | 2 +- example/.gitignore | 5 ++ example/android/app/build.gradle | 4 +- .../android/app/src/main/AndroidManifest.xml | 4 +- .../barcodescanexample/MainActivity.kt | 2 +- example/android/gradle.properties | 3 + example/ios/.gitignore | 2 +- example/ios/Podfile.lock | 29 --------- example/ios/Runner.xcodeproj/project.pbxproj | 9 +-- ios/Classes/BarcodeScanPlugin.m | 6 +- lib/barcode_scan.dart | 2 +- pubspec.yaml | 42 +------------ 20 files changed, 111 insertions(+), 129 deletions(-) create mode 100644 UPGRADE.md rename android/src/main/kotlin/{com/apptreesoftware/barcodescan => de/mintware/barcode_scan}/BarcodeScanPlugin.kt (96%) rename android/src/main/kotlin/{com/apptreesoftware/barcodescan => de/mintware/barcode_scan}/BarcodeScannerActivity.kt (99%) delete mode 100644 example/ios/Podfile.lock diff --git a/.gitignore b/.gitignore index 41c1683..79f2d39 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ build/ ios/.generated/ packages pubspec.lock +example/ios/Podfile.lock diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d3a8d..4fcc6f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,14 @@ Features: - [Add-to-app support](https://github.com/mintware-de/flutter_barcode_reader/pull/168) - @santiihoyos +- Changed overlay to full screen in iOS 13 Bugfixes: - [Fixed rotation on iOS](https://github.com/mintware-de/flutter_barcode_reader/pull/167) - @mintware-de - [#61 Rotating orientation on iPhones only shows half the screen](https://github.com/mintware-de/flutter_barcode_reader/issues/61) Changes: -- [Fix compile warning](https://github.com/apptreesoftware/flutter_barcode_reader/pull/127) - @lookfirst +- [Fix compile warning](https://github.com/mintware-de/flutter_barcode_reader/pull/127) - @lookfirst - [Upgrade gradle](https://github.com/mintware-de/flutter_barcode_reader/pull/142) - @SuuSoJeat - `com.android.tools.build:gradle`: 3.3.1 -> 3.5.0 - `org.jetbrains.kotlin:kotlin-gradle-plugin`: 1.3.20 -> 1.3.50 @@ -16,40 +17,41 @@ Changes: - `targetSdkVersion`: 28 -> 29 - `gradle`: 4.10.2 -> 5.4.1 - [Package description updated](https://github.com/mintware-de/flutter_barcode_reader/pull/180) - @connectety +- README.md and LICENSE.md updated +- Since the project owner has been changed, the package names are different. Checkout the [UPGRADE.md](./UPGRADE.md) for details. - -## [1.0.0] - 8/30/18 +## v1.0.0 - 2018-08-30 Breaking Change: Adds support for AndroidX -## [0.0.8] - 8/30/18 +## v0.0.8 - 2018-08-30 -* Fixes [iOS: pressing cancel doesn't stop scanning](https://github.com/apptreesoftware/flutter_barcode_reader/issues/60) thanks to @tgezginis. +* Fixes [iOS: pressing cancel doesn't stop scanning](https://github.com/mintware-de/flutter_barcode_reader/issues/60) thanks to @tgezginis. -## [0.0.7] - 8/30/18 +## v0.0.7 - 2018-08-30 * Fix iOS barcodes not scanning -## [0.0.6] - 8/29/18 +## v0.0.6 - 2018-08-29 * Fix android dependencies * iOS scanner now looks like Android thanks to @dustin-graham -## [0.0.4] - 2/8/18 +## v0.0.4 - 2018-02-8 -* Fix missing gradle dependency (thanks to [toteto](https://github.com/apptreesoftware/flutter_barcode_reader/pull/15)) +* Fix missing gradle dependency (thanks to [toteto](https://github.com/mintware-de/flutter_barcode_reader/pull/15)) * Update gradle dependencies -## [0.0.3] - 2/8/17 +## v0.0.3 - 2017-02-8 * Improved permission handling (thanks to [BenSower](https://github.com/BenSower)) * Added MIT license -## [0.0.2] - 11/7/17 +## v0.0.2 - 2017-11-7 * Rewrite iOS scanner in Objective-C to avoid Swift use_frameworks! conflicts with other plugins (see https://github.com/flutter/flutter/issues/10968) -## [0.0.1] - 10/29/17 +## v0.0.1 - 2017-10-29 * Supports 2D & QR Codes * Control flash while scanning diff --git a/LICENSE b/LICENSE index 736d914..0ba4dc4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License -Copyright (c) 2018 AppTree Software http://www.apptreesoftware.com +Copyright (c) 2020 Julian Finkler https://www.mintware.de +Copyright (c) 2018-2019 AppTree Software http://www.apptreesoftware.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a35c5a7..8a2ae90 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +[![GitHub license](https://img.shields.io/github/license/mintware-de/flutter_barcode_reader.svg)](https://github.com/mintware-de/flutter_barcode_reader/blob/master/LICENSE) +[![GitHub stars](https://img.shields.io/github/stars/mintware-de/flutter_barcode_reader)](https://github.com/mintware-de/flutter_barcode_reader/stargazers) +[![Pub](https://img.shields.io/pub/v/barcode_scan.svg)](https://pub.dartlang.org/packages/barcode_scan) +[![GitHub forks](https://img.shields.io/github/forks/mintware-de/flutter_barcode_reader)](https://github.com/mintware-de/flutter_barcode_reader/network) + # Barcode Scanner A flutter plugin for scanning 2D barcodes and QR codes. @@ -13,7 +18,6 @@ Android: https://github.com/dm77/barcodescanner - [x] Scan QR codes - [x] Control the flash while scanning - [x] Permission handling -- [ ] Support multiple barcode libraries ## Getting Started @@ -24,44 +28,49 @@ For Android, you must do the following before you can use the plugin: `` -* Add the BarcodeScanner activity to your AndroidManifest.xml. Do NOT modify the name. - - `` - - * This plugin is written in Kotlin. Therefore, you need to add Kotlin support to your project. See [installing the Kotlin plugin](https://kotlinlang.org/docs/tutorials/kotlin-android.html#installing-the-kotlin-plugin). Edit your project-level build.gradle file to look like this: - - buildscript { - ext.kotlin_version = '1.3.21' - ... - dependencies { - ... - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } - } - ... +```groovy +buildscript { + ext.kotlin_version = '1.3.61' + // ... + dependencies { + // ... + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} +// ... +``` Edit your app-level build.gradle file to look like this: - apply plugin: 'kotlin-android' - ... - dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - ... - } +```groovy +apply plugin: 'kotlin-android' +// ... +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + // ... +} +``` Now you can depend on the barcode_scan plugin in your pubspec.yaml file: - dependencies: - ... - barcode_scan: any - +```yaml +dependencies: + # ... + barcode_scan: any +``` Click "Packages get" in Android Studio or run `flutter packages get` in your project folder. ### iOS To use on iOS, you must add the the camera usage description to your Info.plist +```xml + + NSCameraUsageDescription Camera permission is required for barcode scanning. + + +``` \ No newline at end of file diff --git a/UPGRADE.md b/UPGRADE.md new file mode 100644 index 0000000..acd1546 --- /dev/null +++ b/UPGRADE.md @@ -0,0 +1,25 @@ +# Upgrade from 1.0.0 to 2.0.0 + +The simples way for upgrading is by replacing: +- `com.apptreesoftware.barcodescan` +- `com.yourcompany.barcodescan` +- `com.apptreesoftware.barcode_scan` + +With: `de.mintware.barcode_scan` + +Detailed changes: +Android: +Kotlin Package: `com.apptreesoftware.barcodescan` -> `de.mintware.barcode_scan` +Manifest-Package: `com.yourcompany.barcodescan` -> `de.mintware.barcodescan` +Activity: `com.apptreesoftware.barcodescan.BarcodeScannerActivity` -> `de.mintware.barcode_scan.BarcodeScannerActivity` + +iOS: +Bundle ID: `com.apptreesoftware.barcode.plugin.example` -> `de.mintware.barcode_scan.plugin.example` + +Flutter: +Method channel: `com.apptreesoftware.barcode_scan` -> `de.mintware.barcode_scan` +pubspec.yaml: + - homepage updated + - deprecated author entry removed + - comments removed + - flutter.plugin.androidPackage: `com.apptreesoftware.barcode_scan` -> `de.mintware.barcode_scan` diff --git a/android/build.gradle b/android/build.gradle index c1acc78..7f466be 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,6 @@ -group 'com.apptreesoftware.barcodescan' +package android + +group 'de.mintware.barcode_scan' version '1.0-SNAPSHOT' buildscript { @@ -9,7 +11,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61" } } diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index ff7847a..f84e395 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="de.mintware.barcodescan"> - + diff --git a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScanPlugin.kt b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScanPlugin.kt similarity index 96% rename from android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScanPlugin.kt rename to android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScanPlugin.kt index a72ec23..59539da 100644 --- a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScanPlugin.kt +++ b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScanPlugin.kt @@ -1,4 +1,4 @@ -package com.apptreesoftware.barcodescan +package de.mintware.barcode_scan import android.app.Activity import android.content.Intent @@ -16,7 +16,7 @@ class BarcodeScanPlugin(private val registrar: Registrar) : MethodCallHandler, P companion object { @JvmStatic fun registerWith(registrar: Registrar) { - val channel = MethodChannel(registrar.messenger(), "com.apptreesoftware.barcode_scan") + val channel = MethodChannel(registrar.messenger(), "de.mintware.barcode_scan") val plugin = BarcodeScanPlugin(registrar) channel.setMethodCallHandler(plugin) registrar.addActivityResultListener(plugin) diff --git a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt similarity index 99% rename from android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt rename to android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt index 340e7db..3dcb1a8 100644 --- a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt +++ b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt @@ -1,4 +1,4 @@ -package com.apptreesoftware.barcodescan +package de.mintware.barcode_scan import android.Manifest import android.app.Activity diff --git a/example/.gitignore b/example/.gitignore index eb15c3d..83b685b 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -8,3 +8,8 @@ ios/.generated/ packages pubspec.lock .flutter-plugins +.flutter-plugins-dependencies +ios/Flutter.podspec +ios/Flutter/Flutter.podspec +ios/Flutter/flutter_export_environment.sh +ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 614df20..5b6de5f 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -29,12 +29,12 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.yourcompany.barcodescanexample" + applicationId "de.mintware.barcode_scan_example" minSdkVersion 16 targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index b18be67..e70b91a 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="de.mintware.barcode_scan_example">