diff --git a/Frontend/app/src/main/AndroidManifest.xml b/Frontend/app/src/main/AndroidManifest.xml index 347898da3f4ce13fa62adba915f6156fe5bda75f..3e6b8225c653e8e0b1fd9c644a0a683ad06633a0 100644 --- a/Frontend/app/src/main/AndroidManifest.xml +++ b/Frontend/app/src/main/AndroidManifest.xml @@ -8,12 +8,18 @@ <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" + android:label="Pecunia" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - <activity android:name=".Single_Trip"></activity> - <activity android:name=".Trip_Overview_Screen" /> + <activity android:name=".Single_Trip" + android:configChanges="orientation" + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity"/> + <activity android:name=".Trip_Overview_Screen" + android:configChanges="orientation" + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity"/> <activity android:name=".New_PW_Screen" android:configChanges="orientation" diff --git a/Frontend/app/src/main/ic_launcher-playstore.png b/Frontend/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..f9e21c6174be09310d2ea604622e7e44f4671433 Binary files /dev/null and b/Frontend/app/src/main/ic_launcher-playstore.png differ diff --git a/Frontend/app/src/main/java/com/example/mobileapp/MemberFragement.java b/Frontend/app/src/main/java/com/example/mobileapp/MemberFragement.java deleted file mode 100644 index b4af284e11224d6934af9a8cfc61bdd9e696b392..0000000000000000000000000000000000000000 --- a/Frontend/app/src/main/java/com/example/mobileapp/MemberFragement.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.example.mobileapp; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - - -/** - * A simple {@link Fragment} subclass. - * Use the {@link MemberFragement#newInstance} factory method to - * create an instance of this fragment. - */ -public class MemberFragement extends Fragment { - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public MemberFragement() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment MemberFragement. - */ - // TODO: Rename and change types and number of parameters - public static MemberFragement newInstance(String param1, String param2) { - MemberFragement fragment = new MemberFragement(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_member_fragement, container, false); - } -} diff --git a/Frontend/app/src/main/java/com/example/mobileapp/MemberFragment.java b/Frontend/app/src/main/java/com/example/mobileapp/MemberFragment.java new file mode 100644 index 0000000000000000000000000000000000000000..9e20317758603533c708377d0fa7d4780d397f93 --- /dev/null +++ b/Frontend/app/src/main/java/com/example/mobileapp/MemberFragment.java @@ -0,0 +1,83 @@ +package com.example.mobileapp; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import java.util.ArrayList; + + + +public class MemberFragment extends Fragment { + + private ArrayList<String> mUserNames = new ArrayList<>(); + private ArrayList<String> mUserImages = new ArrayList<>(); + private ArrayList<Boolean> mUserAdmin = new ArrayList<>(); + + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + + initImageBitmaps(); + View rootView = inflater.inflate(R.layout.fragment_member_fragement, container, false); + + RecyclerView recyclerView = (RecyclerView) rootView.findViewById(R.id.recycler_user_view) ; + Recycler_View_Adapter_User adapter = new Recycler_View_Adapter_User(this,mUserNames, mUserImages, mUserAdmin); + + recyclerView.setAdapter(adapter); + recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); + + + return rootView; + } + + + private void initImageBitmaps() { + + mUserImages.add("https://i.redd.it/tpsnoz5bzo501.jpg"); + mUserNames.add("Bruno"); + mUserAdmin.add(true); + + + mUserImages.add("https://i.redd.it/qn7f9oqu7o501.jpg"); + mUserNames.add("Dennis"); + mUserAdmin.add(true); + + + mUserImages.add("https://i.redd.it/j6myfqglup501.jpg"); + mUserNames.add("Filip"); + mUserAdmin.add(false); + + mUserImages.add("https://i.redd.it/0h2gm1ix6p501.jpg"); + mUserNames.add("Jan"); + mUserAdmin.add(false); + + mUserImages.add("https://i.redd.it/k98uzl68eh501.jpg"); + mUserNames.add("Philip"); + mUserAdmin.add(false); + + mUserImages.add("https://i.redd.it/glin0nwndo501.jpg"); + mUserNames.add("Dani"); + mUserAdmin.add(false); + + + } + + + + + +} diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter.java b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Group.java similarity index 87% rename from Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter.java rename to Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Group.java index 3205f241fd0badf8b76e60abc5a8f4caefccd1ff..8e1dd741f4c2630d3b7b8930a86a09605167bc04 100644 --- a/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter.java +++ b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Group.java @@ -2,8 +2,6 @@ package com.example.mobileapp; import android.content.Context; import android.content.Intent; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -11,21 +9,21 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; + import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import java.util.ArrayList; import de.hdodenhof.circleimageview.CircleImageView; -public class Recycler_View_Adapter extends RecyclerView.Adapter<Recycler_View_Adapter.ViewHolder>{ - private static final String TAG = "Recycler_View_Adapter"; +public class Recycler_View_Adapter_Group extends RecyclerView.Adapter<Recycler_View_Adapter_Group.ViewHolder>{ + private static final String TAG = "Recycler_View_Adapter_Group"; private ArrayList<String> mTripNames = new ArrayList<>(); private ArrayList<String> mTripImages = new ArrayList<>(); private ArrayList<String> mTripDuration = new ArrayList<>(); private Context mContext; - public Recycler_View_Adapter(ArrayList<String> mTripNames, ArrayList<String> mTripImages, ArrayList<String> mTripDuration, Context mContext) { + public Recycler_View_Adapter_Group(ArrayList<String> mTripNames, ArrayList<String> mTripImages, ArrayList<String> mTripDuration, Context mContext) { this.mTripNames = mTripNames; this.mTripImages = mTripImages; this.mTripDuration = mTripDuration; 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 new file mode 100644 index 0000000000000000000000000000000000000000..e401b3ab63fca81d34a28bf89cef9e43ba32c07f --- /dev/null +++ b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_User.java @@ -0,0 +1,77 @@ +package com.example.mobileapp; + +import android.graphics.drawable.Drawable; +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; +import androidx.recyclerview.widget.RecyclerView; +import com.bumptech.glide.Glide; +import java.util.ArrayList; +import de.hdodenhof.circleimageview.CircleImageView; + +public class Recycler_View_Adapter_User extends RecyclerView.Adapter<Recycler_View_Adapter_User.ViewHolder> { + + + + + private ArrayList<String> mUserNames = new ArrayList<>(); + private ArrayList<String> mUserImages = new ArrayList<>(); + private ArrayList<Boolean> mUserAdmin = new ArrayList<>(); + private MemberFragment mContext; + + public Recycler_View_Adapter_User(MemberFragment mContext, ArrayList<String> mUserNames, ArrayList<String> mUserImages, ArrayList<Boolean> mUserAdmin) { + this.mUserNames = mUserNames; + this.mUserImages = mUserImages; + this.mUserAdmin = mUserAdmin; + 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); + ViewHolder holder = new ViewHolder(view); + return holder; + } + + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, final int position) { + Glide.with(mContext) + .asBitmap() + .load(mUserImages.get(position)) + .into(holder.userImage); + holder.userName.setText(mUserNames.get(position)); + + if (mUserAdmin.get(position)) { + holder.userAdmin.setImageResource(R.drawable.admin_crown); + } else { + holder.userAdmin.setImageResource(R.drawable.no_admin_crown); + } + + } + + @Override + public int getItemCount() { + return mUserNames.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + + CircleImageView userImage; + TextView userName; + LinearLayout userLayout; + ImageView userAdmin; + + public ViewHolder(View itemView) { + super(itemView); + + userAdmin = itemView.findViewById(R.id.admin_status); + userImage = itemView.findViewById(R.id.user_image); + userName = itemView.findViewById(R.id.user_name); + userLayout = itemView.findViewById(R.id.user_layout); + } + } +} 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 cfd22ef1ac8a86c943772dba6ab861c5d17b4511..780383b78927beccf5646d479fe4ae84fab41df2 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,13 +8,10 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; -import android.net.Uri; import android.os.Bundle; import android.view.View; -import android.widget.ImageView; import android.widget.TextView; -import com.google.android.material.badge.BadgeDrawable; import com.google.android.material.tabs.TabLayout; import java.util.ArrayList; @@ -26,7 +23,7 @@ public class Single_Trip extends AppCompatActivity { private TextView tripDuration; private ViewPager viewPager; private TabLayout tabLayout; - private MemberFragement memberFragement; + private MemberFragment memberFragement; private TransactionFragement transactionFragement; @@ -40,7 +37,7 @@ public class Single_Trip extends AppCompatActivity { viewPager = findViewById(R.id.tab_view); tabLayout = findViewById(R.id.tab_layout); - memberFragement = new MemberFragement(); + memberFragement = new MemberFragment(); transactionFragement = new TransactionFragement(); tabLayout.setupWithViewPager(viewPager); diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java b/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java index 06a62b6a8483a2468d6cb600ad5e3454ace5eeb4..0f27b220411fc85ab2668cb5d75a1dea235b532e 100644 --- a/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java +++ b/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java @@ -58,6 +58,7 @@ public class Start_Screen extends AppCompatActivity { return true; } } + public void login (View v) { if (!validateEmail() | !validatePW()) { diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Trip_Overview_Screen.java b/Frontend/app/src/main/java/com/example/mobileapp/Trip_Overview_Screen.java index 724a7f277dc49d76bfd8d865b8c1c9288a05766f..2d23801b6dc60ef0bebdf5bf23faed8e7827de64 100644 --- a/Frontend/app/src/main/java/com/example/mobileapp/Trip_Overview_Screen.java +++ b/Frontend/app/src/main/java/com/example/mobileapp/Trip_Overview_Screen.java @@ -6,8 +6,6 @@ import androidx.recyclerview.widget.RecyclerView; import android.content.Intent; import android.os.Bundle; -import android.view.View; -import android.widget.TextView; import java.util.ArrayList; @@ -73,7 +71,7 @@ public class Trip_Overview_Screen extends AppCompatActivity { private void initRecyclerView() { RecyclerView recyclerView = findViewById(R.id.recycler_view); - Recycler_View_Adapter adapter = new Recycler_View_Adapter(mTripNames, mTripImages, mTripDuration, this); + Recycler_View_Adapter_Group adapter = new Recycler_View_Adapter_Group(mTripNames, mTripImages, mTripDuration, this); recyclerView.setAdapter(adapter); recyclerView.setLayoutManager(new LinearLayoutManager(this)); } diff --git a/Frontend/app/src/main/res/drawable-hdpi/admin_crown.png b/Frontend/app/src/main/res/drawable-hdpi/admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..b8db06e20baf7aabaccd27a1afb2fdd948ae9b27 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-hdpi/admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-hdpi/no_admin_crown.png b/Frontend/app/src/main/res/drawable-hdpi/no_admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..d420b690d893cceb485f94910490e50d1cb3019e Binary files /dev/null and b/Frontend/app/src/main/res/drawable-hdpi/no_admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-mdpi/admin_crown.png b/Frontend/app/src/main/res/drawable-mdpi/admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..9ca156b95d54f7ec6461ffd951fbe5fabc05a102 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-mdpi/admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-mdpi/no_admin_crown.png b/Frontend/app/src/main/res/drawable-mdpi/no_admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..d9872745bb378f7549189537b428efe6c2afe3a5 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-mdpi/no_admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-xhdpi/admin_crown.png b/Frontend/app/src/main/res/drawable-xhdpi/admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..83a21fbcbca4a36f22a6347590f794c987fe7170 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xhdpi/admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-xhdpi/no_admin_crown.png b/Frontend/app/src/main/res/drawable-xhdpi/no_admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..19c26ca14446c78bf1a3a040ce0762f82d2430ec Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xhdpi/no_admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-xxhdpi/admin_crown.png b/Frontend/app/src/main/res/drawable-xxhdpi/admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..5e694eeab717361189bd20d62c31346c45d92a50 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxhdpi/admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-xxhdpi/no_admin_crown.png b/Frontend/app/src/main/res/drawable-xxhdpi/no_admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..4cdbf6cc5e2ac3c4c78c36271c8d8df5ca1a5778 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxhdpi/no_admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-xxxhdpi/admin_crown.png b/Frontend/app/src/main/res/drawable-xxxhdpi/admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..77fe7916813fab85e29ab5dc1b21ee95f2926762 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxxhdpi/admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable-xxxhdpi/no_admin_crown.png b/Frontend/app/src/main/res/drawable-xxxhdpi/no_admin_crown.png new file mode 100644 index 0000000000000000000000000000000000000000..4cdf919ab7a810761d9c4aa1e2804d45ee833969 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxxhdpi/no_admin_crown.png differ diff --git a/Frontend/app/src/main/res/drawable/bottom_border.xml b/Frontend/app/src/main/res/drawable/bottom_border.xml new file mode 100644 index 0000000000000000000000000000000000000000..1b3abae8dfe987634eea20af52423637998631e5 --- /dev/null +++ b/Frontend/app/src/main/res/drawable/bottom_border.xml @@ -0,0 +1,20 @@ +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + + <item> + <shape android:shape="rectangle" > + <solid android:color="@android:color/transparent" /> + </shape> + </item> + + <item android:top="-2dp" android:right="-2dp" android:left="-2dp"> + <shape> + <solid android:color="@android:color/transparent" /> + <stroke + android:dashGap="0px" + android:dashWidth="0px" + android:width="1dp" + android:color="#C5B358" /> + </shape> + </item> + +</layer-list> \ No newline at end of file diff --git a/Frontend/app/src/main/res/layout/fragment_member_fragement.xml b/Frontend/app/src/main/res/layout/fragment_member_fragement.xml index 572c937db9cdc1f072da8ab992dcfc74fcdf451f..60f9e49231fef091063fd9675733ff12643ad0fc 100644 --- a/Frontend/app/src/main/res/layout/fragment_member_fragement.xml +++ b/Frontend/app/src/main/res/layout/fragment_member_fragement.xml @@ -3,14 +3,16 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="40dp" android:background="#141412" - tools:context=".MemberFragement"> + tools:context=".MemberFragment"> - <TextView + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_user_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:textColor="#C5B358" - android:text="List of all Members" /> + android:layout_marginBottom="90dp" + android:layout_marginTop="10dp"> + + </androidx.recyclerview.widget.RecyclerView> </FrameLayout> \ No newline at end of file diff --git a/Frontend/app/src/main/res/layout/fragment_transaction_fragement.xml b/Frontend/app/src/main/res/layout/fragment_transaction_fragement.xml index 3be92ac0aebac0d11e0222da28c269c995a95920..9d8a8e5db0e4b3e5c1f92fcc1a775579abad14c9 100644 --- a/Frontend/app/src/main/res/layout/fragment_transaction_fragement.xml +++ b/Frontend/app/src/main/res/layout/fragment_transaction_fragement.xml @@ -4,13 +4,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#141412" - android:padding="40dp" tools:context=".TransactionFragement"> - <TextView + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_transaction_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:textColor="#C5B358" - android:text="List of all Transactions" /> + android:layout_marginBottom="90dp" + android:layout_marginTop="10dp"> + + </androidx.recyclerview.widget.RecyclerView> </FrameLayout> \ 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 new file mode 100644 index 0000000000000000000000000000000000000000..15cc5627deb9688942d20a34262d5254ca5a08a8 --- /dev/null +++ b/Frontend/app/src/main/res/layout/layout_user_group.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<LinearLayout 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" + android:id="@+id/user_layout" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_gravity="center_horizontal" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + tools:ignore="Orientation"> + + <de.hdodenhof.circleimageview.CircleImageView + android:id="@+id/user_image" + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="10dp" + android:src="@mipmap/ic_launcher" + app:civ_border_color="#C5B358" + app:civ_border_width="1dp" /> + + <TextView + android:id="@+id/user_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginRight="50dp" + android:paddingLeft="10dp" + android:text="Placeholder" + android:textColor="#C5B358" + android:textSize="24dp" /> + + <ImageView + android:id="@+id/admin_status" + android:layout_width="35dp" + 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/mipmap-anydpi-v26/ic_launcher.xml b/Frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cfe52eac1ba66ba280a68ca7be8fcf88a16..4ae7d12378f3c5b43e746a42a941127ddd5b9dde 100644 --- a/Frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/Frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <background android:drawable="@mipmap/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> </adaptive-icon> \ No newline at end of file diff --git a/Frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe52eac1ba66ba280a68ca7be8fcf88a16..4ae7d12378f3c5b43e746a42a941127ddd5b9dde 100644 --- a/Frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/Frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <background android:drawable="@mipmap/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> </adaptive-icon> \ No newline at end of file diff --git a/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60098c92c2baca8a5df62f2929cbff01b52..e6b75ebd939d39d46e69893c65cbeaf69dabd6b3 100644 Binary files a/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 0000000000000000000000000000000000000000..f871259ae7d29b6af2bd37d644f75946d184394b Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..55ebbd8b002c75f916bae346f3da968cd2951682 Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 61da551c5594a1f9d26193983d2cd69189014603..16849723b1958892d54ff0dc57c497edd34a8665 100644 Binary files a/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/Frontend/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28531901b2c23927768c84bb6765ebcc1db..66763d5c0c2a15d11643a50c9e09fc990775e667 100644 Binary files a/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 0000000000000000000000000000000000000000..56d1c3dfbd65c6f068dee7176d88b896115bb90c Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..1895aca3dcd1044f921665725c260bdf6dd04aa3 Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index db5080a752731b34d38d7c634732b2cd999125d0..9ffb89d0026c828ece8f229c061d6d199188241c 100644 Binary files a/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/Frontend/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46dab19242bf475ddf2e0a10042de6a0be16..52e824de6d64429ecbdbbb734a86ba098abfdf27 100644 Binary files a/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000000000000000000000000000000000000..fc3b91373bd20d77817f09be5036e879071f4614 Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..af7446486c078291b15fac4ef646caf3ee284248 Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index da31a871c8dc461a1ea114510bfac640307b0a90..2a42d1df1983c0c7c463306daaf20c4ab67955b4 100644 Binary files a/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/Frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681720f3df43c647bf0c081f0314ee34eae1..defdf2f3d62124b0787ce360b9222345dd1d9b8b 100644 Binary files a/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000000000000000000000000000000000000..e003b59038aa43629f4d841c67bb22fdd02dd014 Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..0f62fa824796d2dc4e3533f220728e9d15f7f57f Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index b216f2d313cc673d8b8c4da591c174ebed52795c..3abefd26defdff9ba34b33c47a796a0289918ddc 100644 Binary files a/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/Frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f25a419744727fb48b4b4137b6c6a3a8f2620d51..93267345ec4ac8891b011f64f3ce440dce0b31d5 100644 Binary files a/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000000000000000000000000000000000000..b410697d0b3c326e867b79a673308e96e4769859 Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..5dbc725b658bd1557bc9131f2dfd7d3edb44b480 Binary files /dev/null and b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index e96783ccce844001359f968f5cd9d85b341bd3fb..c080132c5fed71710711f804ce324139efaa954a 100644 Binary files a/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/Frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