25 Commits

Author SHA1 Message Date
Sem van der Hoeven
5edf50c808 Merge branch 'Fragment' into develop 2020-12-17 10:07:36 +01:00
Sem van der Hoeven
db7d944a41 [ADD] log 2020-12-17 10:04:43 +01:00
Sem van der Hoeven
3f132f48a7 [ADD] start of api calls 2020-12-16 12:11:48 +01:00
Sem van der Hoeven
17f624cc30 [ADD] longitude latitude doubles in location 2020-12-16 11:54:35 +01:00
Robin Koedood
4f68398f33 [ADD] route detail landscape mode 2020-12-16 11:38:24 +01:00
Robin Koedood
4229acf87c [ADD] Route Detail Contraints 2020-12-16 11:20:52 +01:00
Sem van der Hoeven
521c9fd188 Merge branch 'RecyclerView' into develop 2020-12-16 11:20:41 +01:00
Sem van der Hoeven
1fd245f4f0 [ADD] all methods from daos to repos 2020-12-16 11:04:06 +01:00
Sem van der Hoeven
8d210a9707 [ADD] image url to location 2020-12-16 10:58:44 +01:00
RemoMeijer
ee1ae23e0f Merge branch 'develop' into RecyclerView 2020-12-16 10:56:36 +01:00
Sem van der Hoeven
49f78efdd3 [ADD] update and insert coupon 2020-12-16 10:56:03 +01:00
Sem van der Hoeven
512ad3980f [FIX] mapview stuff 2020-12-16 10:48:11 +01:00
RemoMeijer
e2f76c94f7 Merge branch 'develop' into RecyclerView
# Conflicts: resolved
#	app/src/main/res/layout/fragment_location.xml
#	app/src/main/res/layout/fragment_location_detail.xml
2020-12-16 10:43:46 +01:00
Sem van der Hoeven
2479563474 Merge branch 'data' into develop 2020-12-14 15:10:09 +01:00
Sem van der Hoeven
ea59b97f0f merge fragment 2020-12-14 15:09:59 +01:00
sebas
75b7ff47cd [Added] small changes to route detail, location detail 2020-12-14 14:51:43 +01:00
sebas
a2d1ecfc71 [Added] layout created for routedetailfragment 2020-12-14 14:38:47 +01:00
Bart
996b061b65 Merge branch 'bottomNavigation' into develop 2020-12-14 13:36:18 +01:00
Bart
ad6e171a14 [ADD] bottomNav functionality
TODO: change placeholder icons
2020-12-14 12:22:26 +01:00
RemoMeijer
16b9b15856 Added some functionality 2020-12-14 12:05:32 +01:00
sebas
63c49c40d7 [change] Small change to adapter classes 2020-12-14 11:39:29 +01:00
sebas
13b73fb0de [Added] created method for CouponListManager 2020-12-14 11:21:43 +01:00
sebas
e5fa7db27d [Added] Added some functionallity to the adapters (not finished yet due to missing functionallity from other classes) 2020-12-14 11:19:39 +01:00
sebas
aee2797a0f [Added] methods to CouponAdapter 2020-12-14 11:10:51 +01:00
RemoMeijer
12b446b679 Implemented all Methods and interfaces 2020-12-14 11:09:00 +01:00
31 changed files with 689 additions and 73 deletions

View File

