Browse Source
Merge pull request #113 from jahway603/master
slight modification to QR Code reader to accomodate Android tablets
master
jahway603
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
5 additions and
7 deletions
-
app/build.gradle
-
app/src/main/res/layout/activity_settings.xml
-
app/src/main/res/layout/custom_qrcode_layout.xml
|
|
|
@ -18,7 +18,7 @@ android { |
|
|
|
targetSdkVersion Deps.targetSdkVersion |
|
|
|
multiDexEnabled true |
|
|
|
versionCode 5 |
|
|
|
versionName "0.5.17" |
|
|
|
versionName "0.5.16.1" |
|
|
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" |
|
|
|
vectorDrawables.useSupportLibrary = true |
|
|
|
} |
|
|
|
@ -86,7 +86,6 @@ dependencies { |
|
|
|
implementation 'com.google.android.gms:play-services-vision:17.0.2' |
|
|
|
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.1' |
|
|
|
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' |
|
|
|
//implementation 'com.journeyapps:zxing-android-embedded:3.6.0' |
|
|
|
implementation 'com.journeyapps:zxing-android-embedded:3.6.0@aar' |
|
|
|
implementation 'com.google.zxing:core:3.3.0' |
|
|
|
testImplementation 'junit:junit:4.12' |
|
|
|
|
|
|
|
@ -114,7 +114,7 @@ |
|
|
|
<TextView |
|
|
|
android:id="@+id/customWormholeTitle" |
|
|
|
android:layout_width="wrap_content" |
|
|
|
android:layout_height="19dp" |
|
|
|
android:layout_height="wrap_content" |
|
|
|
android:layout_marginStart="16dp" |
|
|
|
android:layout_marginTop="16dp" |
|
|
|
android:text="@string/current_wormhole_title" |
|
|
|
@ -177,10 +177,9 @@ |
|
|
|
<TextView |
|
|
|
android:id="@+id/textView11" |
|
|
|
android:layout_width="wrap_content" |
|
|
|
android:layout_height="32dp" |
|
|
|
android:layout_height="wrap_content" |
|
|
|
android:layout_marginStart="16dp" |
|
|
|
android:layout_marginTop="16dp" |
|
|
|
android:layout_marginEnd="24dp" |
|
|
|
android:text="@string/currency" |
|
|
|
android:textAlignment="center" |
|
|
|
android:textIsSelectable="false" |
|
|
|
|
|
|
|
@ -9,8 +9,8 @@ |
|
|
|
android:id="@+id/zxing_barcode_surface" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="match_parent" |
|
|
|
app:zxing_framing_rect_height="300dp" |
|
|
|
app:zxing_framing_rect_width="300dp" /> |
|
|
|
app:zxing_framing_rect_height="400dp" |
|
|
|
app:zxing_framing_rect_width="400dp" /> |
|
|
|
|
|
|
|
<com.journeyapps.barcodescanner.ViewfinderView |
|
|
|
android:id="@+id/zxing_viewfinder_view" |
|
|
|
|
