diff --git a/app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment2.java b/app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment2.java index a406c8d..17eaeaa 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment2.java +++ b/app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment2.java @@ -48,7 +48,6 @@ public class Fragment2 extends Fragment { Bundle args = getArguments(); c = getContext(); ListView listView = new ListView(c); - setContentView(R.layout.fragment2); listView.setAdapter(new MeinAdapter(c, getVideoFiles())); if (args != null) { text = args.getString(KEY_TEXT); diff --git a/app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment3.java b/app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment3.java deleted file mode 100644 index 61eed11..0000000 --- a/app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment3.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.example.ueberwachungssystem.Fragments; - -import android.os.Bundle; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.fragment.app.Fragment; - -import com.example.ueberwachungssystem.R; - -public class Fragment3 extends Fragment { - private String text; - private final static String KEY_TEXT = "KEY_TEXT" ; - private void log(String nachricht) { - Log.d(this.getClass().getSimpleName(), nachricht); - } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) { - log( "onCreateView" ); - View view = inflater.inflate(R.layout.fragment2, container, false ); - TextView Sensor = (TextView) view.findViewById(R.id.Sensor); - Sensor.setText(text); - return view; - } - public static Fragment3 erstellen(String text) { - Fragment3 fragment = new Fragment3(); - Bundle b = new Bundle(); - b.putString(KEY_TEXT, text); - fragment.setArguments(b); - return fragment; - } - @Override - public void onCreate(Bundle bundle) { - super.onCreate(bundle); - Bundle args = getArguments(); - if (args != null) { - text = args.getString(KEY_TEXT); - log("onCreate: text=" + text); - } else { - log("onCreate"); - } - } -} diff --git a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java index adb2a2d..be28406 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java +++ b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java @@ -27,20 +27,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private TextView AoderA; private String auswahltext = "Wahl des Detektionsmodus"; private String auswahlAoderA = "Wahl von Alarmmeldungen oder Auswahl von Alarmaufzeichnungen"; - - //Sensoren und Kommunikation - WifiCommunication communication; //Buttons private ToggleButton toggleKamera; private ToggleButton toggleAudio; private ToggleButton toggleBewegung; - //Überprüfungswerte - boolean wahr; - private void log(String nachricht) { - Log.d(this.getClass().getSimpleName(), nachricht); - } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -62,47 +53,33 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe public void onClick(View v) { if (v == toggleKamera) { if (toggleKamera.isChecked()) { - wahr = true; + } else { - wahr = false; + } } if (v == toggleAudio) { if (toggleAudio.isChecked()) { - wahr = true; + } else { - wahr = false; + } } if (v == toggleBewegung) { if (toggleBewegung.isChecked()) { - wahr = true; + } else { - wahr = false; + } } } - @Override - protected void onPause() { - super.onPause(); - communication.stopCommunication(); - } - - @Override - protected void onResume() { - super.onResume(); - communication = new WifiCommunication(1234); - } - public void onClickZeigeFragment1(View view) { Button button = (Button) view; - log(button.getText() + " ausgewählt"); zeigeFragment(fragment1.erstellen("Hier stehen dann die Alarme")); } public void onClickZeigeFragment2(View view) { Button button = (Button) view; - log(button.getText() + " ausgewählt"); zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos")); } diff --git a/app/src/main/java/com/example/ueberwachungssystem/VideoListAdapter.java b/app/src/main/java/com/example/ueberwachungssystem/VideoListAdapter.java deleted file mode 100644 index 6583b81..0000000 --- a/app/src/main/java/com/example/ueberwachungssystem/VideoListAdapter.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.example.ueberwachungssystem; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import java.io.File; -import java.util.List; - -public class VideoListAdapter extends ArrayAdapter { - - public VideoListAdapter(Context context, List videoList) { - super(context, 0, videoList); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - if (convertView == null) { - convertView = LayoutInflater.from(getContext()).inflate(R.layout.list_item_video, parent, false); - } - - File videoFile = getItem(position); - - ImageView thumbnailImageView = convertView.findViewById(R.id.imageViewThumbnail); - TextView titleTextView = convertView.findViewById(R.id.textViewTitle); - - // Set tag to identify the clicked item - convertView.setTag(videoFile.getAbsolutePath()); - - return convertView; -    } -} \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_main_land.xml b/app/src/main/res/layout-land/activity_main_land.xml deleted file mode 100644 index 41d2ef1..0000000 --- a/app/src/main/res/layout-land/activity_main_land.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment3.xml b/app/src/main/res/layout/fragment3.xml deleted file mode 100644 index a44702c..0000000 --- a/app/src/main/res/layout/fragment3.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file