@@ -1,13 +1,21 @@
package com.a1.nextlocation; package com.a1.nextlocation;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem;
import com.a1.nextlocation.R; import com.a1.nextlocation.R;
import com.a1.nextlocation.fragments.HomeFragment;
import com.a1.nextlocation.fragments.RouteFragment;
import com.a1.nextlocation.fragments.SettingsFragment;
import com.a1.nextlocation.fragments.StatisticFragment;
import com.google.android.material.bottomnavigation.BottomNavigationView;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
/** /**
* onCreate method that creates the main activity * onCreate method that creates the main activity
* @param savedInstanceState the saved instance state of the app * @param savedInstanceState the saved instance state of the app
@@ -16,5 +24,33 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
BottomNavigationView bottomNav = findViewById(R.id.navbar);
bottomNav.setOnNavigationItemSelectedListener(navListener);
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).commit();
} }
private BottomNavigationView.OnNavigationItemSelectedListener navListener = item -> {
Fragment selectedFragment = null;
switch (item.getItemId()) {
case R.id.locations:
selectedFragment = new HomeFragment();
break;
case R.id.routes:
selectedFragment = new RouteFragment();
break;
case R.id.statistics:
selectedFragment = new StatisticFragment();
break;
case R.id.settings:
selectedFragment = new SettingsFragment();
break;
}
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, selectedFragment).commit();
return true;
};
} }

View File

@@ -1,6 +1,8 @@
package com.a1.nextlocation.data; package com.a1.nextlocation.data;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.room.ColumnInfo;
import androidx.room.Entity; import androidx.room.Entity;
import androidx.room.PrimaryKey; import androidx.room.PrimaryKey;
@@ -13,13 +15,26 @@ public class Location {
@NonNull @NonNull
private String name; private String name;
/**
* coordinates will be saved as for example: 2.434343,4.65656;3.656565,6.43434
* so lat1,long1;lat2,long2
*/
private String coordinates; private String coordinates;
private String description; private String description;
public Location(@NotNull String name, String coordinates, String description) { @ColumnInfo(name = "image_url")
@Nullable
private String imageUrl;
public Location(@NotNull String name, String coordinates, String description, @Nullable String imageUrl) {
this.name = name; this.name = name;
this.coordinates = coordinates; this.coordinates = coordinates;
this.description = description; this.description = description;
this.imageUrl = imageUrl;
}
public Location(@NotNull String name, double latCoord, double longCoord, String description, @Nullable String imageUrl) {
this(name,getStringFromCoordinates(latCoord,longCoord),description,imageUrl);
} }
@NotNull @NotNull
@@ -46,4 +61,34 @@ public class Location {
public void setDescription(String description) { public void setDescription(String description) {
this.description = description; this.description = description;
} }
@Nullable
public String getImageUrl() {
return imageUrl;
}
public void setImageUrl(@Nullable String imageUrl) {
this.imageUrl = imageUrl;
}
public double[] getCoordinatesAsDoubles() {
double[] res = new double[2];
res[0] = getLat();
res[1] = getLong();
return res;
}
public double getLat() {
return Double.parseDouble(this.coordinates.split(",")[0]);
}
public double getLong() {
return Double.parseDouble(this.coordinates.split(",")[1]);
}
public static String getStringFromCoordinates(double lat1, double long1) {
return lat1 + "," + long1;
}
} }

View File

@@ -53,6 +53,7 @@ public abstract class Database extends RoomDatabase {
super.onCreate(db); super.onCreate(db);
databaseWriterExecutor.execute(() -> { databaseWriterExecutor.execute(() -> {
// TODO populate our database here // TODO populate our database here
}); });

View File

@@ -22,6 +22,9 @@ public interface CouponDao {
@Query("SELECT * FROM coupon") @Query("SELECT * FROM coupon")
LiveData<List<Coupon>> selectAll(); LiveData<List<Coupon>> selectAll();
@Update
public void update(Coupon coupon);
/* /*
to add an observer to the livedata, you can use the example from https://medium.com/mindorks/using-room-database-with-livedata-android-jetpack-cbf89b677b47 to add an observer to the livedata, you can use the example from https://medium.com/mindorks/using-room-database-with-livedata-android-jetpack-cbf89b677b47
*/ */

View File

@@ -23,6 +23,9 @@ public interface DataDao {
@Query("SELECT * FROM userdata LIMIT 1") @Query("SELECT * FROM userdata LIMIT 1")
Data getData(); Data getData();
@Query("SELECT * FROM userdata WHERE distance_traveled = :distance LIMIT 1")
Data getDataByDistance(float distance);
} }

View File

@@ -20,6 +20,14 @@ public class CouponRepository {
mAllCoupons = mCouponDao.selectAll(); mAllCoupons = mCouponDao.selectAll();
} }
public void insert(Coupon... coupons) {
mCouponDao.insertAll(coupons);
}
public void update(Coupon coupon) {
mCouponDao.update(coupon);
}
public LiveData<List<Coupon>> getAllCoupons() { public LiveData<List<Coupon>> getAllCoupons() {
return mAllCoupons; return mAllCoupons;
} }
@@ -27,4 +35,8 @@ public class CouponRepository {
public Coupon getCoupon(String code) { public Coupon getCoupon(String code) {
return mCouponDao.selectCouponByCode(code); return mCouponDao.selectCouponByCode(code);
} }
public void deleteAll() {
mCouponDao.deleteAll();
}
} }

