Merge pull request #275 from brarcher/pre-v0.25.1

Update for v0.25.1
2025-12-26 16:47:57 -05:00 · 2018-10-14 11:53:02 -07:00 · 2018-10-14 11:46:34 -07:00 · 2018-10-14 11:46:06 -07:00 · 2018-10-14 11:39:21 -07:00 · 2018-10-14 11:38:55 -07:00
6 changed files with 20 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v0.25.1 (2018-10-14)
+
+Changes:
+- Fix creating new card by manually entering barcode (https://github.com/brarcher/loyalty-card-locker/issues/272)
+
 ## v0.25 (2018-10-07)

 Changes:
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 15
        targetSdkVersion 27
-        versionCode 31
-        versionName "0.25"
+        versionCode 32
+        versionName "0.25.1"
    }
    buildTypes {
        release {
@@ -61,7 +61,7 @@ task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
    description 'Run findbugs'
    group 'verification'

-    classes = fileTree('build/intermediates/classes/debug/')
+    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
    source = fileTree('src/main/java')
    classpath = files()

--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -449,6 +449,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
            format = result.getFormatName();
        }

+        if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
+        {
+            Log.i(TAG, "Received barcode information from typing it");
+
+            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
+            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
+        }
+
        if(contents != null && contents.isEmpty() == false &&
                format != null && format.isEmpty() == false)
        {
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -113,4 +113,5 @@
    <string name="settings_card_id_font_size">Rozmiar czcionki identyfikatora karty</string>
    <string name="settings_card_note_font_size">Rozmiar czcionki notatki karty</string>
    <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
+    <string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
    </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 25 19:10:53 EST 2017
+#Wed Jun 27 14:32:00 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
Author	SHA1	Message	Date
Branden Archer	81d7250306	Merge pull request #275 from brarcher/pre-v0.25.1 Update for v0.25.1	2018-10-14 11:53:02 -07:00
Branden Archer	580025c99e	Update for v0.25.1	2018-10-14 11:46:34 -07:00
Branden Archer	d88bede310	Merge pull request #274 from brarcher/translations Update translations	2018-10-14 11:46:06 -07:00
Branden Archer	4c9bc911ad	Update translations	2018-10-14 11:39:21 -07:00
Branden Archer	38d6d6ccff	Merge pull request #273 from brarcher/fix-manual-barcode Fix manual barcode	2018-10-14 11:38:55 -07:00
Branden Archer	866eaea680	Correct log statement when entering barcode manually	2018-10-14 11:24:42 -07:00
Branden Archer	5619c1c003	Revert "Remove unneeded code" The log statement here was misleading. This code is responsible for receiving a barcode that a user typed in manually. This reverts commit `cafa09a86a`.	2018-10-14 11:24:42 -07:00
Branden Archer	b8311044db	Update class file location for FindBugs Gradle now places the compiled class file under a different path.	2018-10-14 11:24:42 -07:00
Branden Archer	3679b9a48a	Update gradle and android plugin	2018-10-14 11:07:21 -07:00