diff --git a/.gitignore b/.gitignore index e375c74..ec4c59d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,85 @@ -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 +# Built application files +*.apk +*.aar +*.ap_ +*.aab -# User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ -# Sensitive or high-churn files: -.idea/dataSources/ -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml +# Log Files +*.log -# Gradle: +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml .idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries .idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml -# Mongo Explorer plugin: -.idea/mongoSettings.xml +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore -## File-based project format: -*.iws +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ -## Plugin-specific files: +# Google Services (e.g. APIs or Firebase) +# google-services.json -# IntelliJ -/out/ +# Freeline +freeline.py +freeline/ +freeline_project_description.json -# mpeltonen/sbt-idea plugin -.idea_modules/ +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md -# JIRA plugin -atlassian-ide-plugin.xml +# Version control +vcs.xml -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ \ No newline at end of file diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties b/.gradle/2.14.1/taskArtifacts/cache.properties deleted file mode 100644 index 69542a5..0000000 --- a/.gradle/2.14.1/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Sat Sep 03 14:42:05 CEST 2016 diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/.gradle/2.14.1/taskArtifacts/cache.properties.lock deleted file mode 100644 index 9cb326e..0000000 Binary files a/.gradle/2.14.1/taskArtifacts/cache.properties.lock and /dev/null differ diff --git a/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/.gradle/2.14.1/taskArtifacts/fileHashes.bin deleted file mode 100644 index 2743bfe..0000000 Binary files a/.gradle/2.14.1/taskArtifacts/fileHashes.bin and /dev/null differ diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin deleted file mode 100644 index 0c89530..0000000 Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin and /dev/null differ diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin deleted file mode 100644 index 0eb204e..0000000 Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin and /dev/null differ diff --git a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin deleted file mode 100644 index a5fa821..0000000 Binary files a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin deleted file mode 100644 index 23be605..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock deleted file mode 100644 index 1032e6f..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin deleted file mode 100644 index c122597..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock deleted file mode 100644 index 911f963..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugAndroidTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin deleted file mode 100644 index 39c0867..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock deleted file mode 100644 index dfbed68..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin deleted file mode 100644 index 3f5f227..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock deleted file mode 100644 index d626cfc..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin deleted file mode 100644 index 839d819..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock deleted file mode 100644 index f89a122..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin deleted file mode 100644 index 853ad7b..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock deleted file mode 100644 index 76380ca..0000000 Binary files a/.gradle/2.14.1/tasks/_app_compileDebugUnitTestJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and /dev/null differ diff --git a/.gradle/2.8/taskArtifacts/cache.properties b/.gradle/2.8/taskArtifacts/cache.properties deleted file mode 100644 index 1431bcd..0000000 --- a/.gradle/2.8/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Sat Sep 03 12:53:33 CEST 2016 diff --git a/.gradle/2.8/taskArtifacts/cache.properties.lock b/.gradle/2.8/taskArtifacts/cache.properties.lock deleted file mode 100644 index 3beb8f8..0000000 Binary files a/.gradle/2.8/taskArtifacts/cache.properties.lock and /dev/null differ diff --git a/.gradle/2.8/taskArtifacts/fileHashes.bin b/.gradle/2.8/taskArtifacts/fileHashes.bin deleted file mode 100644 index f8ad3d7..0000000 Binary files a/.gradle/2.8/taskArtifacts/fileHashes.bin and /dev/null differ diff --git a/.gradle/2.8/taskArtifacts/fileSnapshots.bin b/.gradle/2.8/taskArtifacts/fileSnapshots.bin deleted file mode 100644 index f7e9eb5..0000000 Binary files a/.gradle/2.8/taskArtifacts/fileSnapshots.bin and /dev/null differ diff --git a/.gradle/2.8/taskArtifacts/outputFileStates.bin b/.gradle/2.8/taskArtifacts/outputFileStates.bin deleted file mode 100644 index f8f29bf..0000000 Binary files a/.gradle/2.8/taskArtifacts/outputFileStates.bin and /dev/null differ diff --git a/.gradle/2.8/taskArtifacts/taskArtifacts.bin b/.gradle/2.8/taskArtifacts/taskArtifacts.bin deleted file mode 100644 index a5169ba..0000000 Binary files a/.gradle/2.8/taskArtifacts/taskArtifacts.bin and /dev/null differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d89cffa..0bcd031 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index edc59d9..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/PartkeeprScannrApp.iml b/.idea/modules/PartkeeprScannrApp.iml deleted file mode 100644 index 08c8b33..0000000 --- a/.idea/modules/PartkeeprScannrApp.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/app/app.iml b/.idea/modules/app/app.iml deleted file mode 100644 index 47f5b7a..0000000 --- a/.idea/modules/app/app.iml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 84c2fe2..6e051e5 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,14 @@ PartKeepr Scannr is an android app for Partkeepr with barcode support based on t ## Android support -The App ist build for android versions 4.1 (AP 16) to 6.0 (AP 23). +The app supports Android version from 4.1 (API 16) to 10 (API 29). For now only tested with the following devices: - Samsung Galaxy S3 Mini, Android Jelly Bean, 4.2.2 - Cubot H1, Android Lolly Pop, 5.1.1 - Huawei P8 Lite, Android Marshmallow, 6.0.0 +- Nokia 6.1 Plus (Nokia X6), 10 Please send me your model and android version, to get a meanigful list. @@ -35,6 +36,6 @@ You can use any barcode generator providing the following formats. | EAN-8 | Code 128 | Aztec (beta) | EAN-13 | Codabar | PDF 417 (beta) -A good flexible barcode online generator is: http://www.barcode-generator.de/V2/de/index.jsp +Good generators: [Barcode](http://www.barcode-generator.de/V2/de/index.jsp) or [QR Code](https://www.qr-code-generator.com) E.g. use Code-128 and put "375" (without quotations marks) to get a valid barcode tag from above. diff --git a/app/build.gradle b/app/build.gradle index b5cfe0f..e1c341f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "27.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.3" defaultConfig { applicationId "com.drobisch.partkeeprscannrapp" minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 29 versionCode 1 - versionName "1.0" + versionName "1.1" } buildTypes { release { @@ -21,9 +21,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:23.4.0' - implementation 'com.android.support:design:23.4.0' + testImplementation 'junit:junit:4.13' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' implementation 'com.journeyapps:zxing-android-embedded:3.6.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.3.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9d5cd8b..6cb407c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,15 +17,13 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - - diff --git a/app/src/main/java/com/drobisch/partkeeprscannrapp/ContinuousCaptureActivity.java b/app/src/main/java/com/drobisch/partkeeprscannrapp/ContinuousCaptureActivity.java index 1846b2c..c8df1bb 100644 --- a/app/src/main/java/com/drobisch/partkeeprscannrapp/ContinuousCaptureActivity.java +++ b/app/src/main/java/com/drobisch/partkeeprscannrapp/ContinuousCaptureActivity.java @@ -6,7 +6,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Message; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Base64; import android.util.Log; import android.util.Pair; @@ -27,7 +27,6 @@ import java.net.URL; import java.net.URLConnection; import java.util.List; -import java.util.Objects; /** * This sample performs continuous scanning, displaying the barcode and source image whenever diff --git a/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java b/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java index 0387e53..3f83e50 100644 --- a/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java +++ b/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; import android.app.LoaderManager.LoaderCallbacks; import android.content.CursorLoader; diff --git a/app/src/main/java/com/drobisch/partkeeprscannrapp/SendLogActivity.java b/app/src/main/java/com/drobisch/partkeeprscannrapp/SendLogActivity.java index 004442e..64f6877 100644 --- a/app/src/main/java/com/drobisch/partkeeprscannrapp/SendLogActivity.java +++ b/app/src/main/java/com/drobisch/partkeeprscannrapp/SendLogActivity.java @@ -1,9 +1,8 @@ package com.drobisch.partkeeprscannrapp; import android.app.Activity; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.view.View; import android.view.Window; import android.widget.TextView; diff --git a/app/src/main/java/com/drobisch/partkeeprscannrapp/SettingsActivity.java b/app/src/main/java/com/drobisch/partkeeprscannrapp/SettingsActivity.java index f4b40b9..51efccd 100644 --- a/app/src/main/java/com/drobisch/partkeeprscannrapp/SettingsActivity.java +++ b/app/src/main/java/com/drobisch/partkeeprscannrapp/SettingsActivity.java @@ -1,8 +1,8 @@ package com.drobisch.partkeeprscannrapp; import android.content.SharedPreferences; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ca5c02b..191ef94 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -48,7 +48,7 @@ android:textSize="50px" android:gravity="center"/> - @@ -61,9 +61,9 @@ android:maxLines="1" android:singleLine="true"/> - + - @@ -79,7 +79,7 @@ android:maxLines="1" android:singleLine="true"/> - + - @@ -42,7 +42,7 @@ android:maxLines="1" android:singleLine="true"/> - +