View File

@@ -20,5 +20,21 @@ public class DataRepository {
return data; return data;
} }
public Data getDataByDistance(float distance) {
return mDataDao.getDataByDistance(distance);
}
public void deleteAll() {
mDataDao.delete();
}
public void update(Data data) {
mDataDao.update(data);
}
public void insertAll(Data... datas) {
mDataDao.insertAll(datas);
}
} }

View File

@@ -27,4 +27,12 @@ public class LocationRepository {
public Location getLocationByName(String name) { public Location getLocationByName(String name) {
return mLocationDao.getLocationByName(name); return mLocationDao.getLocationByName(name);
} }
public void insertAll(Location... locations) {
mLocationDao.insertAll(locations);
}
public void deleteAll() {
mLocationDao.deleteAll();
}
} }

View File

@@ -27,4 +27,8 @@ public class RouteRepository {
public Route getRouteByName(String name) { public Route getRouteByName(String name) {
return mRouteDao.getRouteByName(name); return mRouteDao.getRouteByName(name);
} }
public void deleteAll() {
mRouteDao.deleteAll();
}
} }

View File

@@ -1,11 +1,17 @@
package com.a1.nextlocation.fragments; package com.a1.nextlocation.fragments;
import android.Manifest; import android.Manifest;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.location.Location; import android.location.Location;
import android.location.LocationManager; import android.location.LocationManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@@ -13,11 +19,6 @@ import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.a1.nextlocation.R; import com.a1.nextlocation.R;
import org.osmdroid.api.IMapController; import org.osmdroid.api.IMapController;
@@ -69,7 +70,7 @@ public class HomeFragment extends Fragment {
Configuration.getInstance().setUserAgentValue(userAgent); Configuration.getInstance().setUserAgentValue(userAgent);
// create the map view // create the map view
mapView = (MapView) view.findViewById(R.id.mapView); mapView = view.findViewById(R.id.mapView);
mapView.setDestroyMode(false); mapView.setDestroyMode(false);
mapView.setTag("mapView"); mapView.setTag("mapView");
mapView.setMultiTouchControls(true); mapView.setMultiTouchControls(true);

View File

@@ -2,6 +2,8 @@ package com.a1.nextlocation.fragments;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -23,15 +25,20 @@ public class SettingsFragment extends Fragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_settings, container, false);
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// Inflate the layout for this fragment // Inflate the layout for this fragment
View view = getView();
Spinner dropdown = view.findViewById(R.id.dropdown_menu_Settings); Spinner dropdown = view.findViewById(R.id.dropdown_menu_Settings);
String[] items = new String[]{"Nederlands", "Engels", "Chinees"}; String[] items = new String[]{"Nederlands", "Engels", "Chinees"};
ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items); ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items);
dropdown.setAdapter(arrayAdapter); dropdown.setAdapter(arrayAdapter);
return inflater.inflate(R.layout.fragment_settings, container, false);
} }
} }

View File

