Merge branch 'helpPopup' into develop

app/src/main/java/com/a1/nextlocation/MainActivity.java

@@ -1,13 +1,19 @@
 package com.a1.nextlocation;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageButton;
 
+import com.a1.nextlocation.fragments.HelpPopup;
 import com.a1.nextlocation.fragments.HomeFragment;
 import com.a1.nextlocation.fragments.Refreshable;
 import com.a1.nextlocation.fragments.RouteFragment;
@@ -23,6 +29,7 @@ import java.util.Locale;
 public class MainActivity extends AppCompatActivity implements Refreshable {
     private static final String TAG = MainActivity.class.getName();
     private BottomNavigationView bottomNav;
+    private ImageButton infoButton;
 
     /**
      * onCreate method that creates the main activity
@@ -38,6 +45,8 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
         setContentView(R.layout.activity_main);
         bottomNav = findViewById(R.id.navigation_bar);
         bottomNav.setOnNavigationItemSelectedListener(navListener);
+        infoButton = findViewById(R.id.info_button);
+        infoButton.setOnClickListener(onInfoClickListener);
 
         /*System.out.println(Arrays.toString(getFilesDir().listFiles()));
         FileIO<Route> fileIO = new FileIO<>();
@@ -109,4 +118,23 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
         bottomNav.inflateMenu(R.menu.navmenu);
         bottomNav.setSelectedItemId(R.id.settings);
     }
+
+    private View.OnClickListener onInfoClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+
+//            AlertDialog.Builder infoBuilder = new AlertDialog.Builder(getBaseContext());
+//            infoBuilder.setCancelable(true);
+////            infoBuilder.setPositiveButton(R.string.activate, (dialog, which) -> {
+////                dialog.cancel();
+////            });
+//            infoBuilder.setView(getLayoutInflater().inflate(R.layout.help_popup, null));
+//            AlertDialog infoPopup = infoBuilder.create();
+//            infoPopup.show();
+
+            FragmentManager fragment = getSupportFragmentManager();
+            DialogFragment helpPopupFragment = new HelpPopup();
+            helpPopupFragment.show(fragment, "YEET");
+        }
+    };
 }

app/src/main/java/com/a1/nextlocation/fragments/HelpPopup.java

@@ -1,4 +1,20 @@
 package com.a1.nextlocation.fragments;
 
-public class HelpPopup {
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.fragment.app.DialogFragment;
+
+import com.a1.nextlocation.R;
+
+public class HelpPopup extends DialogFragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.help_popup, container, false);
+        getDialog().setTitle("Simple Dialog");
+        return rootView;
+    }
 }

app/src/main/res/layout/help_popup.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<androidx.appcompat.widget.LinearLayoutCompat-->
+<!--    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"-->
+<!--    android:layout_height="match_parent"-->
+<!--    android:layout_gravity="center"-->
+<!--    android:orientation="vertical">-->
+
+<!--    <TextView-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:text="@string/help"-->
+<!--        android:textAlignment="center"-->
+<!--        android:background="@color/secondaryColour"-->
+<!--        android:paddingVertical="10dp"/>-->
+<!--    -->
+<!--    <TextView-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="400dp"-->
+<!--        android:text="@string/help_discription"-->
+<!--        android:background="@color/primaryColour"/>-->
+<!--    -->
+
+
+<!--</androidx.appcompat.widget.LinearLayoutCompat>-->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/helpPopConst"
+    android:layout_height="500dp"
+    android:layout_width="300dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_gravity="center"
+    android:background="@color/primaryColour">
+
+    <TextView
+        android:id="@+id/helpPopTitle"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="300dp"
+        android:layout_height="50dp"
+        android:text="@string/help"
+        android:textColor="@color/black"
+        android:textAlignment="center"
+        android:background="@color/secondaryColour"
+        android:paddingVertical="10dp"/>
+
+
+
+    <TextView
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/helpPopTitle"
+        android:layout_width="280dp"
+        android:layout_height="380dp"
+        android:text="@string/help_discription"
+        android:textColor="@color/white"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"/>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-nl/strings.xml

@@ -24,4 +24,6 @@
     <string name="English">Engels</string>
     <string name="Dutch">Nederlands</string>
     <string name="Chinese">Chinees</string>
+    <string name="help">HELP</string>
+    <string name="help_discription">Onderaan het scherm zijn verschillende knoppen te zien. Deze knoppen hebben de volgende functies: \nLocaties: toont een lijst met alle locaties die bezocht kunnen worden. Elke locatie wordt kort beschreven. \nRoutes: Toont een lijst met alle routes die gelopen kunnen worden. Van elke route wordt een omschrijving gegeven. \nStatistieken: Toont persoonlijke statistieken.  \nInstellingen: Hier kunnen app-instellingen worden aangepast naar eigen voorkeur. \n\nEen locatie ingedrukt houden laat extra informatie zien over de gekozen locatie</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -23,4 +23,6 @@
     <string name="Dutch">Dutch</string>
     <string name="English">English</string>
     <string name="Chinese">Chinese</string>
+    <string name="help">HELP</string>
+    <string name="help_discription">Hasn\'t been translated yet</string>
 </resources>