summaryrefslogtreecommitdiff
path: root/sample/src/main/java
diff options
context:
space:
mode:
authorRalf Kistner <ralf@journeyapps.com>2018-11-02 21:17:58 +0300
committerRalf Kistner <ralf@journeyapps.com>2018-11-02 21:17:58 +0300
commit6556f815584f921e21bb088d2f6423baa99d0547 (patch)
tree23de060854e7aa95b7ee04524c239f47a2776777 /sample/src/main/java
parent330cb2b63b216f9309df0d270ac65ca2b7b6d9d3 (diff)
parent5983e2fb8e9f28a0aab8132145d013896b783b4c (diff)
downloadzxing-android-embedded-6556f815584f921e21bb088d2f6423baa99d0547.tar.xz
Merge branch 'akallabeth-about_library_support'
Diffstat (limited to 'sample/src/main/java')
-rw-r--r--sample/src/main/java/example/zxing/MainActivity.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index d0c0a7e7..a6914129 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -15,6 +15,7 @@ import android.widget.Toast;
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 class MainActivity extends AppCompatActivity {
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) {