@@ -0,0 +1,68 @@
package com.a1.nextlocation.network;
import android.util.Log;
import com.a1.nextlocation.data.Location;
import com.a1.nextlocation.data.Route;
import java.io.IOException;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
public enum ApiHandler {
INSTANCE;
private static String TAG = ApiHandler.class.getCanonicalName();
public static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
private final String BASE_URL = "https://api.openrouteservice.org/v2/directions/";
private final String API_KEY = "5b3ce3597851110001cf6248d4eee2099f724255918adc71cc502b2a";
private final String DIRECTIONS_MODE = "foot_walking";
private OkHttpClient client = new OkHttpClient();
public Route getDirections(Location startLocation, Location endLocation) {
return getDirections(startLocation.getCoordinates(),endLocation.getCoordinates());
}
public Route getDirections(double startLat, double startLong, double endLat, double endLong) {
return getDirections(startLat + "," + startLong, endLat + "," + endLong);
}
public Route getDirections(String startLocation, String endLocation) {
String requestUrl = BASE_URL + DIRECTIONS_MODE + "?api_key=" + API_KEY + "&start=" +startLocation + "&end=" + endLocation;
AtomicReference<Route> res = null;
Thread t = new Thread(() -> {
Request request = new Request.Builder().url(requestUrl).build();
try (Response response = client.newCall(request).execute()) {
if (response.body() != null) {
String responseString = Objects.requireNonNull(response.body()).string();
Log.d(TAG, "getDirections: got response: " + responseString);
}
} catch (IOException e) {
Log.d(TAG, "getDirections: caught exception: " + e.getLocalizedMessage());
}
});
t.start();
try {
t.join();
} catch (InterruptedException e) {
e.printStackTrace();
}
return res.get();
}
}

View File

@@ -1,8 +1,61 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
public class CouponAdapter { import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
class CouponViewHolder { import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.a1.nextlocation.data.Coupon;
import java.util.List;
public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponViewHolder> {
private Context appContext;
private List<Coupon> couponList;
private OnItemClickListener clickListener;
public interface OnItemClickListener {
void onItemClick(int clickedPosition);
}
class CouponViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
public CouponViewHolder(@NonNull View itemView) {
super(itemView);
}
@Override
public void onClick(View view) {
clickListener.onItemClick(getAdapterPosition());
}
}
public CouponAdapter(Context context, List<Coupon> coupon, OnItemClickListener listener){
appContext = context;
couponList = coupon;
clickListener = listener;
}
@NonNull
@Override
public CouponViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return null;
}
@Override
public void onBindViewHolder(@NonNull CouponViewHolder holder, int position) {
} }
@Override
public int getItemCount() {
return couponList.size();
}
} }

View File

@@ -1,4 +1,23 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
import com.a1.nextlocation.data.Coupon;
import java.util.List;
public class CouponListManager { public class CouponListManager {
private List<Coupon> coupon;
public CouponListManager(){
}
public List<Coupon> getCoupon() {
return coupon;
}
public void setCoupon(List<Coupon> location) {
this.coupon = coupon;
}
} }

View File

@@ -1,4 +1,8 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
public class CouponLoader { public class CouponLoader implements Loader{
@Override
public void load() {
}
} }

View File

@@ -0,0 +1,5 @@
package com.a1.nextlocation.recyclerview;
public interface Loader {
void load();
}

View File

@@ -1,8 +1,70 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
public class LocationAdapter { import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
class LocationViewHolder { import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.a1.nextlocation.R;
import com.a1.nextlocation.data.Location;
import java.util.List;
public class LocationAdapter extends RecyclerView.Adapter<LocationAdapter.LocationViewHolder> {
private Context appContext;
private List<Location> locationList;
private CouponAdapter.OnItemClickListener clickListener;
public interface OnItemClickListener {
void onItemClick(int clickedPosition);
}
class LocationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
private TextView locationName;
public LocationViewHolder(@NonNull View itemView) {
super(itemView);
this.locationName = itemView.findViewById(R.id.location_name);
}
@Override
public void onClick(View view) {
clickListener.onItemClick(getAdapterPosition());
}
public void setTextViewText(String text){
locationName.setText(text);
}
}
public LocationAdapter(Context context, List<Location> location, CouponAdapter.OnItemClickListener listener){
this.appContext = context;
this.locationList = location;
this.clickListener = listener;
}
@NonNull
@Override
public LocationAdapter.LocationViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_location, parent, false);
LocationViewHolder viewHolder = new LocationViewHolder(itemView);
return viewHolder;
}
@Override
public void onBindViewHolder(@NonNull LocationAdapter.LocationViewHolder holder, int position) {
Location location = locationList.get(position);
holder.setTextViewText(location.getName());
}
@Override
public int getItemCount() {
return locationList.size();
} }
} }

