diff --git a/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java index d79bfa2..30a4caa 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java @@ -3,10 +3,12 @@ package com.a1.nextlocation.fragments; import android.os.Bundle; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageButton; import android.widget.TextView; import com.a1.nextlocation.R; @@ -16,6 +18,7 @@ public class RouteDetailFragment extends Fragment { private Route route; private TextView routeDetailText; + private ImageButton imageButton; @Override public void onCreate(Bundle savedInstanceState) { @@ -33,6 +36,12 @@ public class RouteDetailFragment extends Fragment { this.routeDetailText = view.findViewById(R.id.routeDetailText); this.routeDetailText.setText(this.route.getName()); + this.imageButton = view.findViewById(R.id.route_detail_back_button); + this.imageButton.setOnClickListener(v -> { + RouteFragment routeFragment = new RouteFragment(); + ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, routeFragment).addToBackStack(null).commit(); + }); + return view; } diff --git a/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java index d2898c1..e9e6f85 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java @@ -13,6 +13,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageButton; import com.a1.nextlocation.R; import com.a1.nextlocation.data.Route; @@ -33,6 +34,7 @@ public class RouteFragment extends Fragment { private RecyclerView.LayoutManager layoutManager; private List routeList; private RouteAdapter routeAdapter; + private ImageButton imageButton; @Override public void onCreate(Bundle savedInstanceState) { @@ -61,6 +63,12 @@ public class RouteFragment extends Fragment { ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, routeDetailFragment).addToBackStack(null).commit(); }); + this.imageButton = view.findViewById(R.id.route_back_button); + this.imageButton.setOnClickListener(v -> { + HomeFragment homeFragment = new HomeFragment(); + ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit(); + }); + this.routeRecyclerView.setLayoutManager(this.layoutManager); this.routeRecyclerView.setAdapter(this.routeAdapter); return view; diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java index 721ba3e..0b80f41 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java @@ -5,11 +5,13 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.ImageView; import android.widget.Spinner; import com.a1.nextlocation.MainActivity; @@ -17,6 +19,8 @@ import com.a1.nextlocation.R; public class SettingsFragment extends Fragment { + private ImageView imageButton; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -36,6 +40,12 @@ public class SettingsFragment extends Fragment { // Inflate the layout for this fragment Spinner dropdown = view.findViewById(R.id.dropdown_menu_Settings); + this.imageButton = view.findViewById(R.id.route_detail_back_button); + this.imageButton.setOnClickListener(v -> { + HomeFragment homeFragment = new HomeFragment(); + ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit(); + }); + String[] items = new String[]{"Nederlands", "Engels", "Chinees"}; ArrayAdapter arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items); diff --git a/app/src/main/res/layout-land/fragment_location_detail.xml b/app/src/main/res/layout-land/fragment_location_detail.xml index 675f626..6e87547 100644 --- a/app/src/main/res/layout-land/fragment_location_detail.xml +++ b/app/src/main/res/layout-land/fragment_location_detail.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="Locatie detail" + android:text="@string/locatie_detail" android:textColor="@color/white" android:textSize="30sp" app:layout_constraintEnd_toEndOf="parent" @@ -35,7 +35,7 @@ android:layout_height="283dp" android:layout_marginEnd="30dp" android:background="@color/secondaryColour" - android:text="Detail tekst" + android:text="@string/locatie_detail_tekst" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/detail_location_name" /> diff --git a/app/src/main/res/layout-land/fragment_route_detail.xml b/app/src/main/res/layout-land/fragment_route_detail.xml index ebd2b7e..e13fce8 100644 --- a/app/src/main/res/layout-land/fragment_route_detail.xml +++ b/app/src/main/res/layout-land/fragment_route_detail.xml @@ -7,6 +7,19 @@ android:background="@color/primaryColour" tools:context=".fragments.RouteDetailFragment"> +