diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 32eb6f3..dd0a69d 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,7 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/filife/MainActivity.java b/app/src/main/java/com/example/filife/MainActivity.java
index e3642cf..15a00c8 100644
--- a/app/src/main/java/com/example/filife/MainActivity.java
+++ b/app/src/main/java/com/example/filife/MainActivity.java
@@ -3,12 +3,51 @@ package com.example.filife;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import org.opencv.android.OpenCVLoader;
+
public class MainActivity extends AppCompatActivity {
+
+ Button OpenCamera_j;
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+
+ //Sprawdzenie załadowania biblioteki OPENCV
+ //***************************************************************************************************//
+
+ if(OpenCVLoader.initDebug())
+ {
+ Toast.makeText(getApplicationContext(),"OpenCV zaladowane poprawnie",Toast.LENGTH_SHORT).show();
+ }
+ else
+ {
+ Toast.makeText(getApplicationContext(),"OpenCV nie zostalo zaladowane", Toast.LENGTH_SHORT).show();
+ }
+
+ //***********************************************************************************************//
+
+ //Przypisanie przycisku Open Camera xml do zmiennej w javie, stworzenie zdarzenia onClick
+ //**************************************************************************************************//
+
+ OpenCamera_j = (Button) findViewById(R.id.OpenCamera);
+
+ OpenCamera_j.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ Toast.makeText(MainActivity.this," Otworzyłeś aparat!", Toast.LENGTH_SHORT).show();
+ }
+ });
+
+
}
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3aacb9b..4a62c17 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,11 +6,12 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
+
+ tools:layout_editor_absoluteX="1dp"
+ tools:layout_editor_absoluteY="686dp" />
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 199d16e..cbb3a1b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,3 +18,5 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
+android.useDeprecatedNDK=true
+
diff --git a/openCVLibrary341/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/openCVLibrary341/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
index 20de4a5..eeef25f 100644
--- a/openCVLibrary341/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/openCVLibrary341/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -3,31 +3,60 @@
3 package="org.opencv.test" >
4
5 C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:5:5-74
+5-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:5:5-74
6 android:minSdkVersion="15"
-6-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:5:15-41
+6-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:5:15-41
7 android:targetSdkVersion="29" />
-7-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:5:42-71
+7-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:5:42-71
8
9 C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:11:5-15:65
+9-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:11:5-15:65
10 android:name="android.test.InstrumentationTestRunner"
-10-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:11:22-75
+10-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:11:22-75
11 android:functionalTest="false"
-11-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:14:22-52
+11-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:14:22-52
12 android:handleProfiling="false"
-12-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:13:22-53
+12-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:13:22-53
13 android:label="Tests for org.opencv.test"
-13-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:15:22-63
+13-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:15:22-63
14 android:targetPackage="org.opencv.test" />
-14-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:12:22-61
+14-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:12:22-61
15
-16
-16-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:7:5-9:19
-16-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:7:18-43
-17
-17-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:8:9-60
-17-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger2016417345742097501.xml:8:23-57
-18
-19
-20
+16
+16-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-65
+16-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:22-62
+17
+18 [__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:13:5-15:36
+19 android:name="android.hardware.camera"
+19-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:14:9-47
+20 android:required="false" />
+20-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:9-33
+21 [__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:5-18:36
+22 android:name="android.hardware.camera.autofocus"
+22-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:17:9-57
+23 android:required="false" />
+23-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:9-33
+24 [__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:19:5-21:36
+25 android:name="android.hardware.camera.front"
+25-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:20:9-53
+26 android:required="false" />
+26-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:21:9-33
+27 [__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:22:5-24:36
+28 android:name="android.hardware.camera.front.autofocus"
+28-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:9-63
+29 android:required="false" />
+29-->[__tested_artifact__::openCVLibrary341] C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\library_manifest\debug\AndroidManifest.xml:24:9-33
+30
+31
+31-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:7:5-9:19
+31-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:7:18-43
+32
+32-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:8:9-60
+32-->C:\Users\Benny\Desktop\Filife\openCVLibrary341\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8178154381274492171.xml:8:23-57
+33
+34
+35
diff --git a/openCVLibrary341/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml b/openCVLibrary341/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
index da63143..0d08e33 100644
--- a/openCVLibrary341/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
+++ b/openCVLibrary341/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
@@ -13,6 +13,21 @@
android:label="Tests for org.opencv.test"
android:targetPackage="org.opencv.test" />
+
+
+
+
+
+
+