View File

@@ -1,4 +1,22 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
import com.a1.nextlocation.data.Location;
import java.util.List;
public class LocationListManager { public class LocationListManager {
private List<Location> location;
public LocationListManager(){
}
public List<Location> getLocation() {
return location;
}
public void setLocation(List<Location> location) {
this.location = location;
}
} }

View File

@@ -1,4 +1,8 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
public class LocationLoader { public class LocationLoader implements Loader{
@Override
public void load() {
}
} }

View File

@@ -1,8 +1,57 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
public class RouteAdapter { import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
class RouteViewHolder { import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.a1.nextlocation.data.Route;
import java.util.List;
public class RouteAdapter extends RecyclerView.Adapter<RouteAdapter.RouteViewHolder>{
private Context appContext;
private List<Route> routeList;
private CouponAdapter.OnItemClickListener clickListener;
public interface OnItemClickListener {
void onItemClick(int clickedPosition);
}
class RouteViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
public RouteViewHolder(@NonNull View itemView) {
super(itemView);
}
@Override
public void onClick(View view) {
clickListener.onItemClick(getAdapterPosition());
}
}
public RouteAdapter(Context context, List<Route> route, CouponAdapter.OnItemClickListener listener){
appContext = context;
routeList = route;
clickListener = listener;
}
@NonNull
@Override
public RouteAdapter.RouteViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return null;
}
@Override
public void onBindViewHolder(@NonNull RouteAdapter.RouteViewHolder holder, int position) {
} }
@Override
public int getItemCount() {
return routeList.size();
}
} }

View File

@@ -1,4 +1,27 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
public class RouteListManager { import com.a1.nextlocation.data.Route;
import java.util.List;
public class RouteListManager implements Loader{
List<Route> routes;
public RouteListManager(){
}
public List<Route> getRoutes() {
return routes;
}
public void setRoutes(List<Route> routes) {
this.routes = routes;
}
@Override
public void load() {
}
} }

View File

@@ -1,4 +1,8 @@
package com.a1.nextlocation.recyclerview; package com.a1.nextlocation.recyclerview;
public class RouteLoader { public class RouteLoader implements Loader {
@Override
public void load() {
}
} }

View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M8,5v14l11,-7z"/>
</vector>

View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
</vector>

View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"
android:fillColor="@android:color/white"/>
</vector>

View File

@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
tools:context=".fragments.RouteDetailFragment">
<ImageButton
android:id="@+id/routeDetailBackButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/ic_back_button_24"
app:layout_constraintBottom_toBottomOf="@+id/routeTitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/routeTitle"
app:layout_constraintEnd_toStartOf="@id/routeTitle"
/>
<TextView
android:id="@+id/routeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="250dp"
android:text="titel"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/routeDetailImage"
app:layout_constraintEnd_toStartOf="@+id/routeDetailText"
app:layout_constraintStart_toEndOf="@id/routeDetailBackButton"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/routeDetailImage"
android:layout_width="250dp"
android:layout_height="250dp"
android:layout_marginEnd="350dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/routeDetailText"
android:layout_width="0dp"
android:layout_height="10dp"
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp"
android:layout_marginBottom="200dp"
android:text=""
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/routeDetailImage"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/startRouteButton"
android:src="@drawable/ic_baseline_play_arrow_24"
android:backgroundTint="@color/primaryColour"
android:scaleX="5"
android:scaleY="5"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="350dp"
app:layout_constraintBottom_toBottomOf="@+id/startRouteText"
app:layout_constraintEnd_toStartOf="@id/startRouteText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/startRouteText" />
<TextView
android:id="@+id/startRouteText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:text="@string/start_route"
android:textSize="50sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/startRouteButton"
app:layout_constraintTop_toBottomOf="@id/routeDetailImage" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -6,7 +6,7 @@
tools:context=".fragments.HomeFragment"> tools:context=".fragments.HomeFragment">
<com.google.android.gms.maps.MapView <org.osmdroid.views.MapView
android:id="@+id/mapView" android:id="@+id/mapView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

