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 82% 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..96dd6c33c8aa6b2e183b97f60be331d717af6e34 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 @@ -3,29 +3,26 @@ 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; 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 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; @@ -41,7 +38,6 @@ public class Recycler_View_Adapter extends RecyclerView.Adapter<Recycler_View_Ad @Override public void onBindViewHolder(final ViewHolder holder, final int position) { - Log.d(TAG, "onBindViewHolder: called."); Glide.with(mContext) .asBitmap() .load(mTripImages.get(position)) @@ -53,7 +49,6 @@ public class Recycler_View_Adapter extends RecyclerView.Adapter<Recycler_View_Ad holder.tripElement.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Log.d(TAG, "onClick: clicked on " + mTripNames.get(position)); openTrip(position); } }); @@ -64,13 +59,11 @@ public class Recycler_View_Adapter extends RecyclerView.Adapter<Recycler_View_Ad Bundle content = new Bundle(); content.putString("Name", mTripNames.get(position)); content.putString("Duration", mTripDuration.get(position)); + content.putString("Image", mTripImages.get(position)); intent.putExtras(content); mContext.startActivity(intent); } - private void imageToBit(CircleImageView image) { - - } @Override public int getItemCount() { 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 new file mode 100644 index 0000000000000000000000000000000000000000..1c66c736742eff295f6e527a13650e4ee8a0b87c --- /dev/null +++ b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_Transaction.java @@ -0,0 +1,72 @@ +package com.example.mobileapp; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import java.util.ArrayList; + +class Recycler_View_Adapter_Transaction extends RecyclerView.Adapter<Recycler_View_Adapter_Transaction.ViewHolder> { + + private ArrayList<String> mUserNamesOne = new ArrayList<>(); + private ArrayList <String> mUserNamesTwo = new ArrayList<>(); + private ArrayList <String> mTitles = new ArrayList<>(); + private ArrayList <Boolean> mGiveOrGet = new ArrayList<>(); + private ArrayList <String> mAmount = 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) { + this.mUserNamesOne = mUserNamesOne; + this.mUserNamesTwo = mUserNamesTwo; + this.mTitles = mTitles; + this.mGiveOrGet = mGiveOrGet; + this.mAmount = mAmount; + this.mCurrency = mCurrency; + this.mContext = mContext; + } + + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_transaction, parent, false); + ViewHolder holder = new ViewHolder(view); + return holder; + } + + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + + holder.userName.setText(mUserNamesTwo.get(position)); + holder.title.setText(mTitles.get(position)); + holder.amount.setText(mAmount.get(position)); + holder.currency.setText(mCurrency.get(position)); + } + + @Override + public int getItemCount() { + return mTitles.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + + TextView userName; + TextView title; + TextView amount; + TextView currency; + LinearLayout transactionLayout; + + public ViewHolder(@NonNull View itemView) { + super(itemView); + + 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); + 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 new file mode 100644 index 0000000000000000000000000000000000000000..da97e911f92aba26bd9fe095438bc7cb3356c854 --- /dev/null +++ b/Frontend/app/src/main/java/com/example/mobileapp/Recycler_View_Adapter_User.java @@ -0,0 +1,73 @@ +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; +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..36398dcec53699f53832f7e197ba149b5b8b33e8 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,12 @@ 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.bumptech.glide.Glide; import com.google.android.material.tabs.TabLayout; import java.util.ArrayList; @@ -23,11 +22,12 @@ import java.util.List; public class Single_Trip extends AppCompatActivity { private TextView tripName; + private ImageView tripImage; private TextView tripDuration; private ViewPager viewPager; private TabLayout tabLayout; - private MemberFragement memberFragement; - private TransactionFragement transactionFragement; + private MemberFragment memberFragement; + private TransactionFragment transactionFragement; @Override @@ -35,13 +35,14 @@ public class Single_Trip extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.single_trip); + tripImage = findViewById(R.id.trip_image); tripName = findViewById(R.id.trip_name); tripDuration = findViewById(R.id.trip_duration); viewPager = findViewById(R.id.tab_view); tabLayout = findViewById(R.id.tab_layout); - memberFragement = new MemberFragement(); - transactionFragement = new TransactionFragement(); + memberFragement = new MemberFragment(); + transactionFragement = new TransactionFragment(); tabLayout.setupWithViewPager(viewPager); @@ -55,9 +56,11 @@ public class Single_Trip extends AppCompatActivity { Bundle bundle = getIntent().getExtras(); + String image = bundle.getString("Image").toString(); String duration = bundle.getString("Duration").toString(); String name = bundle.getString("Name").toString(); + Glide.with(this).asBitmap().load(image).into(tripImage); tripName.setText(name); tripDuration.setText(duration); } 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/TransactionFragement.java b/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragement.java deleted file mode 100644 index c26fc294f71678bb863d0ced5b4980a3c8b0a531..0000000000000000000000000000000000000000 --- a/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragement.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 TransactionFragement#newInstance} factory method to - * create an instance of this fragment. - */ -public class TransactionFragement 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 TransactionFragement() { - // 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 TransactionFragement. - */ - // TODO: Rename and change types and number of parameters - public static TransactionFragement newInstance(String param1, String param2) { - TransactionFragement fragment = new TransactionFragement(); - 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_transaction_fragement, container, false); - } -} diff --git a/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragment.java b/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragment.java new file mode 100644 index 0000000000000000000000000000000000000000..c46301b2170fc7ecbb36cb767dd691f87acea858 --- /dev/null +++ b/Frontend/app/src/main/java/com/example/mobileapp/TransactionFragment.java @@ -0,0 +1,85 @@ +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.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import java.util.ArrayList; + + +public class TransactionFragment extends Fragment { + + private static final String TAG = "Debug"; + private ArrayList <String> mUserNamesOne = new ArrayList<>(); + private ArrayList <String> mUserNamesTwo = new ArrayList<>(); + private ArrayList <String> mTitles = new ArrayList<>(); + private ArrayList <Boolean> mGiveOrGet = new ArrayList<>(); + private ArrayList <String> mAmount = new ArrayList<>(); + private ArrayList <String> mCurrency = 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_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); + + recyclerView.setAdapter(adapter); + recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); + + + return rootView; + } + + private void initImageBitmaps() { + + mUserNamesOne.add("Filip"); + mUserNamesTwo.add("Bruno"); + mTitles.add("Restaurant"); + mGiveOrGet.add(true); + mAmount.add("50.00"); + mCurrency.add("€"); + + + + mUserNamesOne.add("Dennis"); + mUserNamesTwo.add("Jan"); + mTitles.add("Themenpark"); + mGiveOrGet.add(false); + mAmount.add("120.00"); + mCurrency.add("$"); + + + + mUserNamesOne.add("Filip"); + mUserNamesTwo.add("Jan"); + mTitles.add("Einkaufen"); + mGiveOrGet.add(false); + mAmount.add("1680.00"); + mCurrency.add("¥"); + + + mUserNamesOne.add("Dennis"); + mUserNamesTwo.add("Bruno"); + mTitles.add("Bar"); + mGiveOrGet.add(true); + mAmount.add("20.00"); + mCurrency.add("£"); + + } +} 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..035c390834506386cdd51621dfd5b70c4baff53f 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; @@ -43,7 +41,6 @@ public class Trip_Overview_Screen extends AppCompatActivity { mTripNames.add("Portugal"); mTripDuration.add("21.05 - 28.08"); - mTripImages.add("https://i.redd.it/j6myfqglup501.jpg"); mTripNames.add("Max. 25 Zeichen, wegen Space"); mTripDuration.add("21.05 - 28.08"); @@ -73,7 +70,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/get_symbol.png b/Frontend/app/src/main/res/drawable-hdpi/get_symbol.png new file mode 100644 index 0000000000000000000000000000000000000000..9a966ac5caca0555cff13c05be22ac5f767a7a06 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-hdpi/get_symbol.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-hdpi/splitter.png b/Frontend/app/src/main/res/drawable-hdpi/splitter.png new file mode 100644 index 0000000000000000000000000000000000000000..f332e7955d9c4176fb9cb91a60cb673588258a65 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-hdpi/splitter.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/get_symbol.png b/Frontend/app/src/main/res/drawable-mdpi/get_symbol.png new file mode 100644 index 0000000000000000000000000000000000000000..fc09a4a2d834a62faa2ccf6cee4bb3fe0f18ae8b Binary files /dev/null and b/Frontend/app/src/main/res/drawable-mdpi/get_symbol.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-mdpi/splitter.png b/Frontend/app/src/main/res/drawable-mdpi/splitter.png new file mode 100644 index 0000000000000000000000000000000000000000..b0cb588b1fea46e250effca7d485068fb37da895 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-mdpi/splitter.png differ diff --git a/Frontend/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Frontend/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d11462a4b96669193de13a711a3a36220a0..0000000000000000000000000000000000000000 --- a/Frontend/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt" - android:width="108dp" - android:height="108dp" - android:viewportWidth="108" - android:viewportHeight="108"> - <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z"> - <aapt:attr name="android:fillColor"> - <gradient - android:endX="85.84757" - android:endY="92.4963" - android:startX="42.9492" - android:startY="49.59793" - android:type="linear"> - <item - android:color="#44000000" - android:offset="0.0" /> - <item - android:color="#00000000" - android:offset="1.0" /> - </gradient> - </aapt:attr> - </path> - <path - android:fillColor="#FFFFFF" - android:fillType="nonZero" - android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> -</vector> \ No newline at end of file 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/get_symbol.png b/Frontend/app/src/main/res/drawable-xhdpi/get_symbol.png new file mode 100644 index 0000000000000000000000000000000000000000..4fe7e7f17fc03b3f050e09fd91a6b4a8d22df8b4 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xhdpi/get_symbol.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-xhdpi/splitter.png b/Frontend/app/src/main/res/drawable-xhdpi/splitter.png new file mode 100644 index 0000000000000000000000000000000000000000..7d7d1c32ee275b9e6d45c50d3e9ada89f4b43e01 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xhdpi/splitter.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/get_symbol.png b/Frontend/app/src/main/res/drawable-xxhdpi/get_symbol.png new file mode 100644 index 0000000000000000000000000000000000000000..b0d0224ec460a2524e13ba33c44864961c7d73e7 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxhdpi/get_symbol.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-xxhdpi/splitter.png b/Frontend/app/src/main/res/drawable-xxhdpi/splitter.png new file mode 100644 index 0000000000000000000000000000000000000000..81d993ba2e743b71d5120a8b13976e0a03d4a2ea Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxhdpi/splitter.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/get_symbol.png b/Frontend/app/src/main/res/drawable-xxxhdpi/get_symbol.png new file mode 100644 index 0000000000000000000000000000000000000000..f7e14028958020448378a2a9f2b51d29b3ba5f50 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxxhdpi/get_symbol.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-xxxhdpi/splitter.png b/Frontend/app/src/main/res/drawable-xxxhdpi/splitter.png new file mode 100644 index 0000000000000000000000000000000000000000..daa37a75ef260f3dc2a9e83ab325f5a4e9649e87 Binary files /dev/null and b/Frontend/app/src/main/res/drawable-xxxhdpi/splitter.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/drawable/ic_launcher_background.xml b/Frontend/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cbf141911847041df5d7b87f0dd5ef9d4..0000000000000000000000000000000000000000 --- a/Frontend/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="108dp" - android:height="108dp" - android:viewportWidth="108" - android:viewportHeight="108"> - <path - android:fillColor="#3DDC84" - android:pathData="M0,0h108v108h-108z" /> - <path - android:fillColor="#00000000" - android:pathData="M9,0L9,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,0L19,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M29,0L29,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M39,0L39,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M49,0L49,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M59,0L59,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M69,0L69,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M79,0L79,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M89,0L89,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M99,0L99,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,9L108,9" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,19L108,19" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,29L108,29" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,39L108,39" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,49L108,49" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,59L108,59" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,69L108,69" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,79L108,79" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,89L108,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,99L108,99" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,29L89,29" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,39L89,39" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,49L89,49" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,59L89,59" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,69L89,69" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,79L89,79" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M29,19L29,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M39,19L39,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M49,19L49,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M59,19L59,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M69,19L69,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M79,19L79,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> -</vector> 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..f8683a1d659d137ffacdd11cbf7b0f8b68a64e47 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"> + tools:context=".TransactionFragment"> - <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_transaction.xml b/Frontend/app/src/main/res/layout/layout_transaction.xml new file mode 100644 index 0000000000000000000000000000000000000000..10eb7fd6549948c2a892ab0304eb3f886d7ac15e --- /dev/null +++ b/Frontend/app/src/main/res/layout/layout_transaction.xml @@ -0,0 +1,86 @@ +<?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_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 diff --git a/Images/drawable-hdpi/+.png b/Images/drawable-hdpi/+.png new file mode 100644 index 0000000000000000000000000000000000000000..b83ffad3aa5c066bc0e0f66a4ce44f86e33409af Binary files /dev/null and b/Images/drawable-hdpi/+.png differ diff --git a/Images/drawable-hdpi/BackgroundLogo.png b/Images/drawable-hdpi/BackgroundLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..d14adbc0aadfc72a21cc970022b0bad9cc48c932 Binary files /dev/null and b/Images/drawable-hdpi/BackgroundLogo.png differ diff --git a/Images/drawable-hdpi/EmptyCrown.png b/Images/drawable-hdpi/EmptyCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..7112492a24c68d50eff8de3eb4de04cbd46d1c3c Binary files /dev/null and b/Images/drawable-hdpi/EmptyCrown.png differ diff --git a/Images/drawable-hdpi/FullCrown.png b/Images/drawable-hdpi/FullCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..dca780b701631423da7eb11e6d51ba6a37e59f05 Binary files /dev/null and b/Images/drawable-hdpi/FullCrown.png differ diff --git a/Images/drawable-hdpi/Logo.png b/Images/drawable-hdpi/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a45181555fee3e929842422a1f5cfc4c3690d557 Binary files /dev/null and b/Images/drawable-hdpi/Logo.png differ diff --git a/Images/drawable-hdpi/P.png b/Images/drawable-hdpi/P.png new file mode 100644 index 0000000000000000000000000000000000000000..e151e1777a38562f97c06e61549ba23e84d39c42 Binary files /dev/null and b/Images/drawable-hdpi/P.png differ diff --git a/Images/drawable-hdpi/Trennsymbol.png b/Images/drawable-hdpi/Trennsymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..7791eab55913f01b9da6d08f6e6630a71a4db342 Binary files /dev/null and b/Images/drawable-hdpi/Trennsymbol.png differ diff --git a/Images/drawable-ldpi/+.png b/Images/drawable-ldpi/+.png new file mode 100644 index 0000000000000000000000000000000000000000..0e2acf0d2ee6782b510d67ffd4f6ab5a9458b513 Binary files /dev/null and b/Images/drawable-ldpi/+.png differ diff --git a/Images/drawable-ldpi/BackgroundLogo.png b/Images/drawable-ldpi/BackgroundLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..8d6617283eead92b828c7d6a6b6af2f7fe009dd7 Binary files /dev/null and b/Images/drawable-ldpi/BackgroundLogo.png differ diff --git a/Images/drawable-ldpi/EmptyCrown.png b/Images/drawable-ldpi/EmptyCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..a58b3e00feb30a45b8dd82d7f74b1e47bacad8a2 Binary files /dev/null and b/Images/drawable-ldpi/EmptyCrown.png differ diff --git a/Images/drawable-ldpi/FullCrown.png b/Images/drawable-ldpi/FullCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..658fbe14f39adac52c251f80fce684ba57f267b0 Binary files /dev/null and b/Images/drawable-ldpi/FullCrown.png differ diff --git a/Images/drawable-ldpi/Logo.png b/Images/drawable-ldpi/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..77c6f8ee05d0f359c83d53a26a54d5cd51178f51 Binary files /dev/null and b/Images/drawable-ldpi/Logo.png differ diff --git a/Images/drawable-ldpi/P.png b/Images/drawable-ldpi/P.png new file mode 100644 index 0000000000000000000000000000000000000000..ed4faad94a2edd6d437c6bb571a10c7ef119b8af Binary files /dev/null and b/Images/drawable-ldpi/P.png differ diff --git a/Images/drawable-ldpi/Trennsymbol.png b/Images/drawable-ldpi/Trennsymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..a27ab51a41dd8f4d0ad7f45eef6c6c69fdc36c80 Binary files /dev/null and b/Images/drawable-ldpi/Trennsymbol.png differ diff --git a/Images/drawable-mdpi/+.png b/Images/drawable-mdpi/+.png new file mode 100644 index 0000000000000000000000000000000000000000..b71b718fafebcdeb6cd5454a444496710ad80cfd Binary files /dev/null and b/Images/drawable-mdpi/+.png differ diff --git a/Images/drawable-mdpi/BackgroundLogo.png b/Images/drawable-mdpi/BackgroundLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..163a258059d3759374953dc6c660e03b53dfeff2 Binary files /dev/null and b/Images/drawable-mdpi/BackgroundLogo.png differ diff --git a/Images/drawable-mdpi/EmptyCrown.png b/Images/drawable-mdpi/EmptyCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..4ef98c96d1f50d0547533ba0ae36fab32776cae1 Binary files /dev/null and b/Images/drawable-mdpi/EmptyCrown.png differ diff --git a/Images/drawable-mdpi/FullCrown.png b/Images/drawable-mdpi/FullCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..f25e5ee770e92398c1d894b6c761e29002a90d50 Binary files /dev/null and b/Images/drawable-mdpi/FullCrown.png differ diff --git a/Images/drawable-mdpi/Logo.png b/Images/drawable-mdpi/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..18844583df5e36aeffca7e849ec8c992fa6691d6 Binary files /dev/null and b/Images/drawable-mdpi/Logo.png differ diff --git a/Images/drawable-mdpi/P.png b/Images/drawable-mdpi/P.png new file mode 100644 index 0000000000000000000000000000000000000000..472e7d7839d8ef11da67ada1ac87126d5240b0b5 Binary files /dev/null and b/Images/drawable-mdpi/P.png differ diff --git a/Images/drawable-mdpi/Trennsymbol.png b/Images/drawable-mdpi/Trennsymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..606158ae3385d7edec46ba5214fe1622b0507b85 Binary files /dev/null and b/Images/drawable-mdpi/Trennsymbol.png differ diff --git a/Images/drawable-xhdpi/+.png b/Images/drawable-xhdpi/+.png new file mode 100644 index 0000000000000000000000000000000000000000..2a92602f9138445c7d0a945a6dad2e3874a4905f Binary files /dev/null and b/Images/drawable-xhdpi/+.png differ diff --git a/Images/drawable-xhdpi/BackgroundLogo.png b/Images/drawable-xhdpi/BackgroundLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..25042fb32e12230aa172dfde2de5a9a997e18de2 Binary files /dev/null and b/Images/drawable-xhdpi/BackgroundLogo.png differ diff --git a/Images/drawable-xhdpi/EmptyCrown.png b/Images/drawable-xhdpi/EmptyCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..318353dde689847b488d4ef82686c700f9f4e93f Binary files /dev/null and b/Images/drawable-xhdpi/EmptyCrown.png differ diff --git a/Images/drawable-xhdpi/FullCrown.png b/Images/drawable-xhdpi/FullCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..0863f5f23855c45549d62d1feb714587da70ab94 Binary files /dev/null and b/Images/drawable-xhdpi/FullCrown.png differ diff --git a/Images/drawable-xhdpi/Logo.png b/Images/drawable-xhdpi/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..21d95d6621be0e73f5cc8588f166eb79f2c9c193 Binary files /dev/null and b/Images/drawable-xhdpi/Logo.png differ diff --git a/Images/drawable-xhdpi/P.png b/Images/drawable-xhdpi/P.png new file mode 100644 index 0000000000000000000000000000000000000000..7d8c2040ffc73d11037aa21c40a69035cb00ada1 Binary files /dev/null and b/Images/drawable-xhdpi/P.png differ diff --git a/Images/drawable-xhdpi/Trennsymbol.png b/Images/drawable-xhdpi/Trennsymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..fb1e249b214b153057928b0334eb7039b51d4eda Binary files /dev/null and b/Images/drawable-xhdpi/Trennsymbol.png differ diff --git a/Images/drawable-xxhdpi/+.png b/Images/drawable-xxhdpi/+.png new file mode 100644 index 0000000000000000000000000000000000000000..db4dadfebb9e83ea1817a7ff01525d29b2df329b Binary files /dev/null and b/Images/drawable-xxhdpi/+.png differ diff --git a/Images/drawable-xxhdpi/BackgroundLogo.png b/Images/drawable-xxhdpi/BackgroundLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..746368d68bf4e6970e4533f7900bfaa99e432225 Binary files /dev/null and b/Images/drawable-xxhdpi/BackgroundLogo.png differ diff --git a/Images/drawable-xxhdpi/EmptyCrown.png b/Images/drawable-xxhdpi/EmptyCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..9cb816375b0f19b1da23a87d69ceab8705abb73a Binary files /dev/null and b/Images/drawable-xxhdpi/EmptyCrown.png differ diff --git a/Images/drawable-xxhdpi/FullCrown.png b/Images/drawable-xxhdpi/FullCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..29b9d7d578774d8fa63be61d3274281bd82440f4 Binary files /dev/null and b/Images/drawable-xxhdpi/FullCrown.png differ diff --git a/Images/drawable-xxhdpi/Logo.png b/Images/drawable-xxhdpi/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..44eb705e56268bd5ffa8e17e22c9e9578166a6ac Binary files /dev/null and b/Images/drawable-xxhdpi/Logo.png differ diff --git a/Images/drawable-xxhdpi/P.png b/Images/drawable-xxhdpi/P.png new file mode 100644 index 0000000000000000000000000000000000000000..278a1ab6c0afa7faac15cc293447b8b1b3a27d3a Binary files /dev/null and b/Images/drawable-xxhdpi/P.png differ diff --git a/Images/drawable-xxhdpi/Trennsymbol.png b/Images/drawable-xxhdpi/Trennsymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..e97fd5216e7dedf587bd7a783b730ddf3e08c349 Binary files /dev/null and b/Images/drawable-xxhdpi/Trennsymbol.png differ diff --git a/Images/drawable-xxxhdpi/+.png b/Images/drawable-xxxhdpi/+.png new file mode 100644 index 0000000000000000000000000000000000000000..8784692088007245f133650b6472c166ae372f12 Binary files /dev/null and b/Images/drawable-xxxhdpi/+.png differ diff --git a/Images/drawable-xxxhdpi/BackgroundLogo.png b/Images/drawable-xxxhdpi/BackgroundLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..6b9ae475db4127f9320ae0df460374c585064e02 Binary files /dev/null and b/Images/drawable-xxxhdpi/BackgroundLogo.png differ diff --git a/Images/drawable-xxxhdpi/EmptyCrown.png b/Images/drawable-xxxhdpi/EmptyCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..b513db705f9348f785f6fa30f469ac39e176d578 Binary files /dev/null and b/Images/drawable-xxxhdpi/EmptyCrown.png differ diff --git a/Images/drawable-xxxhdpi/FullCrown.png b/Images/drawable-xxxhdpi/FullCrown.png new file mode 100644 index 0000000000000000000000000000000000000000..828794c3d557f185e5bf672b419fc5526464ecca Binary files /dev/null and b/Images/drawable-xxxhdpi/FullCrown.png differ diff --git a/Images/drawable-xxxhdpi/Logo.png b/Images/drawable-xxxhdpi/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0d730a0e7f8d04a7ba56d9009cb5a968448c857e Binary files /dev/null and b/Images/drawable-xxxhdpi/Logo.png differ diff --git a/Images/drawable-xxxhdpi/P.png b/Images/drawable-xxxhdpi/P.png new file mode 100644 index 0000000000000000000000000000000000000000..b87c71ee3598b7f89136a3c75e0fe7cc943eefd7 Binary files /dev/null and b/Images/drawable-xxxhdpi/P.png differ diff --git a/Images/drawable-xxxhdpi/Trennsymbol.png b/Images/drawable-xxxhdpi/Trennsymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..98cd5a334d283222306b8cffe6750b0258d4a536 Binary files /dev/null and b/Images/drawable-xxxhdpi/Trennsymbol.png differ