From e6602d3d4eb0a6c0a5016b9046b19908074d50d3 Mon Sep 17 00:00:00 2001 From: Felix Kramer Date: Sun, 21 Oct 2018 14:36:17 +0200 Subject: [PATCH] - Camera support for card recognition - Added comments - Card capture layout --- .idea/caches/build_file_checksums.ser | Bin 537 -> 595 bytes .idea/gradle.xml | 1 + .idea/misc.xml | 2 +- app/build.gradle | 3 +- app/src/main/AndroidManifest.xml | 13 +++++-- .../schafkopfzaehler_2/MainGameActivity.java | 11 ++++++ app/src/main/res/layout/cardcapture.xml | 36 ++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + settings.gradle | 1 + 9 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/layout/cardcapture.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ed3a5467b02ee5b770c1d4b5e29d1b1d2ffd8dbd..bca8fdd13ac5b4c4bdfd27fb9ef37c2d8f47e47b 100644 GIT binary patch delta 105 zcmV-v0G9um1k(hNmjz~vtr~HWoJ;`+k?C&`8t&J`*wQUw^8u6Lv}56XlV|}P5S&BB zM?d7Fm`lBXV_%ntcaxL>SP>m>aAj^oR!nJPa$$0LGc+@kK>-&K50!V}y-K|!rb)AA L)+Vt%lj;F4oX9OO delta 73 zcmV-P0Ji_r1epYomjz|HSEEjmoJ;`*k?C&`DDY|rnA_&z-xrzD+6``~lV|}P6Q0>% fzC7OtZY^Lg8dpNYp>zNYll}n~ldS - + diff --git a/app/build.gradle b/app/build.gradle index 77dea6a..95cae58 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,11 +19,12 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:design:27.1.1' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation project(':openCVLibrary343') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f08a855..e36114f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,12 @@ - + + + + + + + android:theme="@style/AppTheme.NoActionBar" + /> + /> \ No newline at end of file diff --git a/app/src/main/java/project/schafkopfzaehler_2/MainGameActivity.java b/app/src/main/java/project/schafkopfzaehler_2/MainGameActivity.java index 24645f3..d35b56a 100644 --- a/app/src/main/java/project/schafkopfzaehler_2/MainGameActivity.java +++ b/app/src/main/java/project/schafkopfzaehler_2/MainGameActivity.java @@ -2,6 +2,7 @@ package project.schafkopfzaehler_2; import android.content.Intent; import android.os.Bundle; +import android.provider.MediaStore; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; @@ -16,6 +17,7 @@ public class MainGameActivity extends AppCompatActivity { private Button p1, p2, p3, p4, chooseGame; // Button init private TextView choice; private String playerNames[] = {"", "", "", ""}; // Player names init + static final int REQUEST_VIDEO_CAPTURE = 1; private View.OnClickListener startClickListener = new View.OnClickListener() { @@ -85,6 +87,11 @@ public class MainGameActivity extends AppCompatActivity { private void playerButtonClicked (View v) { Log.d("MainGame", v + " clicked..."); + Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE); + if (takeVideoIntent.resolveActivity(getPackageManager()) != null) { + startActivityForResult(takeVideoIntent, REQUEST_VIDEO_CAPTURE); + } + } @@ -102,6 +109,10 @@ public class MainGameActivity extends AppCompatActivity { choice.setText(announcement); } } + + if (requestCode == REQUEST_VIDEO_CAPTURE && resultCode == RESULT_OK) { + // Do nothing... + } } } diff --git a/app/src/main/res/layout/cardcapture.xml b/app/src/main/res/layout/cardcapture.xml new file mode 100644 index 0000000..a939e27 --- /dev/null +++ b/app/src/main/res/layout/cardcapture.xml @@ -0,0 +1,36 @@ + + + + + + + +