View File

@@ -31,16 +31,14 @@
<TextView <TextView
android:id="@+id/detail_location_text" android:id="@+id/detail_location_text"
android:layout_width="378dp" android:layout_width="match_parent"
android:layout_height="379dp" android:layout_margin="20dp"
android:layout_height="wrap_content"
android:background="@color/secondaryColour" android:background="@color/secondaryColour"
android:text="Detail tekst" android:text="Detail tekst"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.484"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/detail_location_image" app:layout_constraintTop_toBottomOf="@+id/detail_location_image" />
app:layout_constraintVertical_bias="0.446" />
<ImageButton <ImageButton
android:id="@+id/detail_location_back_button" android:id="@+id/detail_location_back_button"

View File

@@ -1,48 +1,40 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour" android:background="@color/primaryColour"
tools:context=".fragments.RouteFragment"> tools:context=".fragments.RouteFragment">
<androidx.constraintlayout.widget.ConstraintLayout <ImageButton
android:layout_width="match_parent" android:id="@+id/routeBackButton"
android:layout_height="match_parent"> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/ic_back_button_24"
android:text="Back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton <TextView
android:id="@+id/routeBackButton" android:id="@+id/routeTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ic_back_button_24" android:layout_margin="9dp"
android:backgroundTint="@color/buttonColour" android:text="titel"
android:text="Back" android:textSize="20sp"
android:layout_margin="10dp" app:layout_constraintStart_toEndOf="@id/routeBackButton"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<TextView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/routeTitle" android:id="@+id/routeListRV"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:text="titel" android:background="@color/primaryColour"
android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_margin="9dp" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/routeBackButton" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/routeBackButton" />
<androidx.recyclerview.widget.RecyclerView </androidx.constraintlayout.widget.ConstraintLayout>
android:id="@+id/routeListRV"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/routeBackButton" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

View File

@@ -1,14 +1,81 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
tools:context=".fragments.RouteDetailFragment"> tools:context=".fragments.RouteDetailFragment">
<!-- TODO: Update blank fragment layout --> <ImageButton
<TextView android:id="@+id/routeDetailBackButton"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:text="@string/hello_blank_fragment" /> android:layout_marginEnd="100dp"
android:background="@drawable/ic_back_button_24"
app:layout_constraintBottom_toBottomOf="@id/routeTitle"
app:layout_constraintEnd_toStartOf="@id/routeTitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/routeTitle" />
</FrameLayout> <TextView
android:id="@+id/routeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="titel"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/routeDetailImage"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="250dp"
android:layout_height="250dp"
android:layout_margin="40dp"
android:id="@+id/routeDetailImage"
app:layout_constraintTop_toBottomOf="@id/routeDetailBackButton"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/routeDetailText"
/>
<TextView
android:id="@+id/routeDetailText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginBottom="100dp"
app:layout_constraintBottom_toTopOf="@id/startRouteText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/routeDetailImage" />
<ImageButton
android:id="@+id/startRouteButton"
android:backgroundTint="@color/primaryColour"
android:scaleX="5"
android:scaleY="5"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_margin="20dp"
app:layout_constraintBottom_toBottomOf="@+id/startRouteText"
app:layout_constraintEnd_toStartOf="@+id/startRouteText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/startRouteText"
android:src="@drawable/ic_baseline_play_arrow_24"
/>
<TextView
android:id="@+id/startRouteText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/start_route"
android:textSize="50sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/startRouteButton"
app:layout_constraintTop_toBottomOf="@id/routeDetailText" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -16,4 +16,5 @@
<string name="totale_tijd">Totale tijd:</string> <string name="totale_tijd">Totale tijd:</string>
<string name="coupons_gespaard">Coupons gespaard:</string> <string name="coupons_gespaard">Coupons gespaard:</string>
<string name="coupons">Coupons</string> <string name="coupons">Coupons</string>
<string name="start_route">Start Route</string>
</resources> </resources>