Dark / Light theme toggle; a small part of chats; profile, settings, more fragments

app/build.gradle

@@ -34,6 +34,7 @@ android {
 }
 
 dependencies {
+    implementation 'com.github.rahatarmanahmed:circularprogressview:2.5.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'org.osmdroid:osmdroid-android:6.1.14'
@@ -41,7 +42,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'androidx.test.ext:junit:1.1.5'
 }

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

@@ -68,4 +68,4 @@ public abstract class BaseDialogClass extends AppCompatDialogFragment {
     }
 
     protected abstract Bundle DataToTransfer();
-}
+}

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

@@ -53,5 +53,4 @@ public abstract class BaseFragmentClass extends Fragment {
 
     // здесь нужно записать данные, которые нужно сохранить в случае закрытия фрагмента
     protected abstract Bundle getStateToSave();
-
 }

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

@@ -1,18 +1,25 @@
 package com.sharix.sportsmanfriend;
 
 import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 
 import org.osmdroid.api.IGeoPoint;
 import org.osmdroid.api.IMapController;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
-import org.osmdroid.views.overlay.Marker;
+
+import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 public class MapHelperClass {
 
     public static void configureMap(Context context, MapView inMap, double latitude, double longitude, int zoom) {
         inMap.setTileSource(TileSourceFactory.DEFAULT_TILE_SOURCE);
+        IsDarkMap(context, inMap);
         inMap.setMultiTouchControls(true);
         inMap.setMaxZoomLevel(18.0);
 
@@ -21,42 +28,86 @@ public class MapHelperClass {
         GeoPoint startPoint = new GeoPoint(latitude, longitude);
         mapController.setCenter(startPoint);
 
-        Marker startMarker = new Marker(inMap);
-        startMarker.setPosition(startPoint);
-        startMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
-        inMap.getOverlays().add(startMarker);
-
-        startMarker.setIcon(context.getResources().getDrawable(R.drawable.ic_camera));
-        startMarker.setTitle("Start point");
-
         inMap.setBuiltInZoomControls(false);
     }
 
-    public static void ZoomIn(MapView inMap){
+    public static void zoomIn(MapView inMap){
         if (inMap.canZoomIn()) {
             inMap.getController().zoomIn();
         }
     }
 
-    public static void ZoomOut(MapView inMap){
+    public static void zoomOut(MapView inMap){
         if (inMap.canZoomOut()) {
             inMap.getController().zoomOut();
         }
     }
 
-    public static void SetCenterOfMap(MapView inMap, double latitude, double longitude){
+    public static void setCenterOfMap(MapView inMap, double latitude, double longitude){
         inMap.getController().setCenter(new GeoPoint(latitude, longitude));
     }
 
-    public static void SetZoomOfMap(MapView inMap, int zoom){
+    public static void setZoomOfMap(MapView inMap, int zoom){
         inMap.getController().setZoom(zoom);
     }
 
-    public static IGeoPoint GetMapCenter(MapView inMap){
+    public static IGeoPoint getMapCenter(MapView inMap){
         return inMap.getMapCenter();
     }
 
-    public static int GetMapZoom(MapView inMap){
+    public static int getMapZoom(MapView inMap){
         return inMap.getZoomLevel();
     }
+
+    private static void IsDarkMap(Context context, MapView inMap){
+        int nightModeFlags =
+                context.getResources().getConfiguration().uiMode &
+                        Configuration.UI_MODE_NIGHT_MASK;
+        if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES) {
+            SimpleDateFormat format = new SimpleDateFormat("HH", Locale.getDefault());
+            ColorMatrix inverseMatrix = new ColorMatrix(new float[]{
+                    -1.0f, 0.0f, 0.0f, 0.0f, 255f,
+                    0.0f, -1.0f, 0.0f, 0.0f, 255f,
+                    0.0f, 0.0f, -1.0f, 0.0f, 255f,
+                    0.0f, 0.0f, 0.0f, 1.0f, 0.0f
+            });
+
+            int destinationColor = Color.parseColor("#FF2A2A2A");
+            float lr = (255.0f - Color.red(destinationColor)) / 255.0f;
+            float lg = (255.0f - Color.green(destinationColor)) / 255.0f;
+            float lb = (255.0f - Color.blue(destinationColor)) / 255.0f;
+            ColorMatrix grayscaleMatrix = new ColorMatrix(new float[]{
+                    lr, lg, lb, 0, 0, //
+                    lr, lg, lb, 0, 0, //
+                    lr, lg, lb, 0, 0, //
+                    0, 0, 0, 0, 255, //
+            });
+            grayscaleMatrix.preConcat(inverseMatrix);
+            int dr = Color.red(destinationColor);
+            int dg = Color.green(destinationColor);
+            int db = Color.blue(destinationColor);
+            float drf = dr / 255f;
+            float dgf = dg / 255f;
+            float dbf = db / 255f;
+            ColorMatrix tintMatrix = new ColorMatrix(new float[]{
+                    drf, 0, 0, 0, 0, //
+                    0, dgf, 0, 0, 0, //
+                    0, 0, dbf, 0, 0, //
+                    0, 0, 0, 1, 0, //
+            });
+            tintMatrix.preConcat(grayscaleMatrix);
+            float lDestination = drf * lr + dgf * lg + dbf * lb;
+            float scale = 1f - lDestination;
+            float translate = 1 - scale * 0.5f;
+            ColorMatrix scaleMatrix = new ColorMatrix(new float[]{
+                    scale, 0, 0, 0, dr * translate, //
+                    0, scale, 0, 0, dg * translate, //
+                    0, 0, scale, 0, db * translate, //
+                    0, 0, 0, 1, 0, //
+            });
+            scaleMatrix.preConcat(tintMatrix);
+            ColorMatrixColorFilter filter = new ColorMatrixColorFilter(scaleMatrix);
+            inMap.getOverlayManager().getTilesOverlay().setColorFilter(filter);
+        }
+    }
 }

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

@@ -23,6 +23,7 @@ public class PhotoHelperClass {
         }
     }
 
+    // создание квдартной фотографии
     public static Bitmap cropBitmapToSquare(Bitmap bitmap, Context context) {
         int width = bitmap.getWidth();
         int height = bitmap.getHeight();
@@ -35,9 +36,9 @@ public class PhotoHelperClass {
         return Bitmap.createScaledBitmap(croppedBitmap, dpToPx(100, context), dpToPx(100,context), false);
     }
 
+    // конвертация dp в пиксели
     public static int dpToPx(int dp, Context context) {
         float density = context.getResources().getDisplayMetrics().density;
         return Math.round((float) dp * density);
     }
-
 }

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

@@ -3,8 +3,12 @@ package com.sharix.sportsmanfriend.dialogs;
 import android.Manifest;
 import android.app.Dialog;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.widget.ImageButton;
@@ -22,6 +26,8 @@ import com.sharix.sportsmanfriend.R;
 import org.osmdroid.views.MapView;
 
 import java.io.ByteArrayOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 public class SelectLocationDialog extends BaseDialogClass {
     private final int PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION = 2;
@@ -47,6 +53,57 @@ public class SelectLocationDialog extends BaseDialogClass {
 
         addClickEventToAllViews();
 
+        int nightModeFlags =
+                getContext().getResources().getConfiguration().uiMode &
+                        Configuration.UI_MODE_NIGHT_MASK;
+        if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES) {
+            SimpleDateFormat format = new SimpleDateFormat("HH", Locale.getDefault());
+            //taking cue from https://medium.com/square-corner-blog/welcome-to-the-color-matrix-64d112e3f43d
+            ColorMatrix inverseMatrix = new ColorMatrix(new float[] {
+                    -1.0f, 0.0f, 0.0f, 0.0f, 255f,
+                    0.0f, -1.0f, 0.0f, 0.0f, 255f,
+                    0.0f, 0.0f, -1.0f, 0.0f, 255f,
+                    0.0f, 0.0f, 0.0f, 1.0f, 0.0f
+            });
+
+            int destinationColor = Color.parseColor("#FF2A2A2A");
+            float lr = (255.0f - Color.red(destinationColor))/255.0f;
+            float lg = (255.0f - Color.green(destinationColor))/255.0f;
+            float lb = (255.0f - Color.blue(destinationColor))/255.0f;
+            ColorMatrix grayscaleMatrix = new ColorMatrix(new float[] {
+                    lr, lg, lb, 0, 0, //
+                    lr, lg, lb, 0, 0, //
+                    lr, lg, lb, 0, 0, //
+                    0, 0, 0, 0, 255, //
+            });
+            grayscaleMatrix.preConcat(inverseMatrix);
+            int dr = Color.red(destinationColor);
+            int dg = Color.green(destinationColor);
+            int db = Color.blue(destinationColor);
+            float drf = dr / 255f;
+            float dgf = dg / 255f;
+            float dbf = db / 255f;
+            ColorMatrix tintMatrix = new ColorMatrix(new float[] {
+                    drf, 0, 0, 0, 0, //
+                    0, dgf, 0, 0, 0, //
+                    0, 0, dbf, 0, 0, //
+                    0, 0, 0, 1, 0, //
+            });
+            tintMatrix.preConcat(grayscaleMatrix);
+            float lDestination = drf * lr + dgf * lg + dbf * lb;
+            float scale = 1f - lDestination;
+            float translate = 1 - scale * 0.5f;
+            ColorMatrix scaleMatrix = new ColorMatrix(new float[] {
+                    scale, 0, 0, 0, dr * translate, //
+                    0, scale, 0, 0, dg * translate, //
+                    0, 0, scale, 0, db * translate, //
+                    0, 0, 0, 1, 0, //
+            });
+            scaleMatrix.preConcat(tintMatrix);
+            ColorMatrixColorFilter filter = new ColorMatrixColorFilter(scaleMatrix);
+            map.getOverlayManager().getTilesOverlay().setColorFilter(filter);
+        }
+
         return super.onCreateDialog(savedInstanceState);
     }
 
@@ -54,8 +111,8 @@ public class SelectLocationDialog extends BaseDialogClass {
     protected Bundle DataToTransfer() {
         Bundle bundle = new Bundle();
         bundle.putString("FromBlock", "LocationBlock");
-        bundle.putDouble("latitude", MapHelperClass.GetMapCenter(map).getLatitude());
-        bundle.putDouble("longitude", MapHelperClass.GetMapCenter(map).getLongitude());
+        bundle.putDouble("latitude", MapHelperClass.getMapCenter(map).getLatitude());
+        bundle.putDouble("longitude", MapHelperClass.getMapCenter(map).getLongitude());
         bundle.putByteArray("screenshot", getScreenshot());
         return bundle;
     }
@@ -64,9 +121,9 @@ public class SelectLocationDialog extends BaseDialogClass {
     protected void addClickEventToAllViews() {
         super.addClickEventToAllViews();
 
-        btnZoomIn.setOnClickListener(v -> MapHelperClass.ZoomIn(map));
+        btnZoomIn.setOnClickListener(v -> MapHelperClass.zoomIn(map));
 
-        btnZoomOut.setOnClickListener(v -> MapHelperClass.ZoomOut(map));
+        btnZoomOut.setOnClickListener(v -> MapHelperClass.zoomOut(map));
 
         btnMyLocation.setOnClickListener(v -> {
             if (ActivityCompat.checkSelfPermission(requireActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
@@ -78,8 +135,8 @@ public class SelectLocationDialog extends BaseDialogClass {
             fusedLocationProviderClient.getLastLocation()
                 .addOnSuccessListener(requireActivity(), location -> {
                     if (location != null) {
-                        MapHelperClass.SetCenterOfMap(map, location.getLatitude(), location.getLongitude());
-                        MapHelperClass.SetZoomOfMap(map, 18);
+                        MapHelperClass.setCenterOfMap(map, location.getLatitude(), location.getLongitude());
+                        MapHelperClass.setZoomOfMap(map, 18);
                     }
                 });
 

app/src/main/java/com/sharix/sportsmanfriend/model/EventModel.java

@@ -0,0 +1,4 @@
+package com.sharix.sportsmanfriend.model;
+
+public class EventModel {
+}

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

@@ -1,23 +1,23 @@
 package com.sharix.sportsmanfriend.view;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.sharix.sportsmanfriend.BaseDialogClass;
 import com.sharix.sportsmanfriend.BuildConfig;
 import com.sharix.sportsmanfriend.OnBackPressedListener;
 import com.sharix.sportsmanfriend.R;
 import com.sharix.sportsmanfriend.databinding.ActivityMainBinding;
-import com.sharix.sportsmanfriend.BaseDialogClass;
 import com.sharix.sportsmanfriend.view.fragments.CalendarFragment;
 import com.sharix.sportsmanfriend.view.fragments.ChatsFragment;
 import com.sharix.sportsmanfriend.view.fragments.CreateEventFragment;
 import com.sharix.sportsmanfriend.view.fragments.MapFragment;
-import com.sharix.sportsmanfriend.view.fragments.ProfileFragment;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
+import com.sharix.sportsmanfriend.view.fragments.MoreFragment;
 
 import org.osmdroid.config.Configuration;
 
@@ -29,7 +29,7 @@ public class MainActivity extends AppCompatActivity implements OnBackPressedList
     CalendarFragment calendarFragment = new CalendarFragment();
     CreateEventFragment createEventFragment = new CreateEventFragment();
     ChatsFragment chatsFragment = new ChatsFragment();
-    ProfileFragment profileFragment = new ProfileFragment();
+    MoreFragment moreFragment = new MoreFragment();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -65,8 +65,8 @@ public class MainActivity extends AppCompatActivity implements OnBackPressedList
                     replaceFragment(chatsFragment);
                     break;
 
-                case R.id.account:
-                    replaceFragment(profileFragment);
+                case R.id.more:
+                    replaceFragment(moreFragment);
                     break;
             }
 

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

@@ -0,0 +1,40 @@
+package com.sharix.sportsmanfriend.view.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+import androidx.fragment.app.Fragment;
+
+import com.sharix.sportsmanfriend.OnBackPressedListener;
+import com.sharix.sportsmanfriend.R;
+
+public class AboutEventFragment extends Fragment implements OnBackPressedListener {
+
+    private View view;
+    private ImageButton btnBack;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        view = inflater.inflate(R.layout.fragment_about_event, container, false);
+
+        btnBack = view.findViewById(R.id.btnBack);
+
+        addClickEventToAllViews();
+
+        return view;
+    }
+
+    private void addClickEventToAllViews() {
+        btnBack.setOnClickListener(v -> onBackPressed());
+    }
+
+    @Override
+    public void onBackPressed() {
+        requireActivity().getSupportFragmentManager().popBackStack();
+    }
+}

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

@@ -1,24 +1,20 @@
 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;
+import androidx.fragment.app.Fragment;
 
-public class AboutEvent extends Fragment {
+import com.sharix.sportsmanfriend.R;
 
-    private View view;
+public class ChatFragment extends Fragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        view =inflater.inflate(R.layout.fragment_about_event, container, false);
 
-        return view;
+        return inflater.inflate(R.layout.fragment_chat, container, false);
     }
 }

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

@@ -1,53 +1,42 @@
 package com.sharix.sportsmanfriend.view.fragments;
 
-import android.graphics.Color;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-import android.widget.TextView;
+import android.widget.LinearLayout;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.sharix.sportsmanfriend.R;
 
 public class ChatsFragment extends Fragment {
 
+    private LinearLayout chat;
+    private View view;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view =  inflater.inflate(R.layout.fragment_chats, container, false);
-
-        Spinner spinner = view.findViewById(R.id.sort_spinner);
+        view =  inflater.inflate(R.layout.fragment_chats, container, false);
 
-        String[] items = new String[]{"Sort by", "Date", "Saved", "Distance"};
+        chat = view.findViewById(R.id.supportChat);
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(requireActivity(), android.R.layout.simple_spinner_dropdown_item, items) {
-            @Override
-            public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-                View view = super.getDropDownView(position, convertView, parent);
-
-                if (position == 0) {
-                    ((TextView) view).setTextColor(Color.GRAY);
-                    view.setEnabled(false);
-                } else {
-                    ((TextView) view).setTextColor(Color.BLACK);
-                    view.setEnabled(true);
-                }
-
-                return view;
-            }
-        };
-
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
-        spinner.setAdapter(adapter);
+        addClickEventToAllViews();
 
         return view;
     }
+
+    private void addClickEventToAllViews() {
+        chat.setOnClickListener(v -> {
+            FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
+            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+            ChatFragment myFragment = new ChatFragment();
+            fragmentTransaction.replace(R.id.frameWindow, myFragment);
+            fragmentTransaction.addToBackStack(null);
+            fragmentTransaction.commit();
+        });
+    }
 }

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

@@ -8,11 +8,6 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,7 +17,10 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.google.android.material.imageview.ShapeableImageView;
 import com.sharix.sportsmanfriend.BaseDialogClass;
@@ -39,7 +37,6 @@ import com.sharix.sportsmanfriend.dialogs.SelectLocationDialog;
 import com.sharix.sportsmanfriend.dialogs.TimeOfEventDialog;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.Locale;
 import java.util.Objects;
 
@@ -54,7 +51,7 @@ public class CreateEventFragment extends BaseFragmentClass implements BaseDialog
     private ShapeableImageView LocationBlockImage;
     // данные для бд
     private String description;
-    private double latitude, longitude;
+    public double latitude, longitude ;
     private LocalDateTime event_start, end_registration;
     private int sport_id, min_participants, max_participants, level_min, level_max;
     // константы
@@ -231,6 +228,8 @@ public class CreateEventFragment extends BaseFragmentClass implements BaseDialog
             case "LocationBlock":
                 LocationBlockImage.setImageBitmap(BitmapFactory.decodeByteArray(bundle.getByteArray("screenshot"), 0, bundle.getByteArray("screenshot").length));
                 locationBlockText.setText(String.format("latitude: %s longitude: %s", bundle.getDouble("latitude"), bundle.getDouble("longitude")));
+                latitude = bundle.getDouble("latitude");
+                longitude = bundle.getDouble("longitude");
                 break;
             case "MemberLimitsBlock":
                 memberLimitsBlockText.setText(String.format("%d - %d", bundle.getInt("LimitFrom"), bundle.getInt("LimitTo")));

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

@@ -1,20 +1,39 @@
 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 android.widget.ImageButton;
 
+import androidx.fragment.app.Fragment;
+
+import com.sharix.sportsmanfriend.OnBackPressedListener;
 import com.sharix.sportsmanfriend.R;
 
-public class EventFiltersFragment extends Fragment {
+public class EventFiltersFragment extends Fragment implements OnBackPressedListener {
+
+    private View view;
+    private ImageButton btnBack;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_event_filters, container, false);
+        view = inflater.inflate(R.layout.fragment_event_filters, container, false);
+
+        btnBack = view.findViewById(R.id.btnBack);
+
+        addClickEventToAllViews();
+
+        return view;
+    }
+
+    private void addClickEventToAllViews() {
+        btnBack.setOnClickListener(v -> onBackPressed());
+    }
+
+    @Override
+    public void onBackPressed() {
+        requireActivity().getSupportFragmentManager().popBackStack();
     }
 }

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

@@ -1,22 +1,23 @@
 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;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.sharix.sportsmanfriend.OnBackPressedListener;
 import com.sharix.sportsmanfriend.R;
 
 public class EventListFragment extends Fragment implements OnBackPressedListener {
 
     private LinearLayout btnOpenEventMap, OpenEventCard;
+    private ImageButton btnFilters;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -25,6 +26,7 @@ public class EventListFragment extends Fragment implements OnBackPressedListener
 
         btnOpenEventMap = view.findViewById(R.id.btnOpenEventMap);
         OpenEventCard = view.findViewById(R.id.event);
+        btnFilters = view.findViewById(R.id.btnFilters);
 
         addClickEventToAllViews();
 
@@ -37,16 +39,22 @@ public class EventListFragment extends Fragment implements OnBackPressedListener
             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();
-            }
+        OpenEventCard.setOnClickListener(v -> {
+            FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
+            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+            AboutEventFragment myFragment = new AboutEventFragment();
+            fragmentTransaction.replace(R.id.frameWindow, myFragment);
+            fragmentTransaction.addToBackStack(null);
+            fragmentTransaction.commit();
+        });
+
+        btnFilters.setOnClickListener(v -> {
+            FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
+            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+            EventFiltersFragment myFragment = new EventFiltersFragment();
+            fragmentTransaction.replace(R.id.frameWindow, myFragment);
+            fragmentTransaction.addToBackStack(null);
+            fragmentTransaction.commit();
         });
     }
 

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

@@ -3,6 +3,11 @@ package com.sharix.sportsmanfriend.view.fragments;
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
@@ -10,27 +15,21 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import org.osmdroid.views.MapView;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-
 import com.google.android.gms.location.FusedLocationProviderClient;
 import com.google.android.gms.location.LocationServices;
-
 import com.sharix.sportsmanfriend.BaseFragmentClass;
 import com.sharix.sportsmanfriend.MapHelperClass;
 import com.sharix.sportsmanfriend.R;
 
+import org.osmdroid.views.MapView;
+
 public class MapFragment extends BaseFragmentClass {
     // константы
     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;
+    private ImageButton btnZoomIn, btnZoomOut, btnMyLocation, btnFilters;
     private LinearLayout btnOpenEventList;
     //определяет последнюю известную локацию
     private FusedLocationProviderClient fusedLocationProviderClient;
@@ -43,6 +42,7 @@ public class MapFragment extends BaseFragmentClass {
         btnZoomOut = view.findViewById(R.id.btn_zoomOut);
         btnMyLocation = view.findViewById(R.id.btnMyLocation);
         btnOpenEventList = view.findViewById(R.id.btnOpenEventList);
+        btnFilters = view.findViewById(R.id.btnFilters);
 
         map = view.findViewById(R.id.map);
         fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(requireActivity());
@@ -84,9 +84,9 @@ public class MapFragment extends BaseFragmentClass {
     }
 
     private void addClickEventToAllViews() {
-        btnZoomIn.setOnClickListener(v -> MapHelperClass.ZoomIn(map));
+        btnZoomIn.setOnClickListener(v -> MapHelperClass.zoomIn(map));
 
-        btnZoomOut.setOnClickListener(v -> MapHelperClass.ZoomOut(map));
+        btnZoomOut.setOnClickListener(v -> MapHelperClass.zoomOut(map));
 
         btnMyLocation.setOnClickListener(v -> {
             if (ActivityCompat.checkSelfPermission(requireActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
@@ -98,8 +98,8 @@ public class MapFragment extends BaseFragmentClass {
             fusedLocationProviderClient.getLastLocation()
                     .addOnSuccessListener(requireActivity(), location -> {
                         if (location != null) {
-                            MapHelperClass.SetCenterOfMap(map, location.getLatitude(), location.getLongitude());
-                            MapHelperClass.SetZoomOfMap(map, 18);
+                            MapHelperClass.setCenterOfMap(map, location.getLatitude(), location.getLongitude());
+                            MapHelperClass.setZoomOfMap(map, 18);
                         }
                     });
 
@@ -113,6 +113,15 @@ public class MapFragment extends BaseFragmentClass {
             fragmentTransaction.addToBackStack(null);
             fragmentTransaction.commit();
         });
+
+        btnFilters.setOnClickListener(v -> {
+            FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
+            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+            EventFiltersFragment myFragment = new EventFiltersFragment();
+            fragmentTransaction.replace(R.id.frameWindow, myFragment);
+            fragmentTransaction.addToBackStack(null);
+            fragmentTransaction.commit();
+        });
     }
 
     @Override
@@ -132,9 +141,9 @@ public class MapFragment extends BaseFragmentClass {
     protected Bundle getStateToSave() {
         Bundle state = new Bundle();
 
-        state.putInt(KEY_ZOOM_LEVEL, MapHelperClass.GetMapZoom(map));
-        state.putDouble(KEY_CENTER_LATITUDE, MapHelperClass.GetMapCenter(map).getLatitude());
-        state.putDouble(KEY_CENTER_LONGITUDE, MapHelperClass.GetMapCenter(map).getLongitude());
+        state.putInt(KEY_ZOOM_LEVEL, MapHelperClass.getMapZoom(map));
+        state.putDouble(KEY_CENTER_LATITUDE, MapHelperClass.getMapCenter(map).getLatitude());
+        state.putDouble(KEY_CENTER_LONGITUDE, MapHelperClass.getMapCenter(map).getLongitude());
 
         return state;
     }

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

@@ -0,0 +1,47 @@
+package com.sharix.sportsmanfriend.view.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.sharix.sportsmanfriend.R;
+
+public class MoreFragment extends Fragment {
+
+    private View view;
+    private ConstraintLayout settingsBlock;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        view = inflater.inflate(R.layout.fragment_more, container, false);
+
+        settingsBlock = view.findViewById(R.id.settingsBlock);
+
+        addClickEventToAllViews();
+
+        return view;
+    }
+
+    private void addClickEventToAllViews(){
+
+        settingsBlock.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentManager fragmentManager = requireActivity().getSupportFragmentManager();
+                FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+                SettingsFragment myFragment = new SettingsFragment();
+                fragmentTransaction.replace(R.id.frameWindow, myFragment);
+                fragmentTransaction.addToBackStack(null);
+                fragmentTransaction.commit();
+            }
+        });
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.sharix.sportsmanfriend.view.fragments;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.Fragment;
+
+import com.sharix.sportsmanfriend.OnBackPressedListener;
+import com.sharix.sportsmanfriend.R;
+
+public class SettingsFragment extends Fragment implements OnBackPressedListener {
+
+    private View view;
+    private SwitchCompat switchAppTheme;
+    private boolean isNightMode;
+    private ImageButton btnBack;
+    private SharedPreferences sharedPreferences;
+    private SharedPreferences.Editor editor;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        view = inflater.inflate(R.layout.fragment_settings, container, false);
+
+        switchAppTheme = view.findViewById(R.id.switchAppTheme);
+        btnBack = view.findViewById(R.id.btnBack);
+
+        sharedPreferences = requireActivity().getSharedPreferences("MODE", Context.MODE_PRIVATE);
+        isNightMode = sharedPreferences.getBoolean("night", false);
+
+        if (isNightMode) {
+            switchAppTheme.setChecked(true);
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        }
+
+        addClickEventToAllViews();
+
+        return view;
+    }
+
+    private void addClickEventToAllViews() {
+        switchAppTheme.setOnClickListener(v -> {
+            if(isNightMode){
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                editor = sharedPreferences.edit();
+                editor.putBoolean("night", false);
+            } else{
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                editor = sharedPreferences.edit();
+                editor.putBoolean("night", true);
+            }
+            editor.apply();
+        });
+
+        btnBack.setOnClickListener(v -> onBackPressed());
+    }
+
+    @Override
+    public void onBackPressed() {
+        requireActivity().getSupportFragmentManager().popBackStack();
+    }
+}

app/src/main/res/color/switch_color_dark.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/MainColor"
+        android:state_checked="true" />
+    <item android:color="@color/white"/>
+</selector>

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

@@ -3,7 +3,7 @@
     android:shape="rectangle" >
 
     <solid
-        android:color="@color/ElementsColor" >
+        android:color="@color/ElementsColorDark" >
     </solid>
 
     <corners
@@ -12,6 +12,6 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/StrokeColor" />
+        android:color="@color/StrokeColorDark" />
 
 </shape>

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

@@ -3,7 +3,7 @@
     android:shape="rectangle" >
 
     <solid
-        android:color="@color/ElementsColor" >
+        android:color="@color/ElementsColorDark" >
     </solid>
 
     <corners
@@ -13,6 +13,6 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/StrokeColor" />
+        android:color="@color/StrokeColorDark" />
 
 </shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:color="@color/black" />
-    <item android:color="@color/white" />
+    <item android:state_activated="true" android:color="@color/TextColorDark" />
+    <item android:color="@color/TextColor" />
 </selector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:color="@color/TextColor" />
+    <item android:color="@color/TextColorDark"/>
+</selector>

app/src/main/res/drawable/ic_blocked.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,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+</vector>

app/src/main/res/drawable/ic_calendar.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="M20,3h-1L19,1h-2v2L7,3L7,1L5,1v2L4,3c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,21L4,21L4,8h16v13z"/>
+</vector>

app/src/main/res/drawable/ic_create_by_me.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="M13,8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8s1.79,4 4,4S13,10.21 13,8zM15,10v2h3v3h2v-3h3v-2h-3V7h-2v3H15zM1,18v2h16v-2c0,-2.66 -5.33,-4 -8,-4S1,15.34 1,18z"/>
+</vector>

app/src/main/res/drawable-v24/ic_history.xml → app/src/main/res/drawable/ic_history.xml

@@ -1,5 +1,5 @@
-<vector android:height="50dp" android:tint="#000000"
+<vector android:height="25dp" android:tint="#000000"
     android:viewportHeight="24" android:viewportWidth="24"
-    android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
 </vector>

app/src/main/res/drawable/ic_more.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="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.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,-2z"/>
+</vector>

app/src/main/res/drawable/ic_saved.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="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>

app/src/main/res/drawable/ic_settings.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="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@color/white" />
+    <item android:state_checked="true" android:color="@color/MainColor" />
     <item android:state_checked="false" android:color="@color/TextColor"/>
 </selector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@color/MainColor" />
+    <item android:state_checked="false" android:color="@color/TextColorDark"/>
+</selector>

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

@@ -3,11 +3,15 @@
     android:shape="rectangle" >
 
     <solid
-        android:color="@color/white" >
+        android:color="@color/ElementsColor" >
     </solid>
 
     <corners
         android:radius="15dp" >
     </corners>
 
+    <stroke
+        android:width="1dp"
+        android:color="@color/StrokeColor" />
+
 </shape>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.LauncherActivity"
-    android:background="@color/AppBackground">
+    style="@style/AppBack">
 
     <RelativeLayout
         android:id="@+id/rlLogo"
@@ -51,14 +51,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:text="@string/textFrom"
-            android:textColor="@color/TextColor"
-            android:textSize="14sp" />
+            style="@style/TextMain"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/CompanyName"
-            android:textColor="@color/TextColor"
+            style="@style/TextMain"
             android:textSize="32sp"/>
 
     </LinearLayout>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.LoginActivity"
-    android:background="@color/AppBackground">
+    style="@style/AppBack">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Sing In"
-            android:textColor="@color/TextColor"
+            style="@style/TextMain"
             android:textSize="32sp"
             android:textStyle="bold" />
 
@@ -32,8 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="На 'email' отправлено письмо с кодом подтверждения"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
+            style="@style/TextMain"
             android:layout_marginTop="15dp" />
 
         <TextView
@@ -42,10 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             android:text="Изменить e-mail"
-            android:textColor="@color/TextColor"
-            android:textColorHint="#005C1F"
-            android:textColorLink="#005C1F"
-            android:textSize="16sp"
+            style="@style/TextMain"
             android:textStyle="bold" />
 
         <LinearLayout
@@ -62,9 +58,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -76,9 +70,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -90,9 +82,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -104,9 +94,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -120,8 +108,7 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center"
             android:text="Отправить код повторно можно через 60 сек"
-            android:textColor="@color/TextColor"
-            android:textSize="17sp" />
+            style="@style/TextMain" />
 
         <TextView
             android:layout_width="match_parent"
@@ -131,8 +118,7 @@
             android:gravity="center"
             android:text="Отправить код повторно"
             android:textStyle="bold"
-            android:textColor="@color/TextColor"
-            android:textSize="17sp" />
+            style="@style/TextMain" />
 
         <Button
             android:id="@+id/btnNext"
@@ -145,7 +131,7 @@
             android:text="Sing In"
             android:textAllCaps="false"
             android:textColor="#FFFFFF"
-            android:textSize="14sp" />
+            android:textSize="16sp" />
 
     </LinearLayout>
 

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.MainActivity"
-    android:background="@color/AppBackground">
+    style="@style/AppBack">
 
     <FrameLayout
         android:id="@+id/frameWindow"
@@ -28,7 +28,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/bottom_nav_menu"
-        app:itemTextColor="@drawable/menu_item_style"
-        app:itemIconTint="@drawable/menu_item_style"/>
+        style="@style/BottomNavigationView"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.RegisterActivity"
-    android:background="@color/AppBackground">
+    style="@style/AppBack">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Sing Up"
-            android:textColor="@color/TextColor"
+            style="@style/TextMain"
             android:textSize="32sp"
             android:textStyle="bold" />
 
@@ -32,8 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="На 'email' отправлено письмо с кодом подтверждения"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
+            style="@style/TextMain"
             android:layout_marginTop="15dp" />
 
         <TextView
@@ -42,10 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             android:text="Изменить e-mail"
-            android:textColor="@color/TextColor"
-            android:textColorHint="#005C1F"
-            android:textColorLink="#005C1F"
-            android:textSize="16sp"
+            style="@style/TextMain"
             android:textStyle="bold" />
 
         <LinearLayout
@@ -62,9 +58,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -76,9 +70,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -90,9 +82,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -104,9 +94,7 @@
                 android:layout_height="wrap_content"
                 android:text=""
                 android:maxLength="1"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/TextColor"
-                android:backgroundTint="@color/TextColor"
+                style="@style/InputCode"
                 android:textSize="44sp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
@@ -120,8 +108,7 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center"
             android:text="Отправить код повторно можно через 60 сек"
-            android:textColor="@color/TextColor"
-            android:textSize="17sp" />
+            style="@style/TextMain"  />
 
         <TextView
             android:layout_width="match_parent"
@@ -131,8 +118,7 @@
             android:gravity="center"
             android:text="Отправить код повторно"
             android:textStyle="bold"
-            android:textColor="@color/TextColor"
-            android:textSize="17sp" />
+            style="@style/TextMain"  />
 
         <Button
             android:id="@+id/btnNext"
@@ -141,11 +127,11 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="30dp"
             android:background="@drawable/btn_with_big_corner"
-            android:backgroundTint="#489FF8"
+            android:backgroundTint="@color/MainColor"
             android:text="Sing Up"
             android:textAllCaps="false"
             android:textColor="#FFFFFF"
-            android:textSize="14sp" />
+            android:textSize="16sp" />
 
     </LinearLayout>
 

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.SingInSingUpActivity"
-    android:background="@color/AppBackground">
+    style="@style/AppBack">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Sing in / Sign up"
-            android:textColor="@color/TextColor"
+            style="@style/TextMain"
             android:textSize="32sp"
             android:textStyle="bold" />
 
@@ -33,13 +33,12 @@
             android:layout_height="55dp"
             android:layout_marginTop="20dp"
             android:autofillHints="emailAddress"
-            android:background="@drawable/black_border"
             android:hint="@string/etLogin"
+            android:textSize="16sp"
             android:inputType="textEmailAddress"
             android:paddingStart="25dp"
             android:paddingEnd="25dp"
-            android:textColor="@color/TextColor"
-            android:textColorHint="@color/SubTextColor" />
+            style="@style/Input"/>
 
         <Button
             android:id="@+id/btnNext"
@@ -52,7 +51,7 @@
             android:text="@string/textNext"
             android:textAllCaps="false"
             android:textColor="#FFFFFF"
-            android:textSize="14sp" />
+            android:textSize="16sp" />
 
     </LinearLayout>
 

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/black_border"
+    style="@style/DialogBack"
     android:padding="10dp">
 
     <LinearLayout
@@ -20,29 +20,23 @@
             android:tag="0,male"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:buttonTint="@color/switch_color"
             android:text="Male"
             android:checked="true"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp" />
+            style="@style/RadioButton" />
 
         <RadioButton
             android:tag="1,female"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:buttonTint="@color/switch_color"
             android:text="Female"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp" />
+            style="@style/RadioButton"  />
 
         <RadioButton
             android:tag="2,both"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:buttonTint="@color/switch_color"
             android:text="Both"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp" />
+            style="@style/RadioButton"  />
 
     </LinearLayout>
 
@@ -63,7 +57,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Cancel"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_apply"
@@ -73,7 +67,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Apply"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
     </LinearLayout>
 

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/black_border"
+    style="@style/DialogBack"
     android:padding="10dp">
 
     <RadioGroup
@@ -28,32 +28,22 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <ImageView
-                            android:id="@+id/imageView3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@drawable/ic_sport_icon"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:tint="@color/TextColor" />
-
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
+                            android:drawablePadding="10dp"
                             android:text="Basketball"
-                            android:textColor="@color/TextColor"
-                            android:textSize="16dp"
+                            style="@style/TextMainWithImg"
                             app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/imageView3"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:drawableStartCompat="@drawable/ic_sport_icon" />
 
                         <RadioButton
                             android:tag="0,Basketball"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:buttonTint="@color/switch_color"
+                            style="@style/RadioButton"
                             android:text=""
                             android:checked="true"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -66,32 +56,22 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <ImageView
-                            android:id="@+id/imageView4"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@drawable/ic_sport_icon"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:tint="@color/TextColor" />
-
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
+                            android:drawablePadding="10dp"
                             android:text="Soccer"
-                            android:textColor="@color/TextColor"
-                            android:textSize="16dp"
+                            style="@style/TextMainWithImg"
                             app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/imageView4"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:drawableStartCompat="@drawable/ic_sport_icon" />
 
                         <RadioButton
                             android:tag="1,Soccer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:buttonTint="@color/switch_color"
+                            style="@style/RadioButton"
                             android:text=""
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -114,7 +94,7 @@
                     android:background="@drawable/btn_with_big_corner"
                     android:backgroundTint="@color/MainColor"
                     android:text="Cancel"
-                    android:textColor="@color/TextColor"
+                    android:textColor="@color/white"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -126,7 +106,7 @@
                     android:background="@drawable/btn_with_big_corner"
                     android:backgroundTint="@color/MainColor"
                     android:text="Apply"
-                    android:textColor="@color/TextColor"
+                    android:textColor="@color/white"
                     android:layout_marginStart="50dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"

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

@@ -4,16 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/black_border"
+    style="@style/DialogBack"
     android:padding="10dp">
 
     <CalendarView
         android:id="@+id/calendar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:dateTextAppearance="@style/CalenderViewDateCustomText"
-        android:theme="@style/CalenderViewCustom"
-        android:weekDayTextAppearance="@style/CalenderViewWeekCustomText"
+        style="@style/Calendar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -35,7 +33,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Cancel"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_apply"
@@ -45,7 +43,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Apply"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
     </LinearLayout>
 

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

@@ -4,16 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/black_border"
+    style="@style/DialogBack"
     android:padding="10dp">
 
     <CalendarView
         android:id="@+id/calendar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:dateTextAppearance="@style/CalenderViewDateCustomText"
-        android:theme="@style/CalenderViewCustom"
-        android:weekDayTextAppearance="@style/CalenderViewWeekCustomText"
+        style="@style/Calendar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -24,8 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="End time"
-        android:textColor="@color/TextColor"
-        android:textSize="16sp"
+        style="@style/TextMain"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/calendar" />
@@ -34,7 +31,7 @@
         android:id="@+id/timePickerEnd"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:theme="@style/timePickerOrange"
+        style="@style/TimePicker"
         android:timePickerMode="spinner"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -56,7 +53,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Cancel"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_apply"
@@ -66,7 +63,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Apply"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
     </LinearLayout>
 

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

@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/black_border"
+    style="@style/DialogBack"
     android:padding="10dp">
 
     <LinearLayout
@@ -21,8 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="From"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain" />
 
         <TextView
             android:id="@+id/tv_number_from"
@@ -30,16 +29,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:text="Number"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:text="to"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain" />
 
         <TextView
             android:id="@+id/tv_number_to"
@@ -47,14 +44,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:text="Number"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain" />
 
     </LinearLayout>
 
     <com.google.android.material.slider.RangeSlider
+        app:labelBehavior="gone"
         android:id="@+id/rangeSlider"
-        style="@style/SliderStyle"
+        style="@style/Slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:stepSize="1"
@@ -82,7 +79,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Cancel"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_apply"
@@ -92,7 +89,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Apply"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
     </LinearLayout>
 

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/black_border"
+    style="@style/DialogBack"
     android:padding="10dp">
 
     <LinearLayout
@@ -22,8 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="From"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain" />
 
         <TextView
             android:id="@+id/tv_number_from"
@@ -31,16 +30,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:text="Number"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:text="to"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain" />
 
         <TextView
             android:id="@+id/tv_number_to"
@@ -48,14 +45,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:text="Number"
-            android:textColor="@color/TextColor"
-            android:textSize="16dp" />
+            style="@style/TextMain"/>
 
     </LinearLayout>
 
     <com.google.android.material.slider.RangeSlider
+        app:labelBehavior="gone"
         android:id="@+id/rangeSlider"
-        style="@style/SliderStyle"
+        style="@style/Slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:stepSize="0.01"
@@ -83,7 +80,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Cancel"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_apply"
@@ -93,7 +90,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Apply"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
     </LinearLayout>
 

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/black_border">
+    style="@style/DialogBack">
 
     <org.osmdroid.views.MapView
         android:id="@+id/dialog_map"
@@ -86,7 +86,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Cancel"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_apply"
@@ -96,7 +96,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Apply"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
     </LinearLayout>
 

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/black_border"
+    style="@style/DialogBack"
     android:padding="10dp">
 
     <TextView
@@ -12,8 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Start time"
-        android:textColor="@color/TextColor"
-        android:textSize="16sp"
+        style="@style/TextMain"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -22,7 +21,7 @@
         android:id="@+id/timePickerStart"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:theme="@style/timePickerOrange"
+        style="@style/TimePicker"
         android:timePickerMode="spinner"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,8 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="End time"
-        android:textColor="@color/TextColor"
-        android:textSize="16sp"
+        style="@style/TextMain"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/timePickerStart" />
@@ -43,7 +41,7 @@
         android:id="@+id/timePickerEnd"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:theme="@style/timePickerOrange"
+        style="@style/TimePicker"
         android:timePickerMode="spinner"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -65,7 +63,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Cancel"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_apply"
@@ -75,7 +73,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Apply"
-            android:textColor="@color/TextColor" />
+            android:textColor="@color/white" />
 
     </LinearLayout>
 

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

@@ -4,14 +4,13 @@
     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">
+    tools:context=".view.fragments.AboutEventFragment"
+    style="@style/AppBack">
 
     <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"
@@ -19,30 +18,28 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageButton
-            android:id="@+id/imageButton"
+            android:id="@+id/btnBack"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="#00000000"
             android:src="@drawable/ic_back"
+            android:padding="5dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/TextColor" />
+            style="@style/Img"/>
 
         <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"
+            style="@style/TextMainWithImg"
+            android:layout_marginStart="15dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/imageButton"
+            app:layout_constraintStart_toEndOf="@+id/btnBack"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
@@ -51,7 +48,7 @@
             android:src="@drawable/ic_lock"
             app:layout_constraintStart_toEndOf="@+id/textView12"
             android:layout_marginStart="5dp"
-            app:tint="@color/TextColor" />
+            style="@style/Img"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -69,7 +66,7 @@
                 android:background="#00000000"
                 android:padding="7dp"
                 android:src="@drawable/ic_chat_24"
-                app:tint="@color/TextColor"
+                style="@style/Img"
                 android:layout_marginEnd="5dp"/>
 
             <ImageButton
@@ -79,7 +76,7 @@
                 android:background="#00000000"
                 android:padding="7dp"
                 android:src="@drawable/ic_options"
-                app:tint="@color/TextColor" />
+                style="@style/Img"/>
 
         </LinearLayout>
 
@@ -111,11 +108,11 @@
                     android:layout_height="25dp"
                     android:text="Sometext"
                     android:textSize="14sp"
-                    android:textColor="@color/TextColor"
+                    android:textColor="@color/white"
                     android:background="@drawable/btn_style"
                     android:backgroundTint="@color/MainColor"
                     android:drawableStart="@drawable/ic_attending"
-                    android:drawableTint="@color/TextColor"
+                    android:drawableTint="@color/white"
                     android:drawablePadding="5dp"
                     android:textAllCaps="false"
                     android:paddingEnd="10dp"
@@ -151,7 +148,7 @@
                         android:layout_height="wrap_content"
                         android:text="Level"
                         android:textAlignment="center"
-                        android:textColor="@color/SubTextColor"
+                        style="@style/SubTextMain"
                         android:textSize="14sp" />
 
                     <TextView
@@ -160,7 +157,7 @@
                         android:layout_marginTop="10dp"
                         android:text="0.31 - 3.31"
                         android:textAlignment="center"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="18sp" />
 
                 </LinearLayout>
@@ -170,8 +167,8 @@
                     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_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
                     <TextView
@@ -179,8 +176,7 @@
                         android:layout_height="wrap_content"
                         android:text="Age"
                         android:textAlignment="center"
-                        android:textColor="@color/SubTextColor"
-                        android:textSize="14sp" />
+                        style="@style/SubTextMain" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -188,7 +184,7 @@
                         android:layout_marginTop="10dp"
                         android:text="25 - 40"
                         android:textAlignment="center"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="18sp" />
 
                 </LinearLayout>
@@ -198,6 +194,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
+                    android:layout_marginEnd="10dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
@@ -207,8 +204,7 @@
                         android:layout_height="wrap_content"
                         android:text="Gender"
                         android:textAlignment="center"
-                        android:textColor="@color/SubTextColor"
-                        android:textSize="14sp" />
+                        style="@style/SubTextMain" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -216,7 +212,7 @@
                         android:layout_marginTop="10dp"
                         android:text="All"
                         android:textAlignment="center"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="18sp" />
 
                 </LinearLayout>
@@ -245,7 +241,7 @@
                         android:layout_height="match_parent"
                         android:src="@drawable/ic_duration"
                         android:layout_marginEnd="10dp"
-                        app:tint="@color/TextColor" />
+                        style="@style/Img"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -257,7 +253,7 @@
                             android:layout_height="wrap_content"
                             android:text="Duration"
                             android:textAlignment="center"
-                            android:textColor="@color/SubTextColor"
+                            style="@style/SubTextMain"
                             android:textSize="14sp" />
 
                         <TextView
@@ -266,8 +262,7 @@
                             android:layout_marginTop="5dp"
                             android:text="45 minutes"
                             android:textAlignment="center"
-                            android:textColor="@color/TextColor"
-                            android:textSize="16sp" />
+                            style="@style/TextMain" />
 
                     </LinearLayout>
 
@@ -284,7 +279,7 @@
                         android:layout_height="match_parent"
                         android:src="@drawable/ic_people"
                         android:layout_marginEnd="10dp"
-                        app:tint="@color/TextColor" />
+                        style="@style/Img" />
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -296,7 +291,7 @@
                             android:layout_height="wrap_content"
                             android:text="Member limit"
                             android:textAlignment="center"
-                            android:textColor="@color/SubTextColor"
+                            style="@style/SubTextMain"
                             android:textSize="14sp" />
 
                         <TextView
@@ -305,8 +300,7 @@
                             android:layout_marginTop="5dp"
                             android:text="2- 10"
                             android:textAlignment="center"
-                            android:textColor="@color/TextColor"
-                            android:textSize="16sp" />
+                            style="@style/TextMain" />
 
                     </LinearLayout>
 
@@ -319,7 +313,7 @@
 
                     <LinearLayout
                         android:id="@+id/linearLayout8"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -332,45 +326,45 @@
                             android:layout_gravity="center"
                             android:layout_marginEnd="10dp"
                             android:src="@drawable/ic_location"
-                            app:tint="@color/TextColor" />
+                            style="@style/Img"/>
 
                         <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="Member limit"
+                                android:text="3km away"
                                 android:textAlignment="center"
-                                android:textColor="@color/SubTextColor"
+                                style="@style/SubTextMain"
                                 android:textSize="14sp" />
 
                             <TextView
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="5dp"
-                                android:text="2- 10"
-                                android:textAlignment="center"
-                                android:textColor="@color/TextColor"
-                                android:textSize="16sp" />
+                                android:maxLines="2"
+                                android:text="Yaroslavskaya Ulitsa, 12, стр.2, Moscow, 129366"
+                                android:layout_marginEnd="60dp"
+                                style="@style/TextMain"/>
 
                         </LinearLayout>
 
                     </LinearLayout>
 
                     <ImageButton
+                        android:id="@+id/imageButton2"
                         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" />
+                        style="@style/ImgButton"/>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -383,31 +377,30 @@
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_duration"
+                        android:src="@drawable/ic_calendar"
                         android:layout_marginEnd="10dp"
-                        app:tint="@color/TextColor" />
+                        style="@style/Img"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:orientation="vertical">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Duration"
+                            android:text="End registration"
                             android:textAlignment="center"
-                            android:textColor="@color/SubTextColor"
+                            style="@style/SubTextMain"
                             android:textSize="14sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="5dp"
-                            android:text="45 minutes"
+                            android:text="Nov 23,  0:00"
                             android:textAlignment="center"
-                            android:textColor="@color/TextColor"
-                            android:textSize="16sp" />
+                            style="@style/TextMain" />
 
                     </LinearLayout>
 
@@ -436,7 +429,7 @@
                         android:layout_width="25dp"
                         android:layout_height="25dp"
                         android:src="@drawable/ic_camera"
-                        app:tint="@color/TextColor" />
+                        style="@style/Img"/>
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -444,8 +437,7 @@
                         android:layout_gravity="center"
                         android:layout_marginStart="10dp"
                         android:text="Gallery"
-                        android:textColor="@color/SubTextColor"
-                        android:textSize="16sp" />
+                        style="@style/SubTextMain" />
 
                 </LinearLayout>
 
@@ -483,8 +475,7 @@
                     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"
+                    style="@style/TextMain"
                     android:layout_marginTop="15dp"/>
 
             </LinearLayout>
@@ -520,7 +511,7 @@
                             android:layout_width="50dp"
                             android:layout_height="50dp"
                             android:src="@drawable/ic_person"
-                            android:tint="@color/TextColor"
+                            style="@style/Img"
                             app:shapeAppearance="@style/roundedImageViewRounded50" />
 
                         <LinearLayout
@@ -533,8 +524,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="Vlad Shipilov"
                                 android:textAlignment="center"
-                                android:textColor="@color/TextColor"
-                                android:textSize="16sp" />
+                                style="@style/TextMain" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -581,7 +571,7 @@
                             android:layout_width="50dp"
                             android:layout_height="50dp"
                             android:src="@drawable/ic_person"
-                            android:tint="@color/TextColor"
+                            style="@style/Img"
                             app:shapeAppearance="@style/roundedImageViewRounded50" />
 
                         <LinearLayout
@@ -594,8 +584,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="Vlad Shipilov"
                                 android:textAlignment="center"
-                                android:textColor="@color/TextColor"
-                                android:textSize="16sp" />
+                                style="@style/TextMain" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -603,8 +592,7 @@
                                 android:layout_marginTop="5dp"
                                 android:text="last seet at 15:45"
                                 android:textAlignment="center"
-                                android:textColor="@color/SubTextColor"
-                                android:textSize="16sp" />
+                                style="@style/SubTextMain" />
 
                         </LinearLayout>
 
@@ -630,5 +618,4 @@
 
     </ScrollView>
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,17 +5,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.fragments.CalendarFragment"
-    android:background="@color/AppBackground"
+    style="@style/AppBack"
     android:padding="15dp">
 
     <CalendarView
-        android:id="@+id/test"
+        android:id="@+id/test1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/black_border"
-        android:dateTextAppearance="@style/CalenderViewDateCustomText"
-        android:theme="@style/CalenderViewCustom"
-        android:weekDayTextAppearance="@style/CalenderViewWeekCustomText"
+        style="@style/Calendar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -24,18 +21,18 @@
         android:id="@+id/linearLayout4"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:background="@drawable/black_border"
+        style="@style/Block"
         android:orientation="vertical"
         android:padding="15dp"
-        app:layout_constraintTop_toBottomOf="@+id/test">
+        android:layout_marginTop="15dp"
+        app:layout_constraintTop_toBottomOf="@+id/test1"
+        tools:layout_editor_absoluteX="15dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="DayHeader"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
+            style="@style/TextMain"
             android:textStyle="bold" />
 
         <LinearLayout
@@ -48,7 +45,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sport_icon"
-                app:tint="@color/TextColor" />
+                style="@style/Img"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -66,17 +63,16 @@
                         android:layout_height="match_parent"
                         android:drawablePadding="5dp"
                         android:text="11:00"
-                        android:textColor="@color/TextColor"
                         android:textSize="14sp"
                         app:drawableRightCompat="@drawable/ic_right_arrow"
-                        app:drawableTint="@color/TextColor" />
+                        style="@style/TextMainWithImg"/>
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginStart="5dp"
                         android:text=" 12:30"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                 </LinearLayout>
@@ -91,7 +87,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="Jogging -"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                     <TextView
@@ -99,7 +95,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="2km away -"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                     <TextView
@@ -107,7 +103,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="4 members"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                 </LinearLayout>
@@ -126,7 +122,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sport_icon"
-                app:tint="@color/TextColor" />
+                style="@style/Img" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -144,17 +140,16 @@
                         android:layout_height="match_parent"
                         android:drawablePadding="5dp"
                         android:text="11:00"
-                        android:textColor="@color/TextColor"
                         android:textSize="14sp"
                         app:drawableRightCompat="@drawable/ic_right_arrow"
-                        app:drawableTint="@color/TextColor" />
+                        style="@style/TextMainWithImg"/>
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginStart="5dp"
                         android:text=" 12:30"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                 </LinearLayout>
@@ -169,7 +164,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="Jogging -"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                     <TextView
@@ -177,7 +172,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="2km away -"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                     <TextView
@@ -185,7 +180,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="4 members"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="14sp" />
 
                 </LinearLayout>
@@ -199,7 +194,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/black_border"
+        style="@style/Block"
         android:orientation="vertical"
         android:padding="15dp"
         android:layout_marginTop="15dp"
@@ -209,8 +204,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Completed"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
+            style="@style/SubTextMain"
             android:textStyle="bold" />
 
         <LinearLayout
@@ -223,7 +217,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sport_icon"
-                app:tint="@color/SubTextColor" />
+                style="@style/SubImg" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -241,17 +235,16 @@
                         android:layout_height="match_parent"
                         android:drawablePadding="5dp"
                         android:text="11:00"
-                        android:textColor="@color/SubTextColor"
                         android:textSize="14sp"
                         app:drawableRightCompat="@drawable/ic_right_arrow"
-                        app:drawableTint="@color/SubTextColor" />
+                        style="@style/SubTextMainWithImg"/>
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginStart="5dp"
                         android:text=" 12:30"
-                        android:textColor="@color/SubTextColor"
+                        style="@style/SubTextMain"
                         android:textSize="14sp" />
 
                 </LinearLayout>
@@ -266,7 +259,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="Jogging -"
-                        android:textColor="@color/SubTextColor"
+                        style="@style/SubTextMain"
                         android:textSize="14sp" />
 
                     <TextView
@@ -274,7 +267,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="2km away -"
-                        android:textColor="@color/SubTextColor"
+                        style="@style/SubTextMain"
                         android:textSize="14sp" />
 
                     <TextView
@@ -282,7 +275,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="5dp"
                         android:text="4 members"
-                        android:textColor="@color/SubTextColor"
+                        style="@style/SubTextMain"
                         android:textSize="14sp" />
 
                 </LinearLayout>

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

@@ -0,0 +1,80 @@
+<?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.ChatFragment">
+
+    <ScrollView
+        android:id="@+id/chatScroll"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:id="@+id/messageContainer"
+            android:orientation="vertical"
+            android:padding="10sp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.github.rahatarmanahmed.cpv.CircularProgressView
+                android:id="@+id/cpv_loader"
+                android:layout_width="40sp"
+                android:layout_height="40sp"
+                android:layout_marginTop="16dp"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                app:cpv_color="@color/MainColor"
+                app:cpv_animAutostart="true"
+                app:cpv_indeterminate="true"
+                />
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <EditText
+            android:id="@+id/messageEditText"
+            android:layout_width="wrap_content"
+            style="@style/Input"
+            android:padding="10dp"
+            android:layout_marginStart="15sp"
+            android:layout_marginEnd="15sp"
+            android:hint="Send message..."
+            android:inputType="textMultiLine"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.1" />
+
+        <androidx.cardview.widget.CardView
+            app:cardCornerRadius="100dp"
+            android:layout_width="wrap_content"
+            android:elevation="100dp"
+            android:layout_marginEnd="15sp"
+            android:layout_marginBottom="15sp"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/sendBtn"
+                android:src="@drawable/ic_sport_icon"
+                android:padding="5sp"
+                android:paddingStart="10sp"
+                android:background="@color/MainColor"
+                android:layout_width="40sp"
+                android:layout_height="40sp"
+                app:tint="@color/white" />
+        </androidx.cardview.widget.CardView>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,50 +4,179 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragments.ChatsFragment"
-    android:background="@color/AppBackground">
+    tools:context=".view.fragments.ChatsFragment">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:background="@color/ElementsColor"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/sort_icon"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/textView17"
+            style="@style/TextMain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginStart="10dp"
-            android:layout_marginBottom="5dp"
-            android:src="@drawable/ic_map_filters"
-            app:tint="@color/TextColor" />
-
-        <Spinner
-            android:id="@+id/sort_spinner"
-            android:layout_width="wrap_content"
-            android:layout_height="40dp"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:layout_toEndOf="@+id/sort_icon"
-            android:background="@drawable/spinner_style"
-            android:spinnerMode="dropdown" />
-
-        <ImageButton
-            android:id="@+id/search_button"
-            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="Chats"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="15dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginEnd="10dp"
-            android:background="#00000000"
-            android:src="@drawable/ic_search"
-            app:tint="@color/TextColor" />
-
-    </RelativeLayout>
+            android:orientation="vertical"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView17">
+
+            <LinearLayout
+                android:id="@+id/supportChat"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    style="@style/Img"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:src="@drawable/ic_sport_icon" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="10sp"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/TextMain"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.1"
+                            android:text="sdsdgsdg" />
+
+                        <TextView
+                            style="@style/TextMain"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="20.05.2023" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/supportLastMsg"
+                        style="@style/TextMain"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="last message" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/serviceBot"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15sp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    style="@style/Img"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:src="@drawable/ic_sport_icon" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="10sp"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/TextMain"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.1"
+                            android:text="wegweg" />
+
+                        <TextView
+                            style="@style/TextMain"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="20.05.2023" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/serviceBotLastMsg"
+                        style="@style/TextMain"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="last message" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/providerChat"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15sp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    style="@style/Img"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:src="@drawable/ic_sport_icon" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="10sp"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            style="@style/TextMain"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.1"
+                            android:text="xnjn" />
+
+                        <TextView
+                            style="@style/TextMain"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="20.05.2023" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/providerLastMsg"
+                        style="@style/TextMain"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="last message" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.fragments.CreateEventFragment"
-    android:background="@color/AppBackground"
+    style="@style/AppBack"
     android:padding="15dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -21,8 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="Create event"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
+            style="@style/TextMain"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -35,7 +34,7 @@
             android:background="@drawable/btn_with_big_corner"
             android:backgroundTint="@color/MainColor"
             android:text="Save"
-            android:textColor="@color/TextColor"
+            android:textColor="@color/white"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +65,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:background="@drawable/black_border">
+                    style="@style/Block">
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -95,8 +94,7 @@
                                 android:layout_marginStart="10dp"
                                 android:gravity="center_vertical"
                                 android:text="Place"
-                                android:textColor="@color/TextColor"
-                                android:textSize="16sp" />
+                                style="@style/TextMain" />
 
                         </RelativeLayout>
 
@@ -107,9 +105,8 @@
                             android:drawablePadding="10dp"
                             android:padding="10dp"
                             android:text=""
-                            android:textColor="@color/MainColor"
                             app:drawableRightCompat="@drawable/ic_forward"
-                            app:drawableTint="@color/TextColor"
+                            style="@style/BlueTextMainWithImg"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toEndOf="@+id/relativeLayout2"
@@ -124,7 +121,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -135,8 +132,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Sport"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -146,11 +142,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=""
-                        android:textColor="@color/MainColor"
                         android:textSize="16sp"
                         android:drawablePadding="10dp"
                         app:drawableRightCompat="@drawable/ic_forward"
-                        app:drawableTint="@color/TextColor"
+                        style="@style/BlueTextMainWithImg"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -163,7 +158,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -174,8 +169,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Member limits"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -185,11 +179,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=""
-                        android:textColor="@color/MainColor"
-                        android:textSize="16sp"
+                        style="@style/BlueTextMainWithImg"
                         android:drawablePadding="10dp"
                         app:drawableRightCompat="@drawable/ic_forward"
-                        app:drawableTint="@color/TextColor"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -201,7 +193,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -211,8 +203,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Day"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -223,10 +214,8 @@
                         android:layout_height="wrap_content"
                         android:drawablePadding="10dp"
                         android:text=""
-                        android:textColor="@color/MainColor"
-                        android:textSize="16sp"
                         app:drawableRightCompat="@drawable/ic_forward"
-                        app:drawableTint="@color/TextColor"
+                        style="@style/BlueTextMainWithImg"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -238,7 +227,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -249,8 +238,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Time"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -261,10 +249,8 @@
                         android:layout_height="wrap_content"
                         android:drawablePadding="10dp"
                         android:text=""
-                        android:textColor="@color/MainColor"
-                        android:textSize="16sp"
                         app:drawableRightCompat="@drawable/ic_forward"
-                        app:drawableTint="@color/TextColor"
+                        style="@style/BlueTextMainWithImg"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -276,7 +262,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -286,15 +272,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Public"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/publicBlockSwitcher"
-                        style="@style/SwitchCompatStyle"
+                        style="@style/Switch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -316,7 +301,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -326,8 +311,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="End registration"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -337,11 +321,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=""
-                        android:textColor="@color/MainColor"
-                        android:textSize="16sp"
+                        style="@style/BlueTextMainWithImg"
                         android:drawablePadding="10dp"
                         app:drawableRightCompat="@drawable/ic_forward"
-                        app:drawableTint="@color/TextColor"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"/>
@@ -353,7 +335,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -363,8 +345,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Level"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -374,11 +355,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=""
-                        android:textColor="@color/MainColor"
-                        android:textSize="16sp"
                         android:drawablePadding="10dp"
                         app:drawableRightCompat="@drawable/ic_forward"
-                        app:drawableTint="@color/TextColor"
+                        style="@style/BlueTextMainWithImg"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"/>
@@ -390,7 +369,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="5dp"
-                    android:background="@drawable/black_border"
+                    style="@style/Block"
                     android:paddingStart="15dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="15dp"
@@ -400,8 +379,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Gender"
-                        android:textColor="@color/TextColor"
-                        android:textSize="16sp"
+                        style="@style/TextMain"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -411,11 +389,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=""
-                        android:textColor="@color/MainColor"
-                        android:textSize="16sp"
                         android:drawablePadding="10dp"
                         app:drawableRightCompat="@drawable/ic_forward"
-                        app:drawableTint="@color/TextColor"
+                        style="@style/BlueTextMainWithImg"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"/>
@@ -439,7 +415,7 @@
                         android:layout_width="25dp"
                         android:layout_height="25dp"
                         android:src="@drawable/ic_camera"
-                        app:tint="@color/TextColor" />
+                        style="@style/Img" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -447,8 +423,7 @@
                         android:layout_gravity="center"
                         android:layout_marginStart="10dp"
                         android:text="Add picture"
-                        android:textColor="@color/SubTextColor"
-                        android:textSize="16sp" />
+                        style="@style/SubTextMain" />
 
                 </LinearLayout>
 
@@ -466,17 +441,16 @@
                         android:backgroundTint="@color/MainColor"
                         android:padding="5dp"
                         android:src="@drawable/ic_galary"
-                        app:tint="@color/TextColor" />
+                        app:tint="@color/TextColorDark" />
 
                     <ImageButton
                         android:id="@+id/btn_get_image_from_camera"
                         android:layout_width="wrap_content"
                         android:layout_height="100dp"
                         android:layout_marginStart="10dp"
-                        android:background="@drawable/black_border"
+                        style="@style/ImgButton"
                         android:padding="5dp"
-                        android:src="@drawable/ic_camera"
-                        app:tint="@color/TextColor" />
+                        android:src="@drawable/ic_camera" />
 
                     <HorizontalScrollView
                         android:layout_width="match_parent"
@@ -503,7 +477,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:background="@drawable/black_border"
                 android:hint="Notes"
                 android:inputType="textMultiLine"
                 android:minLines="1"
@@ -511,8 +484,7 @@
                 android:paddingTop="15dp"
                 android:paddingBottom="20dp"
                 android:paddingEnd="25dp"
-                android:textColor="@color/TextColor"
-                android:textColorHint="@color/SubTextColor"
+                style="@style/Input"
                 android:layout_marginBottom="10dp"/>
 
         </LinearLayout>

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

@@ -1,14 +1,320 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragments.EventFiltersFragment">
+    tools:context=".view.fragments.EventFiltersFragment"
+    android:padding="15dp"
+    style="@style/AppBack">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_editor_absoluteX="15dp">
 
-</FrameLayout>
+        <ImageButton
+            android:id="@+id/btnBack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:padding="5dp"
+            android:src="@drawable/ic_back"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/Img"/>
+
+        <TextView
+            android:id="@+id/textView13"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="Filters"
+            style="@style/TextMain"
+            android:layout_marginStart="15dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnBack"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="Clear"
+            style="@style/SubTextMain"
+            android:layout_marginEnd="15dp"
+            android:padding="7dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/btnSave"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/btnSave"
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:background="@drawable/btn_with_big_corner"
+            android:backgroundTint="@color/MainColor"
+            android:text="Apply"
+            android:textAllCaps="false"
+            android:textSize="16sp"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="15dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <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="vertical">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/durationBlock"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    style="@style/Block"
+                    android:paddingStart="15dp"
+                    android:paddingTop="20dp"
+                    android:paddingEnd="15dp"
+                    android:paddingBottom="20dp">
+
+                    <TextView
+                        android:id="@+id/textView7"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Duration"
+                        style="@style/TextMain"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/durationBlockText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=""
+                        style="@style/BlueTextMainWithImg"
+                        android:drawablePadding="10dp"
+                        app:drawableRightCompat="@drawable/ic_forward"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/ageBlock"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    style="@style/Block"
+                    android:paddingStart="15dp"
+                    android:paddingTop="20dp"
+                    android:paddingEnd="15dp"
+                    android:paddingBottom="20dp">
+
+                    <TextView
+                        android:id="@+id/textView10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Age"
+                        style="@style/TextMain"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/ageBlockText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=""
+                        android:drawablePadding="10dp"
+                        app:drawableRightCompat="@drawable/ic_forward"
+                        style="@style/BlueTextMainWithImg"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/genderBlock"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    style="@style/Block"
+                    android:paddingStart="15dp"
+                    android:paddingTop="20dp"
+                    android:paddingEnd="15dp"
+                    android:paddingBottom="20dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Gender"
+                        style="@style/TextMain"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/genderBlockText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawablePadding="10dp"
+                        android:text=""
+                        app:drawableRightCompat="@drawable/ic_forward"
+                        style="@style/BlueTextMainWithImg"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/levelBlock"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    style="@style/Block"
+                    android:paddingStart="15dp"
+                    android:paddingTop="20dp"
+                    android:paddingEnd="15dp"
+                    android:paddingBottom="20dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Level"
+                        style="@style/TextMain"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/levelBlockText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawablePadding="10dp"
+                        android:text=""
+                        style="@style/BlueTextMainWithImg"
+                        app:drawableRightCompat="@drawable/ic_forward"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="15dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Choose sports"
+                    style="@style/TextMain"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        style="@style/Block"
+                        android:padding="10dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Basketball"
+                            style="@style/TextMainWithImg"
+                            android:textSize="16sp"
+                            android:gravity="center"
+                            android:drawablePadding="5dp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:drawableStartCompat="@drawable/ic_sport_icon" />
+
+                        <CheckBox
+                            android:tag="0,Basketball"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/RadioButton"
+                            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="10dp"
+                        style="@style/Block"
+                        android:padding="10dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Soccer"
+                            android:textSize="16sp"
+                            style="@style/TextMainWithImg"
+                            android:gravity="center"
+                            android:drawablePadding="5dp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:drawableStartCompat="@drawable/ic_sport_icon" />
+
+                        <CheckBox
+                            android:tag="1,Soccer"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/RadioButton"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,14 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/AppBackground"
+    style="@style/AppBack"
     tools:context=".view.fragments.EventListFragment">
 
     <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"
@@ -23,50 +22,24 @@
             android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:text="Events"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
+            style="@style/TextMain"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
+        <ImageButton
+            android:id="@+id/btnFilters"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:orientation="horizontal"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="#00000000"
+            android:padding="7dp"
+            android:src="@drawable/ic_filter"
             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:background="#00000000"
-                android:layout_gravity="center_vertical"
-                android:padding="7dp"
-                android:src="@drawable/ic_sort"
-                app:tint="@color/TextColor" />
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="#00000000"
-                android:layout_gravity="center_vertical"
-                android:padding="7dp"
-                android:src="@drawable/ic_filter"
-                app:tint="@color/TextColor" />
-
-            <ImageButton
-                android:id="@+id/search"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="#00000000"
-                android:layout_gravity="center_vertical"
-                android:padding="7dp"
-                android:src="@drawable/ic_search"
-                app:tint="@color/TextColor" />
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/Img"/>
 
-        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -90,7 +63,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="200dp"
                 android:orientation="horizontal"
-                android:background="@drawable/black_border">
+                style="@style/Block">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="0dp"
@@ -106,7 +79,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         android:src="@drawable/ic_sport_icon"
-                        app:tint="@color/TextColor" />
+                        style="@style/Img" />
 
                     <TextView
                         android:id="@+id/textView"
@@ -114,7 +87,7 @@
                         android:layout_height="wrap_content"
                         android:text="Jogging"
                         android:textSize="12sp"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/imageView2"
@@ -150,16 +123,15 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="Nov 23 | 9:00"
-                            android:textColor="@color/TextColor"
-                            android:textSize="16dp" />
+                            style="@style/TextMain"/>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"
                             android:text="45 min"
-                            android:textColor="@color/SubTextColor"
-                            android:textSize="12dp" />
+                            style="@style/SubTextMain"
+                            android:textSize="12sp" />
 
                     </LinearLayout>
 
@@ -169,7 +141,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
                         android:text="3km away"
-                        android:textColor="@color/SubTextColor"
+                        style="@style/SubTextMain"
                         android:textSize="12dp"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
@@ -179,8 +151,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="Yaroslavskaya Ulitsa, 12, стр.2, Moscow, 129366"
-                        android:textColor="@color/TextColor"
-                        android:textSize="12dp"
+                        style="@style/TextMain"
+                        android:textSize="12sp"
                         android:layout_marginTop="5dp"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/textView4" />
@@ -197,7 +169,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:src="@drawable/ic_people"
-                            android:tint="@color/TextColor"/>
+                            style="@style/Img" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -206,7 +178,7 @@
                             android:textSize="14sp"
                             android:gravity="center"
                             android:layout_marginStart="5dp"
-                            android:textColor="@color/TextColor"
+                            style="@style/TextMain"
                             app:layout_constraintBottom_toTopOf="@+id/textView6"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/textView5" />
@@ -218,7 +190,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="Level 0.52 - 3.52"
-                        android:textColor="@color/TextColor"
+                        style="@style/TextMain"
                         android:textSize="12dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         tools:layout_editor_absoluteX="15dp" />
@@ -239,7 +211,7 @@
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:background="@drawable/black_border"
+        style="@style/Block"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
         android:paddingStart="20dp"
@@ -251,14 +223,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_map"
-            app:tint="@color/TextColor" />
+            style="@style/Img" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="View event map"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
+            style="@style/TextMain"
             android:layout_marginStart="15dp"/>
 
     </LinearLayout>

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

@@ -16,14 +16,14 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
+        android:id="@+id/btnFilters"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/black_border"
         android:padding="5dp"
         android:src="@drawable/ic_map_filters"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/TextColor"
+        style="@style/ImgButton"
         android:layout_marginStart="15dp"
         android:layout_marginTop="15dp"/>
 
@@ -41,11 +41,9 @@
             android:id="@+id/btnMyLocation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/black_border"
             android:padding="7.5dp"
             android:src="@drawable/ic_my_location"
-            app:tint="@color/TextColor" />
-
+            style="@style/ImgButton"/>
 
     </LinearLayout>
 
@@ -63,20 +61,18 @@
             android:id="@+id/btn_zoomIn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/black_border"
             android:padding="5dp"
             android:src="@drawable/ic_zoom_in"
-            app:tint="@color/TextColor" />
+            style="@style/ImgButton"/>
 
         <ImageButton
             android:id="@+id/btn_zoomOut"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:background="@drawable/black_border"
             android:padding="5dp"
             android:src="@drawable/ic_zoom_out"
-            app:tint="@color/TextColor" />
+            style="@style/ImgButton"/>
 
     </LinearLayout>
 
@@ -87,7 +83,7 @@
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:background="@drawable/black_border"
+        style="@style/Block"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
         android:paddingStart="20dp"
@@ -95,19 +91,13 @@
         android:layout_marginBottom="40dp"
         android:layout_marginStart="15dp">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_event_list"
-            app:tint="@color/TextColor" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Event list"
-            android:textColor="@color/TextColor"
-            android:textSize="16sp"
-            android:layout_marginStart="15dp"/>
+            style="@style/TextMainWithImg"
+            android:drawableStart="@drawable/ic_event_list"
+            android:drawablePadding="15dp"/>
 
     </LinearLayout>
 

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

@@ -0,0 +1,464 @@
+<?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.MoreFragment"
+    style="@style/AppBack">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/sportBlock"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="20dp"
+        android:paddingEnd="15dp"
+        android:padding="30dp"
+        android:background="@color/MainColor"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/shapeableImageView"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:shapeAppearance="@style/roundedImageViewRounded50" />
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="UserName"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:layout_marginStart="15dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/shapeableImageView"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_forward"
+            style="@style/Img"
+            android:layout_marginEnd="5dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sportBlock">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal"
+            android:padding="10dp">
+
+            <ImageView
+                android:id="@+id/imageView5"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_account"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Search people"
+                android:textAlignment="center"
+                style="@style/TextMain"
+                android:layout_marginStart="10dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView5"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/TextColor"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"/>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+
+            android:padding="10dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp">
+
+            <ImageView
+                android:id="@+id/imageView6"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_saved"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="10dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView6"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Saved"
+                    android:textAlignment="center"
+                    style="@style/TextMain"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="3 items"
+                    android:textAlignment="center"
+                    style="@style/TextMain"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                style="@style/Img"
+                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:orientation="horizontal"
+
+            android:padding="10dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp">
+
+            <ImageView
+                android:id="@+id/imageView7"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_blocked"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView7"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Blocked"
+                    android:textAlignment="center"
+                    style="@style/TextMain"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="3 items"
+                    android:textAlignment="center"
+                    style="@style/TextMain"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                style="@style/Img"
+                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:orientation="horizontal"
+
+            android:padding="10dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp">
+
+            <ImageView
+                android:id="@+id/imageView8"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_create_by_me"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="10dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView8"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Created by me"
+                    android:textAlignment="center"
+                    style="@style/TextMain"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="3 items"
+                    android:textAlignment="center"
+                    style="@style/TextMain"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                style="@style/Img"
+                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:orientation="horizontal"
+
+            android:padding="10dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp">
+
+            <ImageView
+                android:id="@+id/imageView9"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_history"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="10dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView9"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Browse history"
+                    android:textAlignment="center"
+                    style="@style/TextMain" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="3 items"
+                    android:textAlignment="center"
+                    style="@style/TextMain"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                style="@style/Img"
+                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:orientation="horizontal"
+            android:padding="10dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp">
+
+            <ImageView
+                android:id="@+id/imageView10"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_attending"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="10dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView10"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Attended"
+                    android:textAlignment="center"
+                    style="@style/TextMain"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="3 items"
+                    android:textAlignment="center"
+                    style="@style/TextMain"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/TextColor"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"/>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/settingsBlock"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="10dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp">
+
+            <ImageView
+                android:id="@+id/imageView11"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_settings"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Settings"
+                android:textAlignment="center"
+                style="@style/TextMain"
+                android:layout_marginStart="10dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView11"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                style="@style/Img"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,16 +1,344 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.fragments.CreateEventFragment"
-    android:background="@color/AppBackground">
+    android:paddingStart="15dp"
+    android:paddingEnd="15dp"
+    style="@style/AppBack">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:id="@+id/btnBack"
+            style="@style/Img"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:padding="5dp"
+            android:src="@drawable/ic_back"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/textView13"
+            style="@style/TextMain"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="15dp"
+            android:text="Profile"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnBack"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/shapeableImageView"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:background="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:shapeAppearance="@style/roundedImageViewRounded50" />
+
+        <TextView
+            android:id="@+id/textView14"
+            style="@style/TextMain"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:text="Tim Berners-Lee"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@+id/shapeableImageView"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/textView15"
+            style="@style/TextMain"
+            android:textColor="@color/MainColor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:text="online"
+            app:layout_constraintStart_toEndOf="@+id/shapeableImageView"
+            app:layout_constraintTop_toBottomOf="@+id/textView14" />
+
+        <TextView
+            style="@style/TextMainWithImg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:drawablePadding="5dp"
+            android:text="Chat"
+            app:drawableStartCompat="@drawable/ic_chat_24"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/shapeableImageView" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <TextView
+        android:id="@+id/textView16"
+        style="@style/TextMain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="Info"
+        android:textColor="@color/MainColor"
+        android:textSize="18sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout2" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout9"
+        style="@style/Block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:orientation="vertical"
+        android:padding="15dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView16">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/textView18"
+                style="@style/TextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Status"
+                android:textSize="18dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                style="@style/SubTextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Active"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView18" />
+
+            <ImageView
+                style="@style/Img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                android:visibility="invisible"
+                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="15dp">
+
+            <TextView
+                android:id="@+id/textView19"
+                style="@style/TextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Age"
+                android:textSize="18dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                style="@style/SubTextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="25"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView19" />
+
+            <ImageView
+                style="@style/Img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                android:visibility="invisible"
+                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="15dp">
+
+            <TextView
+                android:id="@+id/textView20"
+                style="@style/TextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Level"
+                android:textSize="18dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                style="@style/SubTextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Biginner ( 1.54 )"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView20" />
+
+            <ImageView
+                style="@style/Img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                android:visibility="invisible"
+                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="15dp">
+
+            <TextView
+                android:id="@+id/textView21"
+                style="@style/TextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Gender"
+                android:textSize="18dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                style="@style/SubTextMain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Male"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView21" />
+
+            <ImageView
+                style="@style/Img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_forward"
+                android:visibility="invisible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
 
-    <!-- TODO: Update blank fragment layout -->
     <TextView
+        android:id="@+id/textView199"
+        style="@style/TextMain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/hello_blank_fragment"
-        android:textColor="@color/TextColor"/>
+        android:layout_marginTop="10dp"
+        android:text="Bio"
+        android:textColor="@color/MainColor"
+        android:textSize="18sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout9" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout3"
+        style="@style/Block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        android:layout_marginTop="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView199">
+
+        <TextView
+            style="@style/TextMain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Just trying to lose weight. Maybe it’s gonna be easier with someone, additional motivator ish :) ONe thing to mention is "
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <TextView
+        android:id="@+id/textView200"
+        style="@style/TextMain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="Gallery"
+        android:textColor="@color/MainColor"
+        android:textSize="18dp"
+        android:layout_marginTop="10dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout3" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView200">
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp">
+
+            <LinearLayout
+                android:id="@+id/photo_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+            </LinearLayout>
+
+        </HorizontalScrollView>
+
+    </LinearLayout>
 
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,342 @@
+<?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.SettingsFragment"
+    style="@style/AppBack">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:id="@+id/btnBack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:src="@drawable/ic_back"
+            android:padding="5dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/Img" />
+
+        <TextView
+            android:id="@+id/textView13"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="15dp"
+            android:text="Filters"
+            style="@style/TextMain"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnBack"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Interface"
+                android:textColor="@color/MainColor"
+                android:textSize="16sp"
+                android:layout_marginBottom="5dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Firts day of the week"
+                    style="@style/TextMain"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Monday"
+                    style="@style/SubTextMain"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Language"
+                    style="@style/TextMain"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="English"
+                    style="@style/SubTextMain"/>
+
+            </LinearLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <LinearLayout
+                    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="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Color scheme"
+                        style="@style/TextMain"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Off - Light / On - Dark"
+                        style="@style/SubTextMain" />
+
+                </LinearLayout>
+
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/switchAppTheme"
+                    style="@style/Switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Privacy"
+                android:textColor="@color/MainColor"
+                android:textSize="16sp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <LinearLayout
+                    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="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Show location"
+                        style="@style/TextMain"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Location is shown in your profile"
+                        style="@style/SubTextMain" />
+
+                </LinearLayout>
+
+                <androidx.appcompat.widget.SwitchCompat
+                    style="@style/Switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    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:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <LinearLayout
+                    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="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Language"
+                        style="@style/TextMain"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="English"
+                        style="@style/SubTextMain" />
+
+                </LinearLayout>
+
+                <androidx.appcompat.widget.SwitchCompat
+                    style="@style/Switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Sound and notifications"
+                android:textColor="@color/MainColor"
+                android:textSize="16sp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <LinearLayout
+                    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="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Send notifications"
+                        style="@style/TextMain"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Remind about upcoming events and inbox messages"
+                        style="@style/SubTextMain"
+                        android:layout_marginEnd="60dp"/>
+
+                </LinearLayout>
+
+                <androidx.appcompat.widget.SwitchCompat
+                    style="@style/Switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Links"
+                android:textColor="@color/MainColor"
+                android:textSize="16sp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Help and FAQ"
+                style="@style/TextMain"
+                android:textStyle="bold"
+                android:paddingTop="13dp"
+                android:paddingBottom="13dp"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Feedback"
+                style="@style/TextMain"
+                android:textStyle="bold"
+                android:paddingTop="13dp"
+                android:paddingBottom="13dp"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Rate this app on Google Play"
+                style="@style/TextMain"
+                android:textStyle="bold"
+                android:paddingTop="13dp"
+                android:paddingBottom="13dp"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="About"
+                style="@style/TextMain"
+                android:textStyle="bold"
+                android:paddingTop="13dp"
+                android:paddingBottom="13dp"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/bottom_nav_menu.xml

@@ -17,8 +17,8 @@
         android:icon="@drawable/ic_chats"
         android:id="@+id/chats"/>
 
-    <item android:title="Me"
-        android:icon="@drawable/ic_account"
-        android:id="@+id/account"/>
+    <item android:title="More"
+        android:icon="@drawable/ic_more"
+        android:id="@+id/more"/>
 
 </menu>

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

@@ -1,16 +1,175 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Theme.SportsmanFriend" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
+
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <!-- Dark theme -->
+
+    <style name="AppBack">
+        <item name="android:background">@color/AppBackgroundDark</item>
+    </style>
+
+    <style name="DialogBack">
+        <item name="android:background">@drawable/black_border</item>
+    </style>
+
+    <style name="TextMain">
+        <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="SubTextMain">
+        <item name="android:textColor">@color/SubTextColorDark</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="InputCode">
+        <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:textColorHint">@color/TextColorDark</item>
+        <item name="android:backgroundTint">@color/TextColorDark</item>
+    </style>
+
+    <style name="Input">
+        <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:textColorHint">@color/SubTextColorDark</item>
+        <item name="android:background">@drawable/black_border</item>
+    </style>
+
+    <style name="RadioButton">
+        <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:buttonTint">@color/switch_color_dark</item>
+    </style>
+
+    <style name="TextMainWithImg">
+        <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:drawableTint">@color/TextColorDark</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="SubTextMainWithImg">
+        <item name="android:textColor">@color/SubTextColorDark</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:drawableTint">@color/SubTextColorDark</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="BlueTextMainWithImg">
+        <item name="android:textColor">@color/MainColor</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:drawableTint">@color/SubTextColorDark</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="Calendar">
+        <item name="android:dateTextAppearance">@style/CalenderViewDateCustomText</item>
+        <item name="android:theme">@style/CalenderViewCustom</item>
+        <item name="android:weekDayTextAppearance">@style/CalenderViewWeekCustomText</item>
+        <item name="android:background">@drawable/black_border</item>
+    </style>
+
+    <style name="TimePicker">
+        <item name="android:theme">@style/timePickerStyle</item>
+    </style>
+
+    <style name="Slider">
+        <item name="trackColor">@color/TextColorDark</item>
+        <item name="thumbColor">@color/TextColorDark</item>
+        <item name="labelStyle">@style/TooltipStyle</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Slider</item>
+    </style>
+
+    <style name="Img">
+        <item name="tint">@color/TextColorDark</item>
+    </style>
+
+    <style name="SubImg">
+        <item name="tint">@color/SubTextColorDark</item>
+    </style>
+
+    <style name="ImgButton">
+        <item name="android:background">@drawable/black_border</item>
+        <item name="tint">@color/TextColorDark</item>
+    </style>
+
+    <style name="Block">
+        <item name="android:background">@drawable/black_border</item>
+    </style>
+
+    <style name="Switch">
+        <item name="thumbTint">@color/switch_color_dark</item>
+        <item name="trackTint">@color/switch_color_dark</item>
+    </style>
+
+    <style name="BottomNavigationView">
+        <item name="itemTextColor">@drawable/menu_item_style_dark</item>
+        <item name="itemIconTint">@drawable/menu_item_style_dark</item>
+        <item name="android:background">@color/AppBackgroundDark</item>
+    </style>
+
+    <!-- Dark theme -->
+
+    <style name="CalenderViewCustom" parent="Theme.AppCompat">
+        <item name="colorAccent">@color/TextColorDark</item>
+        <item name="android:textColorPrimary">@color/TextColorDark</item>
+    </style>
+
+    <style name="CalenderViewWeekCustomText" parent="android:TextAppearance.DeviceDefault.Small">
+        <item name="android:textColor">@color/TextColorDark</item>
+    </style>
+
+    <style name="CalenderViewWeekCustomTextBlack" parent="android:TextAppearance.DeviceDefault.Small">
+        <item name="android:textColor">@color/TextColor</item>
+    </style>
+
+    <style name="CalenderViewDateCustomText">
+        <item name="colorControlNormal">@color/TextColorDark</item>
+        <item name="colorControlActivated">@color/TextColorDark</item>
+        <item name="colorControlHighlight">@color/TextColorDark</item>
+        <item name="android:textColor">@drawable/calendar_selected_date_dark</item>
+    </style>
+
+    <style name="TooltipStyle" parent="Widget.MaterialComponents.Tooltip">
+        <!-- background color of the Tooltip -->
+        <item name="backgroundTint">@color/ElementsColorDark</item>
+    </style>
+
+    <style name="ThemeOverlay.Slider" parent="">
+        <!-- color used by the text in the Tooltip -->
+        <item name="colorOnPrimary">@color/TextColorDark</item>
+        <item name="colorOnBackground">@color/black</item>
+        <item name="colorSurface">@color/TextColorDark</item>
+    </style>
+
+    <style name="SliderStyle" parent="@style/Widget.MaterialComponents.Slider">
+        <item name="labelStyle">@style/TooltipStyle</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Slider</item>
+    </style>
+
+    <style name="SwitchCompatStyle" >
+        <item name="thumbTint">@color/switch_color</item>
+        <item name="trackTint">@color/switch_color</item>
+    </style>
+
+    <style name="timePickerStyle">
+        <item name="android:textColorPrimary">@color/TextColorDark</item>
+        <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:colorControlNormal">@color/TextColorDark</item>
+    </style>
+
+    <style name="roundedImageViewRounded">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">10%</item>
+    </style>
+
+    <style name="roundedImageViewRounded50">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
 </resources>

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

@@ -7,11 +7,17 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="AppBackground">#131313</color>
-    <color name="TextColor">#D7D7D7 </color>
-    <color name="SubTextColor">#AF9999 </color>
-    <color name="ElementsColor">#1A1A1A</color>
-    <color name="StrokeColor">#403F3F</color>
+    <color name="AppBackgroundDark">#131313</color>
+    <color name="TextColorDark">#D7D7D7 </color>
+    <color name="SubTextColorDark">#AF9999 </color>
+    <color name="ElementsColorDark">#1A1A1A</color>
+    <color name="StrokeColorDark">#403F3F</color>
+    <color name="MainColorDark">#0059C9</color>
+    <color name="AppBackground">#EBF1FF</color>
+    <color name="TextColor">#303030 </color>
+    <color name="SubTextColor">#898989 </color>
+    <color name="ElementsColor">#FFFFFF</color>
+    <color name="StrokeColor">#C7C7C7</color>
     <color name="MainColor">#0059C9</color>
 
 </resources>

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

@@ -17,40 +17,141 @@
 
     <!-- Light theme -->
 
-    <!-- Light theme -->
+    <style name="AppBack">
+        <item name="android:background">@color/AppBackground</item>
+    </style>
+
+    <style name="DialogBack">
+        <item name="android:background">@drawable/white_border</item>
+    </style>
+
+    <style name="TextMain">
+        <item name="android:textColor">@color/TextColor</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="SubTextMain">
+        <item name="android:textColor">@color/SubTextColor</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="InputCode">
+        <item name="android:textColor">@color/TextColor</item>
+        <item name="android:textColorHint">@color/TextColor</item>
+        <item name="android:backgroundTint">@color/TextColor</item>
+    </style>
+
+    <style name="Input">
+        <item name="android:textColor">@color/TextColor</item>
+        <item name="android:textColorHint">@color/SubTextColor</item>
+        <item name="android:background">@drawable/white_border</item>
+    </style>
+
+    <style name="RadioButton">
+        <item name="android:textColor">@color/TextColor</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:buttonTint">@color/switch_color</item>
+    </style>
+
+    <style name="TextMainWithImg">
+        <item name="android:textColor">@color/TextColor</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:drawableTint">@color/TextColor</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="SubTextMainWithImg">
+        <item name="android:textColor">@color/SubTextColor</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:drawableTint">@color/SubTextColor</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="BlueTextMainWithImg">
+        <item name="android:textColor">@color/MainColor</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:drawableTint">@color/TextColor</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="Calendar">
+        <item name="android:dateTextAppearance">@style/CalenderViewDateCustomText</item>
+        <item name="android:theme">@style/CalenderViewCustom</item>
+        <item name="android:weekDayTextAppearance">@style/CalenderViewWeekCustomText</item>
+        <item name="android:background">@drawable/white_border</item>
+    </style>
+    
+    <style name="TimePicker">
+        <item name="android:theme">@style/timePickerStyle</item>
+    </style>
+
+    <style name="Slider">
+        <item name="trackColor">@color/TextColorDark</item>
+        <item name="thumbColor">@color/TextColorDark</item>
+        <item name="labelStyle">@style/TooltipStyle</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Slider</item>
+    </style>
+
+    <style name="Img">
+        <item name="tint">@color/TextColor</item>
+    </style>
+
+    <style name="SubImg">
+        <item name="tint">@color/SubTextColor</item>
+    </style>
+
+    <style name="ImgButton">
+        <item name="android:background">@drawable/white_border</item>
+        <item name="tint">@color/TextColor</item>
+    </style>
+
+    <style name="Block">
+        <item name="android:background">@drawable/white_border</item>
+    </style>
+
+    <style name="Switch">
+        <item name="thumbTint">@color/switch_color</item>
+        <item name="trackTint">@color/switch_color</item>
+    </style>
 
+    <style name="BottomNavigationView">
+        <item name="itemTextColor">@drawable/menu_item_style</item>
+        <item name="itemIconTint">@drawable/menu_item_style</item>
+        <item name="android:background">@color/AppBackground</item>
+    </style>
+
+    <!-- Light theme -->
+    
     <style name="CalenderViewCustom" parent="Theme.AppCompat">
-        <item name="colorAccent">@color/white</item>
+        <item name="colorAccent">@color/TextColor</item>
+        <item name="android:textColorPrimary">@color/TextColor</item>
     </style>
 
     <style name="CalenderViewWeekCustomText" parent="android:TextAppearance.DeviceDefault.Small">
-        <item name="android:textColor">@color/white</item>
+        <item name="android:textColor">@color/TextColor</item>
     </style>
+
     <style name="CalenderViewWeekCustomTextBlack" parent="android:TextAppearance.DeviceDefault.Small">
-        <item name="android:textColor">@color/black</item>
+        <item name="android:textColor">@color/TextColorDark</item>
     </style>
+
     <style name="CalenderViewDateCustomText">
-        <item name="colorControlNormal">@color/white</item>
-        <item name="colorControlActivated">@color/white</item>
-        <item name="colorControlHighlight">@color/white</item>
+        <item name="colorControlNormal">@color/TextColor</item>
+        <item name="colorControlActivated">@color/TextColor</item>
+        <item name="colorControlHighlight">@color/TextColor</item>
         <item name="android:textColor">@drawable/calendar_selected_date</item>
     </style>
 
     <style name="TooltipStyle" parent="Widget.MaterialComponents.Tooltip">
         <!-- background color of the Tooltip -->
-        <item name="backgroundTint">@color/white</item>
+        <item name="backgroundTint">@color/ElementsColor</item>
     </style>
 
     <style name="ThemeOverlay.Slider" parent="">
         <!-- color used by the text in the Tooltip -->
-        <item name="colorOnPrimary">@color/purple_500</item>
-        <item name="colorOnBackground">@color/white</item>
-        <item name="colorSurface">@color/purple_200</item>
-    </style>
-
-    <style name="SliderStyle" parent="@style/Widget.MaterialComponents.Slider">
-        <item name="labelStyle">@style/TooltipStyle</item>
-        <item name="materialThemeOverlay">@style/ThemeOverlay.Slider</item>
+        <item name="colorOnPrimary">@color/MainColor</item>
+        <item name="colorOnBackground">@color/TextColorDark</item>
+        <item name="colorSurface">@color/black</item>
     </style>
 
     <style name="SwitchCompatStyle" >
@@ -58,10 +159,10 @@
         <item name="trackTint">@color/switch_color</item>
     </style>
 
-    <style name="timePickerOrange">
-        <item name="android:textColorPrimary">@color/TextColor</item> <!-- color for digits -->
-        <item name="android:textColor">@color/TextColor</item> <!-- color for colon -->
-        <item name="android:colorControlNormal">@color/TextColor</item> <!-- color for (horizontal) delimeters -->
+    <style name="timePickerStyle">
+        <item name="android:textColorPrimary">@color/TextColor</item>
+        <item name="android:textColor">@color/TextColor</item> 
+        <item name="android:colorControlNormal">@color/TextColor</item> 
     </style>
 
     <style name="roundedImageViewRounded">