From 697d10fbebb86ea75cd8770677ecee5b997643a0 Mon Sep 17 00:00:00 2001 From: Benny Date: Thu, 23 Jan 2020 23:22:52 +0100 Subject: [PATCH] dodano funkcje sprawdzajaca dzialanie OpenCV, dodano przycisk do aparatu, utworzono wydarzenie onClick --- .idea/vcs.xml | 1 + .../java/com/example/filife/MainActivity.java | 39 +++++++++++ app/src/main/res/layout/activity_main.xml | 9 +-- gradle.properties | 2 + ...-merger-blame-debug-androidTest-report.txt | 65 ++++++++++++++----- .../debugAndroidTest/AndroidManifest.xml | 15 +++++ 6 files changed, 109 insertions(+), 22 deletions(-) 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"> +