diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index ed3a546..bca8fdd 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..da10681 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,6 +9,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99202cc..c0f68ed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
-
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 73b68fe..2dcdd3e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
Was wurde gerufen?
Was war die Trumpffarbe?
ActivityMainGame
+ ChooseGame
Neue Ansage
Angesagt\:
Es wurde noch nichts angesagt...
diff --git a/settings.gradle b/settings.gradle
index e7b4def..5a33203 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
include ':app'
+include ':openCVLibrary343'