diff --git a/app/src/main/java/com/a1/nextlocation/MainActivity.java b/app/src/main/java/com/a1/nextlocation/MainActivity.java index 19442ab..9097ac9 100644 --- a/app/src/main/java/com/a1/nextlocation/MainActivity.java +++ b/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 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"); + } + }; } \ No newline at end of file diff --git a/app/src/main/java/com/a1/nextlocation/fragments/HelpPopup.java b/app/src/main/java/com/a1/nextlocation/fragments/HelpPopup.java index 3150986..0f7e68d 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/HelpPopup.java +++ b/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; + } } diff --git a/app/src/main/res/layout/help_popup.xml b/app/src/main/res/layout/help_popup.xml new file mode 100644 index 0000000..445d685 --- /dev/null +++ b/app/src/main/res/layout/help_popup.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 07a3df9..868bd7f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -24,4 +24,6 @@ Engels Nederlands Chinees + HELP + 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 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 56bf907..c965083 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,4 +23,6 @@ Dutch English Chinese + HELP + Hasn\'t been translated yet \ No newline at end of file