Some fixs, desigh of cart of event, code from email

app/src/main/java/com/sharix/sportsmanfriend/BaseDialogClass.java

@@ -55,7 +55,7 @@ public abstract class BaseDialogClass extends AppCompatDialogFragment {
         void applyInfo(Bundle bundle);
     }
 
-    protected void addClickEventToAllButtons(){
+    protected void addClickEventToAllViews(){
         Button btn_apply = view.findViewById(R.id.btn_apply);
         Button btn_cancel = view.findViewById(R.id.btn_cancel);
 

app/src/main/java/com/sharix/sportsmanfriend/dialogs/ChoiceOfGenderDialog.java

@@ -3,6 +3,8 @@ package com.sharix.sportsmanfriend.dialogs;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
@@ -12,9 +14,12 @@ import androidx.annotation.Nullable;
 import com.sharix.sportsmanfriend.BaseDialogClass;
 import com.sharix.sportsmanfriend.R;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ChoiceOfGenderDialog extends BaseDialogClass {
 
-   private RadioGroup radioGroup;
+    RadioButton selectedRadioButton;
 
     @NonNull
     @Override
@@ -22,9 +27,7 @@ public class ChoiceOfGenderDialog extends BaseDialogClass {
         LayoutInflater inflater = requireActivity().getLayoutInflater();
         view = inflater.inflate(R.layout.dialog_choice_of_gender, null);
 
-        radioGroup = view.findViewById(R.id.radioGroup);
-
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -33,16 +36,48 @@ public class ChoiceOfGenderDialog extends BaseDialogClass {
     protected Bundle DataToTransfer() {
         Bundle bundle = new Bundle();
         bundle.putString("FromBlock", "GenderBlock");
-        int selectedId = radioGroup.getCheckedRadioButtonId();
-        RadioButton selectedRadioButton = view.findViewById(selectedId);
-        bundle.putInt("Id", radioGroup.getCheckedRadioButtonId());
-        bundle.putString("Name", selectedRadioButton.getText().toString());
+        for (RadioButton RB : findAllRadioButtons((ViewGroup) view)){
+            if (RB.isChecked()) {
+                selectedRadioButton = RB;
+                break;
+            }
+        }
+        String tag = (String) selectedRadioButton.getTag();
+        String[] arr = tag.split(",");
+        bundle.putInt("Id", Integer.parseInt(arr[0]));
+        bundle.putString("Name", arr[1]);
         return bundle;
     }
 
+    private List<RadioButton> findAllRadioButtons(ViewGroup root) {
+        List<RadioButton> radioButtons = new ArrayList<>();
+        for (int i = 0; i < root.getChildCount(); i++) {
+            View child = root.getChildAt(i);
+            if (child instanceof RadioButton) {
+                radioButtons.add((RadioButton) child);
+            } else if (child instanceof ViewGroup) {
+                radioButtons.addAll(findAllRadioButtons((ViewGroup) child));
+            }
+        }
+        return radioButtons;
+    }
+
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
+
+        List<RadioButton> radioButtons = findAllRadioButtons((ViewGroup) view);
+        for (RadioButton element : radioButtons) {
+            element.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (isChecked) {
+                    for (RadioButton _element : radioButtons) {
+                        if (_element != buttonView) {
+                            _element.setChecked(false);
+                        }
+                    }
+                }
+            });
+        }
 
     }
 }

app/src/main/java/com/sharix/sportsmanfriend/dialogs/ChoiceOfSportDialog.java

@@ -26,7 +26,7 @@ public class ChoiceOfSportDialog extends BaseDialogClass
         LayoutInflater inflater = requireActivity().getLayoutInflater();
         view = inflater.inflate(R.layout.dialog_choice_of_sport, null);
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -62,8 +62,8 @@ public class ChoiceOfSportDialog extends BaseDialogClass
     }
 
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
 
         List<RadioButton> radioButtons = findAllRadioButtons((ViewGroup) view);
         for (RadioButton element : radioButtons) {

app/src/main/java/com/sharix/sportsmanfriend/dialogs/DateOfEventDialog.java

@@ -30,7 +30,7 @@ public class DateOfEventDialog extends BaseDialogClass{
 
         calendarView = view.findViewById(R.id.calendar);
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -49,8 +49,8 @@ public class DateOfEventDialog extends BaseDialogClass{
     }
 
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
 
         calendarView.setOnDateChangeListener((view, year, month, dayOfMonth) -> {
             Log.d("TAG", String.valueOf(year));

app/src/main/java/com/sharix/sportsmanfriend/dialogs/EndDateOfEventDialog.java

@@ -32,7 +32,7 @@ public class EndDateOfEventDialog  extends BaseDialogClass {
         timePickerEnd.setIs24HourView(true);
         calendarView = view.findViewById(R.id.calendar);
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -53,8 +53,8 @@ public class EndDateOfEventDialog  extends BaseDialogClass {
     }
 
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
 
         calendarView.setOnDateChangeListener((view, year, month, dayOfMonth) -> calendarDate = new Date(year - 1900, month, dayOfMonth));
     }

app/src/main/java/com/sharix/sportsmanfriend/dialogs/MemberLimitDialog.java

@@ -30,7 +30,7 @@ public class MemberLimitDialog extends BaseDialogClass {
         rangeSlider = view.findViewById(R.id.rangeSlider);
 
         configureRangeSlider();
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -52,8 +52,8 @@ public class MemberLimitDialog extends BaseDialogClass {
     }
 
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
 
         rangeSlider.addOnChangeListener((slider, value, fromUser) -> {
             List<Float> values = rangeSlider.getValues();

app/src/main/java/com/sharix/sportsmanfriend/dialogs/RecommendedLevelDialog.java

@@ -30,9 +30,9 @@ public class RecommendedLevelDialog extends BaseDialogClass {
         rangeSlider = view.findViewById(R.id.rangeSlider);
 
         configureRangeSlider();
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -54,8 +54,8 @@ public class RecommendedLevelDialog extends BaseDialogClass {
     }
 
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
 
         rangeSlider.addOnChangeListener((slider, value, fromUser) -> {
             List<Float> values = rangeSlider.getValues();

app/src/main/java/com/sharix/sportsmanfriend/dialogs/SelectLocationDialog.java

@@ -45,7 +45,7 @@ public class SelectLocationDialog extends BaseDialogClass {
 
         MapHelperClass.configureMap(requireActivity() ,map,55.7522200, 37.6155600, 15);
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -61,8 +61,8 @@ public class SelectLocationDialog extends BaseDialogClass {
     }
 
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
 
         btnZoomIn.setOnClickListener(v -> MapHelperClass.ZoomIn(map));
 

app/src/main/java/com/sharix/sportsmanfriend/dialogs/TimeOfEventDialog.java

@@ -26,7 +26,7 @@ public class TimeOfEventDialog extends BaseDialogClass {
         timePickerEnd = view.findViewById(R.id.timePickerEnd);
         timePickerEnd.setIs24HourView(true);
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return super.onCreateDialog(savedInstanceState);
     }
@@ -43,8 +43,8 @@ public class TimeOfEventDialog extends BaseDialogClass {
     }
 
     @Override
-    protected void addClickEventToAllButtons() {
-        super.addClickEventToAllButtons();
+    protected void addClickEventToAllViews() {
+        super.addClickEventToAllViews();
 
         timePickerStart.setOnTimeChangedListener((view, hourOfDay, minute) -> {
             if (timePickerEnd.getHour() < hourOfDay || (timePickerEnd.getHour() == hourOfDay && timePickerEnd.getMinute() <= minute)) {

app/src/main/java/com/sharix/sportsmanfriend/view/LoginActivity.java

@@ -4,14 +4,22 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
 
 import com.sharix.sportsmanfriend.R;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class LoginActivity extends AppCompatActivity {
 
-    Button btnNext;
-    Button btnGoBack;
+    private Button btnNext;
+    private TextView goBack;
+    private List<EditText> edArray = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -19,13 +27,57 @@ public class LoginActivity extends AppCompatActivity {
         setContentView(R.layout.activity_login);
 
         btnNext = findViewById(R.id.btnNext);
-        btnGoBack = findViewById(R.id.btnGoBack);
+        goBack = findViewById(R.id.tv_change_email);
+        EditText editText1 = findViewById(R.id.ed1);
+        EditText editText2 = findViewById(R.id.ed2);
+        EditText editText3 = findViewById(R.id.ed3);
+        EditText editText4 = findViewById(R.id.ed4);
+        edArray.add(editText1);
+        edArray.add(editText2);
+        edArray.add(editText3);
+        edArray.add(editText4);
+
+        AddClickToAllViews();
+
+    }
+
+    private void AddClickToAllViews() {
 
         btnNext.setOnClickListener(view -> {
             Intent intent = new Intent(LoginActivity.this, MainActivity.class);
             startActivity(intent);
         });
 
-        btnGoBack.setOnClickListener(view -> finish());
+        goBack.setOnClickListener(view -> finish());
+
+        for (int i = 0; i < edArray.size(); i++){
+            final int tempIndex = i;
+            edArray.get(i).addTextChangedListener(new TextWatcher() {
+                int oldLength;
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                    oldLength = edArray.get(tempIndex).getText().length();
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+                    if (edArray.get(tempIndex).getText().length() < oldLength) {
+                        if(tempIndex - 1 != -1){
+                            edArray.get(tempIndex - 1).requestFocus();
+                        }
+                        return;
+                    }
+
+                    if(tempIndex + 1 < edArray.size()){
+                        edArray.get(tempIndex + 1).requestFocus();
+                    }
+                }
+            });
+        }
     }
 }

app/src/main/java/com/sharix/sportsmanfriend/view/RegisterActivity.java

@@ -4,14 +4,22 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
 
 import com.sharix.sportsmanfriend.R;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class RegisterActivity extends AppCompatActivity {
 
-    Button btnNext;
-    Button btnGoBack;
+    private Button btnNext;
+    private TextView goBack;
+    private List<EditText> edArray = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -19,13 +27,57 @@ public class RegisterActivity extends AppCompatActivity {
         setContentView(R.layout.activity_register);
 
         btnNext = findViewById(R.id.btnNext);
-        btnGoBack = findViewById(R.id.btnGoBack);
+        goBack = findViewById(R.id.tv_change_email);
+        EditText editText1 = findViewById(R.id.ed1);
+        EditText editText2 = findViewById(R.id.ed2);
+        EditText editText3 = findViewById(R.id.ed3);
+        EditText editText4 = findViewById(R.id.ed4);
+        edArray.add(editText1);
+        edArray.add(editText2);
+        edArray.add(editText3);
+        edArray.add(editText4);
+
+        AddClickToAllViews();
+
+    }
+
+    private void AddClickToAllViews() {
 
         btnNext.setOnClickListener(view -> {
             Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
             startActivity(intent);
         });
 
-        btnGoBack.setOnClickListener(view -> finish());
+        goBack.setOnClickListener(view -> finish());
+
+        for (int i = 0; i < edArray.size(); i++){
+            final int tempIndex = i;
+            edArray.get(i).addTextChangedListener(new TextWatcher() {
+                int oldLength;
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                    oldLength = edArray.get(tempIndex).getText().length();
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+                    if (edArray.get(tempIndex).getText().length() < oldLength) {
+                        if(tempIndex - 1 != -1){
+                            edArray.get(tempIndex - 1).requestFocus();
+                        }
+                        return;
+                    }
+
+                    if(tempIndex + 1 < edArray.size()){
+                        edArray.get(tempIndex + 1).requestFocus();
+                    }
+                }
+            });
+        }
     }
 }

app/src/main/java/com/sharix/sportsmanfriend/view/fragments/AboutEvent.java

@@ -0,0 +1,24 @@
+package com.sharix.sportsmanfriend.view.fragments;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.sharix.sportsmanfriend.R;
+
+public class AboutEvent extends Fragment {
+
+    private View view;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        view =inflater.inflate(R.layout.fragment_about_event, container, false);
+
+        return view;
+    }
+}

app/src/main/java/com/sharix/sportsmanfriend/view/fragments/CreateEventFragment.java

@@ -91,12 +91,12 @@ public class CreateEventFragment extends BaseFragmentClass implements BaseDialog
         notes = v.findViewById(R.id.notes);
         saveButton = v.findViewById(R.id.btnSave);
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return v;
     }
 
-    private void addClickEventToAllButtons(){
+    private void addClickEventToAllViews(){
         sportBlock.setOnClickListener(v -> {
             ChoiceOfSportDialog choiceOfSportDialog = new ChoiceOfSportDialog();
             choiceOfSportDialog.setTargetFragment(CreateEventFragment.this, 0);
@@ -246,6 +246,7 @@ public class CreateEventFragment extends BaseFragmentClass implements BaseDialog
             case "EndRegistrationBlock":
                 endRegistrationBlockText.setText(String.format("%s %s", bundle.getString("DateToText"), String.format(Locale.getDefault(), "%02d:%02d",
                         bundle.getInt("HourEnd"), bundle.getInt("MinuteEnd"))));
+                break;
             case "LevelBlock":
                 levelBlockText.setText(String.format("%s - %s", bundle.getFloat("LimitFrom"), bundle.getFloat("LimitTo")));
                 break;

app/src/main/java/com/sharix/sportsmanfriend/view/fragments/EventListFragment.java

@@ -3,6 +3,8 @@ package com.sharix.sportsmanfriend.view.fragments;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,7 +16,7 @@ import com.sharix.sportsmanfriend.R;
 
 public class EventListFragment extends Fragment implements OnBackPressedListener {
 
-    private LinearLayout btnOpenEventMap;
+    private LinearLayout btnOpenEventMap, OpenEventCard;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -22,35 +24,30 @@ public class EventListFragment extends Fragment implements OnBackPressedListener
         View view = inflater.inflate(R.layout.fragment_event_list, container, false);
 
         btnOpenEventMap = view.findViewById(R.id.btnOpenEventMap);
+        OpenEventCard = view.findViewById(R.id.event);
 
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return view;
     }
 
-    private void addClickEventToAllButtons() {
+    private void addClickEventToAllViews() {
 
         btnOpenEventMap.setOnClickListener(v -> {
-            /*// Получаем менеджер фрагментов
-            FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
-
-            // Создаем транзакцию фрагментов
-            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-
-            // Создаем новый фрагмент, который мы хотим открыть
-            MapFragment myFragment = new MapFragment();
-
-            // Заменяем текущий фрагмент на новый
-            fragmentTransaction.replace(R.id.frameWindow, myFragment);
-
-            // Добавляем транзакцию в стек возврата, чтобы пользователь мог вернуться назад
-            fragmentTransaction.addToBackStack(null);
-
-            // Применяем транзакцию
-            fragmentTransaction.commit();*/
-
             onBackPressed();
         });
+
+        OpenEventCard.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
+                FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+                AboutEvent myFragment = new AboutEvent();
+                fragmentTransaction.replace(R.id.frameWindow, myFragment);
+                fragmentTransaction.addToBackStack(null);
+                fragmentTransaction.commit();
+            }
+        });
     }
 
     @Override

app/src/main/java/com/sharix/sportsmanfriend/view/fragments/MapFragment.java

@@ -26,11 +26,8 @@ import com.sharix.sportsmanfriend.R;
 
 public class MapFragment extends BaseFragmentClass {
     // константы
-    private final int REQUEST_PERMISSIONS_REQUEST_CODE = 1;
-    private final int PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION = 2;
-    private final String KEY_ZOOM_LEVEL = "zoomLevel";
-    private final String KEY_CENTER_LATITUDE = "centerLatitude";
-    private final String KEY_CENTER_LONGITUDE = "centerLongitude";
+    private final int REQUEST_PERMISSIONS_REQUEST_CODE = 1, PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION = 2;
+    private final String KEY_ZOOM_LEVEL = "zoomLevel", KEY_CENTER_LATITUDE = "centerLatitude", KEY_CENTER_LONGITUDE = "centerLongitude";
     //Элементы
     private MapView map = null;
     private ImageButton btnZoomIn, btnZoomOut, btnMyLocation;
@@ -55,7 +52,7 @@ public class MapFragment extends BaseFragmentClass {
         }
 
         askPermissions();
-        addClickEventToAllButtons();
+        addClickEventToAllViews();
 
         return view;
     }
@@ -86,7 +83,7 @@ public class MapFragment extends BaseFragmentClass {
         }
     }
 
-    private void addClickEventToAllButtons() {
+    private void addClickEventToAllViews() {
         btnZoomIn.setOnClickListener(v -> MapHelperClass.ZoomIn(map));
 
         btnZoomOut.setOnClickListener(v -> MapHelperClass.ZoomOut(map));

app/src/main/res/drawable/ic_attending.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16.59,7.58L10,14.17l-3.59,-3.58L5,12l5,5 8,-8zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>

app/src/main/res/drawable/ic_chat_24.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
+</vector>

app/src/main/res/drawable/ic_duration.xml

@@ -0,0 +1,6 @@
+<vector android:height="25dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>

app/src/main/res/drawable/ic_location.xml

@@ -0,0 +1,5 @@
+<vector android:height="25dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>

app/src/main/res/drawable/ic_lock.xml

@@ -0,0 +1,5 @@
+<vector android:height="25dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>

app/src/main/res/drawable/ic_options.xml

@@ -0,0 +1,5 @@
+<vector android:height="25dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>

app/src/main/res/drawable/ic_person.xml

@@ -0,0 +1,5 @@
+<vector android:height="25dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

app/src/main/res/drawable/ic_show_on_map.xml

@@ -0,0 +1,5 @@
+<vector android:height="25dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21.41,10.59l-7.99,-8c-0.78,-0.78 -2.05,-0.78 -2.83,0l-8.01,8c-0.78,0.78 -0.78,2.05 0,2.83l8.01,8c0.78,0.78 2.05,0.78 2.83,0l7.99,-8C22.2,12.63 22.2,11.37 21.41,10.59zM13.5,14.5V12H10v3H8v-4c0,-0.55 0.45,-1 1,-1h4.5V7.5L17,11L13.5,14.5z"/>
+</vector>

app/src/main/res/layout/activity_login.xml

@@ -7,17 +7,6 @@
     tools:context=".view.LoginActivity"
     android:background="@color/AppBackground">
 
-    <Button
-        android:id="@+id/btnGoBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:text="Back"
-        android:textAllCaps="false"
-        android:textColor="@color/TextColor"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -45,8 +34,105 @@
             android:text="На 'email' отправлено письмо с кодом подтверждения"
             android:textColor="@color/TextColor"
             android:textSize="16sp"
+            android:layout_marginTop="15dp" />
+
+        <TextView
+            android:id="@+id/tv_change_email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
-            android:layout_marginBottom="200dp"/>
+            android:text="Изменить e-mail"
+            android:textColor="@color/TextColor"
+            android:textColorHint="#005C1F"
+            android:textColorLink="#005C1F"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="40dp"
+            android:layout_gravity="center"
+            android:layout_marginBottom="40dp">
+
+            <EditText
+                android:id="@+id/ed1"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+            <EditText
+                android:id="@+id/ed2"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+            <EditText
+                android:id="@+id/ed3"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+            <EditText
+                android:id="@+id/ed4"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:text="Отправить код повторно можно через 60 сек"
+            android:textColor="@color/TextColor"
+            android:textSize="17sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="15dp"
+            android:gravity="center"
+            android:text="Отправить код повторно"
+            android:textStyle="bold"
+            android:textColor="@color/TextColor"
+            android:textSize="17sp" />
 
         <Button
             android:id="@+id/btnNext"

app/src/main/res/layout/activity_register.xml

@@ -7,17 +7,6 @@
     tools:context=".view.RegisterActivity"
     android:background="@color/AppBackground">
 
-    <Button
-        android:id="@+id/btnGoBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:text="Back"
-        android:textAllCaps="false"
-        android:textColor="@color/TextColor"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -45,8 +34,105 @@
             android:text="На 'email' отправлено письмо с кодом подтверждения"
             android:textColor="@color/TextColor"
             android:textSize="16sp"
+            android:layout_marginTop="15dp" />
+
+        <TextView
+            android:id="@+id/tv_change_email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
-            android:layout_marginBottom="200dp"/>
+            android:text="Изменить e-mail"
+            android:textColor="@color/TextColor"
+            android:textColorHint="#005C1F"
+            android:textColorLink="#005C1F"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="40dp"
+            android:layout_gravity="center"
+            android:layout_marginBottom="40dp">
+
+            <EditText
+                android:id="@+id/ed1"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+            <EditText
+                android:id="@+id/ed2"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+            <EditText
+                android:id="@+id/ed3"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+            <EditText
+                android:id="@+id/ed4"
+                android:layout_width="35dp"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:maxLength="1"
+                android:textColor="@color/TextColor"
+                android:textColorHint="@color/TextColor"
+                android:backgroundTint="@color/TextColor"
+                android:textSize="44sp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:inputType="number"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:text="Отправить код повторно можно через 60 сек"
+            android:textColor="@color/TextColor"
+            android:textSize="17sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="15dp"
+            android:gravity="center"
+            android:text="Отправить код повторно"
+            android:textStyle="bold"
+            android:textColor="@color/TextColor"
+            android:textSize="17sp" />
 
         <Button
             android:id="@+id/btnNext"

app/src/main/res/layout/dialog_choice_of_gender.xml

@@ -6,16 +6,18 @@
     android:background="@drawable/black_border"
     android:padding="10dp">
 
-    <RadioGroup
+    <LinearLayout
         android:id="@+id/radioGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="15sp"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <RadioButton
+            android:tag="0,male"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:buttonTint="@color/switch_color"
@@ -25,6 +27,7 @@
             android:textSize="16sp" />
 
         <RadioButton
+            android:tag="1,female"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:buttonTint="@color/switch_color"
@@ -33,6 +36,7 @@
             android:textSize="16sp" />
 
         <RadioButton
+            android:tag="2,both"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:buttonTint="@color/switch_color"
@@ -40,7 +44,7 @@
             android:textColor="@color/TextColor"
             android:textSize="16sp" />
 
-    </RadioGroup>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/linearLayout3"

app/src/main/res/layout/dialog_choice_of_sport.xml

@@ -50,7 +50,7 @@
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <RadioButton
-                            android:tag="1,Basketball"
+                            android:tag="0,Basketball"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:buttonTint="@color/switch_color"
@@ -88,7 +88,7 @@
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <RadioButton
-                            android:tag="2,Soccer"
+                            android:tag="1,Soccer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:buttonTint="@color/switch_color"

app/src/main/res/layout/fragment_about_event.xml

@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".view.fragments.AboutEvent"
+    android:background="@color/AppBackground">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/relativeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:background="@color/AppBackground"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:id="@+id/imageButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:src="@drawable/ic_back"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/TextColor" />
+
+        <TextView
+            android:id="@+id/textView12"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginStart="10dp"
+            android:drawablePadding="10dp"
+            android:gravity="center_vertical"
+            android:text="Jogging"
+            android:textColor="@color/TextColor"
+            android:textSize="16sp"
+            app:drawableStartCompat="@drawable/ic_sport_icon"
+            app:drawableTint="@color/TextColor"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageButton"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:src="@drawable/ic_lock"
+            app:layout_constraintStart_toEndOf="@+id/textView12"
+            android:layout_marginStart="5dp"
+            app:tint="@color/TextColor" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:background="#00000000"
+                android:padding="7dp"
+                android:src="@drawable/ic_chat_24"
+                app:tint="@color/TextColor"
+                android:layout_marginEnd="5dp"/>
+
+            <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:background="#00000000"
+                android:padding="7dp"
+                android:src="@drawable/ic_options"
+                app:tint="@color/TextColor" />
+
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/relativeLayout"
+        android:paddingTop="15dp"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="25dp"
+                    android:text="Sometext"
+                    android:textSize="14sp"
+                    android:textColor="@color/TextColor"
+                    android:background="@drawable/btn_style"
+                    android:backgroundTint="@color/MainColor"
+                    android:drawableStart="@drawable/ic_attending"
+                    android:drawableTint="@color/TextColor"
+                    android:drawablePadding="5dp"
+                    android:textAllCaps="false"
+                    android:paddingEnd="10dp"
+                    android:paddingStart="5dp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Date, time, time left"
+                    android:textSize="14sp"
+                    android:textColor="@color/MainColor"
+                    android:textStyle="bold"
+                    android:layout_marginStart="15dp"/>
+
+            </LinearLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp">
+
+                <LinearLayout
+                    android:id="@+id/linearLayout6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Level"
+                        android:textAlignment="center"
+                        android:textColor="@color/SubTextColor"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="0.31 - 3.31"
+                        android:textAlignment="center"
+                        android:textColor="@color/TextColor"
+                        android:textSize="18sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/linearLayout7"
+                    app:layout_constraintStart_toEndOf="@+id/linearLayout6"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Age"
+                        android:textAlignment="center"
+                        android:textColor="@color/SubTextColor"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="25 - 40"
+                        android:textAlignment="center"
+                        android:textColor="@color/TextColor"
+                        android:textSize="18sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/linearLayout7"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Gender"
+                        android:textAlignment="center"
+                        android:textColor="@color/SubTextColor"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="All"
+                        android:textAlignment="center"
+                        android:textColor="@color/TextColor"
+                        android:textSize="18sp" />
+
+                </LinearLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/TextColor"
+                android:layout_marginTop="15dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="20dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:src="@drawable/ic_duration"
+                        android:layout_marginEnd="10dp"
+                        app:tint="@color/TextColor" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Duration"
+                            android:textAlignment="center"
+                            android:textColor="@color/SubTextColor"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:text="45 minutes"
+                            android:textAlignment="center"
+                            android:textColor="@color/TextColor"
+                            android:textSize="16sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="20dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:src="@drawable/ic_people"
+                        android:layout_marginEnd="10dp"
+                        app:tint="@color/TextColor" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Member limit"
+                            android:textAlignment="center"
+                            android:textColor="@color/SubTextColor"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:text="2- 10"
+                            android:textAlignment="center"
+                            android:textColor="@color/TextColor"
+                            android:textSize="16sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp">
+
+                    <LinearLayout
+                        android:id="@+id/linearLayout8"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginEnd="10dp"
+                            android:src="@drawable/ic_location"
+                            app:tint="@color/TextColor" />
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Member limit"
+                                android:textAlignment="center"
+                                android:textColor="@color/SubTextColor"
+                                android:textSize="14sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="5dp"
+                                android:text="2- 10"
+                                android:textAlignment="center"
+                                android:textColor="@color/TextColor"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="10dp"
+                        android:background="@drawable/black_border"
+                        android:padding="10dp"
+                        android:src="@drawable/ic_show_on_map"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tint="@color/TextColor" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="20dp">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:src="@drawable/ic_duration"
+                        android:layout_marginEnd="10dp"
+                        app:tint="@color/TextColor" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Duration"
+                            android:textAlignment="center"
+                            android:textColor="@color/SubTextColor"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:text="45 minutes"
+                            android:textAlignment="center"
+                            android:textColor="@color/TextColor"
+                            android:textSize="16sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/TextColor"
+                android:layout_marginTop="15dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="25dp"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:src="@drawable/ic_camera"
+                        app:tint="@color/TextColor" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginStart="10dp"
+                        android:text="Gallery"
+                        android:textColor="@color/SubTextColor"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
+                    <HorizontalScrollView
+                        android:layout_width="match_parent"
+                        android:layout_height="100dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="10dp">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:id="@+id/photo_container">
+
+                        </LinearLayout>
+
+                    </HorizontalScrollView>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/TextColor"
+                    android:layout_marginTop="15dp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc vulputate libero et velit interdum, ac aliquet odio dolor sit amet, ma..."
+                    android:textSize="16dp"
+                    android:textColor="@color/TextColor"
+                    android:layout_marginTop="15dp"/>
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/TextColor"
+                android:layout_marginTop="15dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="15dp">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <!-- будет округляться -->
+                        <com.google.android.material.imageview.ShapeableImageView
+                            android:layout_width="50dp"
+                            android:layout_height="50dp"
+                            android:src="@drawable/ic_person"
+                            android:tint="@color/TextColor"
+                            app:shapeAppearance="@style/roundedImageViewRounded50" />
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Vlad Shipilov"
+                                android:textAlignment="center"
+                                android:textColor="@color/TextColor"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_marginTop="5dp"
+                                android:text="online"
+                                android:textAlignment="center"
+                                android:textColor="@color/MainColor"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Owner"
+                        android:textAlignment="center"
+                        android:textColor="@color/MainColor"
+                        android:textSize="16sp"
+                        android:layout_marginEnd="10dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <!-- будет округляться -->
+                        <com.google.android.material.imageview.ShapeableImageView
+                            android:layout_width="50dp"
+                            android:layout_height="50dp"
+                            android:src="@drawable/ic_person"
+                            android:tint="@color/TextColor"
+                            app:shapeAppearance="@style/roundedImageViewRounded50" />
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Vlad Shipilov"
+                                android:textAlignment="center"
+                                android:textColor="@color/TextColor"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_marginTop="5dp"
+                                android:text="last seet at 15:45"
+                                android:textAlignment="center"
+                                android:textColor="@color/SubTextColor"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=""
+                        android:textAlignment="center"
+                        android:textColor="@color/MainColor"
+                        android:textSize="16sp"
+                        android:layout_marginEnd="10dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_calendar.xml

@@ -292,8 +292,6 @@
         </LinearLayout>
 
 
-        </LinearLayout>
-
     </LinearLayout>
 
 

app/src/main/res/layout/fragment_event_list.xml

@@ -86,6 +86,7 @@
             android:orientation="vertical">
 
             <LinearLayout
+                android:id="@+id/event"
                 android:layout_width="match_parent"
                 android:layout_height="200dp"
                 android:orientation="horizontal"

app/src/main/res/values/themes.xml

@@ -69,4 +69,9 @@
         <item name="cornerSize">10%</item>
     </style>
 
+    <style name="roundedImageViewRounded50">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+
 </resources>