diff --git a/Frontend/app/build.gradle b/Frontend/app/build.gradle
index ea9e735cb1c1d0bfd79e634c65e9dbb91c4c661b..443a2464534f903ae003b5f291dfd0ec87c214ed 100644
--- a/Frontend/app/build.gradle
+++ b/Frontend/app/build.gradle
@@ -28,6 +28,7 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+ implementation 'com.android.volley:volley:1.1.1'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.recyclerview:recyclerview:1.1.0"
diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Transaction.java b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Transaction.java
index 1c66c736742eff295f6e527a13650e4ee8a0b87c..5149cd0d4e239f77a5989eeb5ddc6c88d95ea1b7 100644
--- a/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Transaction.java
+++ b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Transaction.java
@@ -3,6 +3,7 @@ package com.example.mobileapp;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -16,10 +17,12 @@ class Recycler_View_Adapter_Transaction extends RecyclerView.Adapter<Recycler_Vi
private ArrayList <String> mTitles = new ArrayList<>();
private ArrayList <Boolean> mGiveOrGet = new ArrayList<>();
private ArrayList <String> mAmount = new ArrayList<>();
+ private ArrayList <String> mAmount_Converted = new ArrayList<>();
+ private ArrayList <String> mCurrency_Converted = new ArrayList<>();
private ArrayList <String> mCurrency = new ArrayList<>();
private TransactionFragment mContext;
- public Recycler_View_Adapter_Transaction(TransactionFragment mContext, ArrayList<String> mUserNamesOne, ArrayList<String> mUserNamesTwo, ArrayList<String> mTitles, ArrayList<Boolean> mGiveOrGet, ArrayList<String> mAmount, ArrayList<String> mCurrency) {
+ public Recycler_View_Adapter_Transaction(TransactionFragment mContext, ArrayList<String> mUserNamesOne, ArrayList<String> mUserNamesTwo, ArrayList<String> mTitles, ArrayList<Boolean> mGiveOrGet, ArrayList<String> mAmount, ArrayList<String> mCurrency, ArrayList<String> mAmount_Converted, ArrayList<String> mCurrency_Converted) {
this.mUserNamesOne = mUserNamesOne;
this.mUserNamesTwo = mUserNamesTwo;
this.mTitles = mTitles;
@@ -27,12 +30,15 @@ class Recycler_View_Adapter_Transaction extends RecyclerView.Adapter<Recycler_Vi
this.mAmount = mAmount;
this.mCurrency = mCurrency;
this.mContext = mContext;
+ this.mAmount_Converted = mAmount_Converted;
+ this.mCurrency_Converted = mCurrency_Converted;
}
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_transaction, parent, false);
+
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_transaction_receive, parent, false);
ViewHolder holder = new ViewHolder(view);
return holder;
}
@@ -44,6 +50,18 @@ class Recycler_View_Adapter_Transaction extends RecyclerView.Adapter<Recycler_Vi
holder.title.setText(mTitles.get(position));
holder.amount.setText(mAmount.get(position));
holder.currency.setText(mCurrency.get(position));
+
+ if (!mCurrency.get(position).equals(mCurrency_Converted.get(position))) {
+ holder.currency_converted.setText(mCurrency_Converted.get(position));
+ holder.amount_converted.setText(mAmount_Converted.get(position));
+ }
+
+ if (mGiveOrGet.get(position)) {
+ holder.giveOrGet.setImageResource(R.drawable.get_symbol);
+ } else {
+ holder.giveOrGet.setImageResource(R.drawable.give_symbol);
+ }
+
}
@Override
@@ -56,16 +74,22 @@ class Recycler_View_Adapter_Transaction extends RecyclerView.Adapter<Recycler_Vi
TextView userName;
TextView title;
TextView amount;
+ ImageView giveOrGet;
+ TextView amount_converted;
+ TextView currency_converted;
TextView currency;
LinearLayout transactionLayout;
public ViewHolder(@NonNull View itemView) {
super(itemView);
+ giveOrGet = itemView.findViewById(R.id.give_or_get);
userName = itemView.findViewById(R.id.person_two);
title = itemView.findViewById(R.id.transaction_title);
amount = itemView.findViewById(R.id.transaction_amount);
- currency = itemView.findViewById(R.id.transaction_currency);
+ amount_converted = itemView.findViewById(R.id.transaction_amount_converted);
+ currency_converted = itemView.findViewById(R.id.transaction_currency);
+ currency = itemView.findViewById(R.id.transaction_currency_basis);
transactionLayout = itemView.findViewById(R.id.transaction_layout);
}
}
diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_User.java b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_User.java
index da97e911f92aba26bd9fe095438bc7cb3356c854..dfa7d2f59719290e2dd3a62687ff033e93791af2 100644
--- a/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_User.java
+++ b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_User.java
@@ -1,5 +1,7 @@
package com.example.mobileapp;
+import android.app.Activity;
+import android.content.Intent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -7,6 +9,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import java.util.ArrayList;
@@ -26,6 +29,8 @@ public class Recycler_View_Adapter_User extends RecyclerView.Adapter<Recycler_Vi
this.mContext = mContext;
}
+
+
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_user_group, parent, false);
@@ -47,6 +52,28 @@ public class Recycler_View_Adapter_User extends RecyclerView.Adapter<Recycler_Vi
holder.userAdmin.setImageResource(R.drawable.no_admin_crown);
}
+
+ holder.userAdmin.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if(changeAdminStatus(position)) {
+ mUserAdmin.set(position,true);
+ Recycler_View_Adapter_User.this.notifyItemChanged(position);
+ } else {
+ mUserAdmin.set(position,false);
+ Recycler_View_Adapter_User.this.notifyItemChanged(position);
+ }
+ }
+ });
+ }
+
+
+ public boolean changeAdminStatus(int position) {
+ if (mUserAdmin.get(position)) {
+ return false;
+ } else {
+ return true;
+ }
}
@Override
diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Single_Trip.java b/Frontend/app/src/main/java/com/example/mobileapp/Single_Trip.java
index 36398dcec53699f53832f7e197ba149b5b8b33e8..c37b9e7e2cd929a013b5547f2d6251e3fc3ff2e3 100644
--- a/Frontend/app/src/main/java/com/example/mobileapp/Single_Trip.java
+++ b/Frontend/app/src/main/java/com/example/mobileapp/Single_Trip.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
+import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
diff --git a/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragment.java b/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragment.java
index c46301b2170fc7ecbb36cb767dd691f87acea858..be69a38ad60d94c0200191f21d759e8a668ae45a 100644
--- a/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragment.java
+++ b/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragment.java
@@ -11,18 +11,39 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonObjectRequest;
+import com.android.volley.toolbox.Volley;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
import java.util.ArrayList;
public class TransactionFragment extends Fragment {
- private static final String TAG = "Debug";
+ //First User participating in the transaction, its the Accountuser himself, name is needed for admin
private ArrayList <String> mUserNamesOne = new ArrayList<>();
+
+ //Second User participating in the transaction
private ArrayList <String> mUserNamesTwo = new ArrayList<>();
+
+ //Title of the transaction
private ArrayList <String> mTitles = new ArrayList<>();
+
+ //Decider if money is received or has to be given
private ArrayList <Boolean> mGiveOrGet = new ArrayList<>();
- private ArrayList <String> mAmount = new ArrayList<>();
+
+ //Displaying the amount in the groups currency
+ private ArrayList <String> mAmount_Converted = new ArrayList<>();
private ArrayList <String> mCurrency = new ArrayList<>();
+ private ArrayList <String> mAmount = new ArrayList<>();
+ private ArrayList <String> mCurrency_Converted = new ArrayList<>();
+ //private RequestQueue mQueue;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -37,7 +58,7 @@ public class TransactionFragment extends Fragment {
View rootView = inflater.inflate(R.layout.fragment_transaction_fragement, container, false);
RecyclerView recyclerView = (RecyclerView) rootView.findViewById(R.id.recycler_transaction_view);
- Recycler_View_Adapter_Transaction adapter = new Recycler_View_Adapter_Transaction(this,mUserNamesOne,mUserNamesTwo,mTitles,mGiveOrGet,mAmount,mCurrency);
+ Recycler_View_Adapter_Transaction adapter = new Recycler_View_Adapter_Transaction(this,mUserNamesOne,mUserNamesTwo,mTitles,mGiveOrGet,mAmount,mCurrency,mAmount_Converted,mCurrency_Converted);
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -48,21 +69,26 @@ public class TransactionFragment extends Fragment {
private void initImageBitmaps() {
+ //mQueue = Volley.newRequestQueue(getActivity());
+ //jsonParse();
+
mUserNamesOne.add("Filip");
mUserNamesTwo.add("Bruno");
mTitles.add("Restaurant");
mGiveOrGet.add(true);
mAmount.add("50.00");
mCurrency.add("€");
-
-
+ mAmount_Converted.add("2.00");
+ mCurrency_Converted.add("€");
mUserNamesOne.add("Dennis");
mUserNamesTwo.add("Jan");
mTitles.add("Themenpark");
mGiveOrGet.add(false);
mAmount.add("120.00");
- mCurrency.add("$");
+ mCurrency.add("€");
+ mAmount_Converted.add("2.00");
+ mCurrency_Converted.add("$");
@@ -71,7 +97,9 @@ public class TransactionFragment extends Fragment {
mTitles.add("Einkaufen");
mGiveOrGet.add(false);
mAmount.add("1680.00");
- mCurrency.add("Â¥");
+ mCurrency.add("€");
+ mAmount_Converted.add("2.00");
+ mCurrency_Converted.add("Â¥");
mUserNamesOne.add("Dennis");
@@ -79,7 +107,40 @@ public class TransactionFragment extends Fragment {
mTitles.add("Bar");
mGiveOrGet.add(true);
mAmount.add("20.00");
- mCurrency.add("£");
+ mCurrency.add("€");
+ mAmount_Converted.add("2.00");
+ mCurrency_Converted.add("£");
}
+
+
+
+
+ /*
+ private void jsonParse() {
+ String url = "https://api.exchangeratesapi.io/latest";
+
+ JsonObjectRequest request = new JsonObjectRequest(Request.Method.GET, url, null, new Response.Listener<JSONObject>() {
+ @Override
+ public void onResponse(JSONObject response) {
+ try {
+ JSONObject rates = response.getJSONObject("rates");
+ int canada = rates.getInt("CAD");
+ int hongkong = rates.getInt("HKD");
+ int island = rates.getInt("ISK");
+ int denmark = rates.getInt("DKK");
+ int hungary = rates.getInt("HUF");
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ }
+ }, new Response.ErrorListener() {
+ @Override
+ public void onErrorResponse(VolleyError error) {
+ error.printStackTrace();
+ }
+ });
+
+ mQueue.add(request);
+ } */
}
diff --git a/Frontend/app/src/main/res/drawable-anydpi/get_symbol.xml b/Frontend/app/src/main/res/drawable-anydpi/get_symbol.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c03843250effbc2993a4be779eb58de9319ba579
--- /dev/null
+++ b/Frontend/app/src/main/res/drawable-anydpi/get_symbol.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="19.2"
+ android:viewportHeight="19.2"
+ android:tint="#136A10"
+ android:alpha="0.8">
+ <group android:translateX="-2.4"
+ android:translateY="-2.4">
+ <path
+ android:fillColor="#136A10"
+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+ </group>
+</vector>
diff --git a/Frontend/app/src/main/res/drawable-hdpi/get_symbol.png b/Frontend/app/src/main/res/drawable-hdpi/get_symbol.png
index 9a966ac5caca0555cff13c05be22ac5f767a7a06..e1022a7fbfdd2aa9ddfb91a0c93f47db8d127011 100644
Binary files a/Frontend/app/src/main/res/drawable-hdpi/get_symbol.png and b/Frontend/app/src/main/res/drawable-hdpi/get_symbol.png differ
diff --git a/Frontend/app/src/main/res/drawable-mdpi/get_symbol.png b/Frontend/app/src/main/res/drawable-mdpi/get_symbol.png
index fc09a4a2d834a62faa2ccf6cee4bb3fe0f18ae8b..595fb5f1bed9b6c2c383c90d054a5a6d15a67e30 100644
Binary files a/Frontend/app/src/main/res/drawable-mdpi/get_symbol.png and b/Frontend/app/src/main/res/drawable-mdpi/get_symbol.png differ
diff --git a/Frontend/app/src/main/res/drawable-xhdpi/get_symbol.png b/Frontend/app/src/main/res/drawable-xhdpi/get_symbol.png
index 4fe7e7f17fc03b3f050e09fd91a6b4a8d22df8b4..3d0765f63faa38787c99c176707f5bc8ae6f38a5 100644
Binary files a/Frontend/app/src/main/res/drawable-xhdpi/get_symbol.png and b/Frontend/app/src/main/res/drawable-xhdpi/get_symbol.png differ
diff --git a/Frontend/app/src/main/res/drawable-xxhdpi/get_symbol.png b/Frontend/app/src/main/res/drawable-xxhdpi/get_symbol.png
index b0d0224ec460a2524e13ba33c44864961c7d73e7..2decfdc149f43d0207a1a6ab80ea3028965e01b9 100644
Binary files a/Frontend/app/src/main/res/drawable-xxhdpi/get_symbol.png and b/Frontend/app/src/main/res/drawable-xxhdpi/get_symbol.png differ
diff --git a/Frontend/app/src/main/res/drawable-xxxhdpi/get_symbol.png b/Frontend/app/src/main/res/drawable-xxxhdpi/get_symbol.png
index f7e14028958020448378a2a9f2b51d29b3ba5f50..cf3c227470efc2c8ec0cb0580501b4819cad8e83 100644
Binary files a/Frontend/app/src/main/res/drawable-xxxhdpi/get_symbol.png and b/Frontend/app/src/main/res/drawable-xxxhdpi/get_symbol.png differ
diff --git a/Frontend/app/src/main/res/drawable/give_symbol.xml b/Frontend/app/src/main/res/drawable/give_symbol.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6f344cb1c98e3ef605693b94cb1732e37812af57
--- /dev/null
+++ b/Frontend/app/src/main/res/drawable/give_symbol.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="line">
+ <stroke android:width="4dp"
+ android:color="#B81313"/>
+</shape>
\ No newline at end of file
diff --git a/Frontend/app/src/main/res/layout/layout_transaction.xml b/Frontend/app/src/main/res/layout/layout_transaction.xml
deleted file mode 100644
index 10eb7fd6549948c2a892ab0304eb3f886d7ac15e..0000000000000000000000000000000000000000
--- a/Frontend/app/src/main/res/layout/layout_transaction.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <LinearLayout
- android:id="@+id/transaction_layout"
- android:layout_width="match_parent"
- android:layout_marginTop="10dp"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:text="+"
- android:layout_marginTop="-10dp"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="20dp"
- android:textSize="60dp"
- android:textColor="#136A10" />
-
-
-
- <View
- android:layout_width="1dp"
- android:layout_height="70dp"
- android:background="#C5B358" />
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="vertical">
-
-
- <TextView
- android:id="@+id/person_two"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:textSize="24dp"
- android:text="Placeholder"
- android:textColor="#C5B358"/>
-
- <TextView
- android:id="@+id/transaction_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:textSize="18dp"
- android:text="Placeholder"
- android:textColor="#716528"/>
-
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginRight="20dp"
- android:gravity="right|center">
-
- <TextView
- android:id="@+id/transaction_amount"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="00,00"
- android:textColor="#C5B358"
- android:textSize="30dp" />
-
- <TextView
- android:id="@+id/transaction_currency"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:text="$"
- android:textColor="#C5B358"
- android:textSize="30dp"
- />
-
- </LinearLayout>
-
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Frontend/app/src/main/res/layout/layout_transaction_receive.xml b/Frontend/app/src/main/res/layout/layout_transaction_receive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59686d29800f2617b9b54498af00a58ace6f67b0
--- /dev/null
+++ b/Frontend/app/src/main/res/layout/layout_transaction_receive.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+
+ <LinearLayout
+ android:id="@+id/transaction_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/give_or_get"
+ android:layout_width="34dp"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="20dp"
+ android:gravity="center"
+ android:src="@drawable/get_symbol"/>
+
+
+ <View
+ android:layout_width="1dp"
+ android:layout_height="70dp"
+ android:background="#C5B358" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:orientation="vertical">
+
+
+ <TextView
+ android:id="@+id/person_two"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:text="Placeholder"
+ android:textColor="#C5B358"
+ android:textSize="24dp" />
+
+ <TextView
+ android:id="@+id/transaction_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:text="Placeholder"
+ android:textColor="#716528"
+ android:textSize="18dp" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginRight="20dp"
+ android:gravity="right|center">
+
+ <TextView
+ android:id="@+id/transaction_amount"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="00,00"
+ android:textColor="#C5B358"
+ android:textSize="24dp" />
+
+ <TextView
+ android:id="@+id/transaction_currency_basis"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="5dp"
+ android:text="$"
+ android:textColor="#C5B358"
+ android:textSize="24dp" />
+
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginRight="20dp"
+ android:gravity="right|center">
+
+
+ <TextView
+ android:id="@+id/transaction_amount_converted"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#716528"
+ android:textSize="18dp" />
+
+ <TextView
+ android:id="@+id/transaction_currency"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="5dp"
+ android:textColor="#716528"
+ android:textSize="18dp" />
+
+ </LinearLayout>
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:src="@drawable/rnd_button"
+ android:layout_marginLeft="69dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Frontend/app/src/main/res/layout/layout_user_group.xml b/Frontend/app/src/main/res/layout/layout_user_group.xml
index 15cc5627deb9688942d20a34262d5254ca5a08a8..eec983df7463a48b245f5cf5d2cc1f1eaa464b1e 100644
--- a/Frontend/app/src/main/res/layout/layout_user_group.xml
+++ b/Frontend/app/src/main/res/layout/layout_user_group.xml
@@ -39,7 +39,7 @@
android:layout_height="35dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="-50dp"
- android:src="@drawable/admin_crown" />
+ />
</LinearLayout>
diff --git a/Frontend/app/src/main/res/layout/single_trip.xml b/Frontend/app/src/main/res/layout/single_trip.xml
index 92da4758f2d83b0381be64c68112397106f4bdda..e4893089dfc45682a7a6a2b1be884579bc033aae 100644
--- a/Frontend/app/src/main/res/layout/single_trip.xml
+++ b/Frontend/app/src/main/res/layout/single_trip.xml
@@ -21,6 +21,8 @@
android:clickable="true"
android:onClick="backButton"/>
+
+
<LinearLayout
android:layout_width="match_parent"
android:gravity="center_horizontal"
diff --git a/Images/+.png b/Images/+.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcca4ed9409fce3e06a856de97724839f7d51ea2
Binary files /dev/null and b/Images/+.png differ
diff --git a/Images/drawable-hdpi/+.png b/Images/drawable-hdpi/+.png
index b83ffad3aa5c066bc0e0f66a4ce44f86e33409af..60831c07817ee73fa8f3059a65e23362602d25fc 100644
Binary files a/Images/drawable-hdpi/+.png and b/Images/drawable-hdpi/+.png differ
diff --git a/Images/drawable-ldpi/+.png b/Images/drawable-ldpi/+.png
index 0e2acf0d2ee6782b510d67ffd4f6ab5a9458b513..b530aca76e81d942f4b1a866a223ab3f02e48eb3 100644
Binary files a/Images/drawable-ldpi/+.png and b/Images/drawable-ldpi/+.png differ
diff --git a/Images/drawable-mdpi/+.png b/Images/drawable-mdpi/+.png
index b71b718fafebcdeb6cd5454a444496710ad80cfd..7ea4f06f259e35965febc2ffb9e549ac81949d22 100644
Binary files a/Images/drawable-mdpi/+.png and b/Images/drawable-mdpi/+.png differ
diff --git a/Images/drawable-xhdpi/+.png b/Images/drawable-xhdpi/+.png
index 2a92602f9138445c7d0a945a6dad2e3874a4905f..b9fe192ca6a91fd95adfe8cf6b3ecdac1882fa24 100644
Binary files a/Images/drawable-xhdpi/+.png and b/Images/drawable-xhdpi/+.png differ
diff --git a/Images/drawable-xxhdpi/+.png b/Images/drawable-xxhdpi/+.png
index db4dadfebb9e83ea1817a7ff01525d29b2df329b..0e2acf0d2ee6782b510d67ffd4f6ab5a9458b513 100644
Binary files a/Images/drawable-xxhdpi/+.png and b/Images/drawable-xxhdpi/+.png differ
diff --git a/Images/drawable-xxxhdpi/+.png b/Images/drawable-xxxhdpi/+.png
index 8784692088007245f133650b6472c166ae372f12..b71b718fafebcdeb6cd5454a444496710ad80cfd 100644
Binary files a/Images/drawable-xxxhdpi/+.png and b/Images/drawable-xxxhdpi/+.png differ