Merge branch 'akallabeth-about_library_support'

Author: rkistner

sample/build.gradle

@@ -65,4 +65,8 @@ dependencies {
     implementation 'com.android.support:support-v13:27.1.1'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+
+    // AboutLibraries
+    implementation "com.mikepenz:aboutlibraries:6.1.1"
+
 }

sample/src/main/java/example/zxing/MainActivity.java

@@ -15,6 +15,7 @@
 import com.google.zxing.client.android.Intents;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
+import com.mikepenz.aboutlibraries.LibsBuilder;
 
 
 public class MainActivity extends AppCompatActivity {
@@ -104,6 +105,10 @@ public void tabs(View view) {
         startActivity(intent);
     }
 
+    public void about(View view) {
+        new LibsBuilder().start(this);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode != CUSTOMIZED_REQUEST_CODE && requestCode != IntentIntegrator.REQUEST_CODE) {

sample/src/main/res/layout/activity_main.xml

@@ -98,6 +98,14 @@
             android:layout_height="wrap_content"
             android:text="@string/tabs"
             android:onClick="tabs"/>
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/about"
+            android:onClick="about"/>
+
+
     </LinearLayout>
 
 

sample/src/main/res/values/strings.xml

@@ -16,5 +16,6 @@
     <string name="turn_off_flashlight">Turn off Flashlight</string>
     <string name="title_activity_tabbed_scanning">Tabbed Scanning</string>
     <string name="tabs">Tabs</string>
+    <string name="about">About</string>
 
 </resources>

zxing-android-embedded/build.gradle

@@ -48,6 +48,16 @@ android {
     defaultConfig {
         minSdkVersion 14
     }
+
+    buildTypes {
+        debug {
+            versionNameSuffix ".debug"
+            resValue "string", "app_version", "${defaultConfig.versionName}${versionNameSuffix}"
+        }
+        release {
+            resValue "string", "app_version", "${defaultConfig.versionName}"
+        }
+    }
 }
 
 task sourceJar(type: Jar) {

zxing-android-embedded/res/values/zxing_about_library_strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName" >
+    <string name="define_zxingandroidembedded" translatable="false" />
+    <!-- Author section -->
+    <string name="library_zxingandroidembedded_author" translatable="false">JourneyApps</string>
+    <string name="library_zxingandroidembedded_authorWebsite" translatable="false">https://journeyapps.com/</string>
+    <!-- Library section -->
+    <string name="library_zxingandroidembedded_libraryName" translatable="false">ZXing Android Embedded</string>
+    <string name="library_zxingandroidembedded_libraryDescription" translatable="false">Barcode scanning library for Android, using ZXing for decoding.</string>
+    <string name="library_zxingandroidembedded_libraryWebsite" translatable="false">https://github.com/journeyapps/zxing-android-embedded</string>
+    <string name="library_zxingandroidembedded_libraryVersion" translatable="false" />
+    <!-- OpenSource section -->
+    <string name="library_zxingandroidembedded_isOpenSource" translatable="false">true</string>
+    <string name="library_zxingandroidembedded_repositoryLink" translatable="false">https://github.com/journeyapps/zxing-android-embedded</string>
+    <!-- License section -->
+    <string name="library_zxingandroidembedded_licenseId" translatable="false">apache_2_0</string>
+    <!-- Custom variables section -->
+</resources>
+