Update README.md

README.md

@@ -1,8 +1,11 @@
-## Strike Maps Project Android Client
+## Strike Maps 
 
-Strike Maps is a project hoping to create a multi-platform, <br>
-user-facing, complete FOSS mapping stack, focusing on customization <br>
-and offline features.
+Strike Maps is a FOSS mapping app for Android,
+focusing on customization and offline features
+<br>
+
+It is developed as part of a broader project, hoping to create a multi-platform,
+user-facing, complete FOSS mapping stack
 <br>
 
 This Android app has been in development since around January 2026

app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/NewStyleBottomSheet.java

@@ -8,25 +8,23 @@ import android.provider.OpenableColumns;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import androidx.annotation.UiContext;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.card.MaterialCardView;
 import eu.konggdev.strikemaps.R;
 import eu.konggdev.strikemaps.app.AppController;
-import eu.konggdev.strikemaps.data.helper.FileHelper;
+import eu.konggdev.strikemaps.app.util.helper.FileHelper;
 import eu.konggdev.strikemaps.map.MapComponent;
 import eu.konggdev.strikemaps.ui.UIComponent;
 import eu.konggdev.strikemaps.ui.factory.AlertDialogFactory;
 import eu.konggdev.strikemaps.ui.fragment.popup.FragmentMapChangePopup;
 
 import java.io.*;
-import java.util.stream.Collectors;
 
 public class NewStyleBottomSheet extends BottomSheetDialogFragment {
     private final String styleBase = "{\"name\":\"None\"}";
@@ -127,9 +125,9 @@ public class NewStyleBottomSheet extends BottomSheetDialogFragment {
 
         View view = inflater.inflate(R.layout.dialog_new_style, container, false);
 
-        Button builtInBtn = view.findViewById(R.id.buttonFromBuiltInStyle);
-        Button fileBtn = view.findViewById(R.id.buttonFromFile);
-        Button emptyBtn = view.findViewById(R.id.buttonCreateEmpty);
+        MaterialCardView builtInBtn = view.findViewById(R.id.buttonFromBuiltInStyle);
+        MaterialCardView fileBtn = view.findViewById(R.id.buttonFromFile);
+        MaterialCardView emptyBtn = view.findViewById(R.id.buttonCreateEmpty);
 
         builtInBtn.setOnClickListener(v -> {
             app.getUi().alert(AlertDialogFactory.copyBuiltInStyle(app, map, ui, mapChangePopup));

app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/StyleDetailsBottomSheet.java

@@ -2,26 +2,21 @@ package eu.konggdev.strikemaps.ui.fragment.dialog;
 
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.google.android.material.button.MaterialButton;
+import com.google.android.material.card.MaterialCardView;
 import eu.konggdev.strikemaps.R;
 import eu.konggdev.strikemaps.app.AppController;
-import eu.konggdev.strikemaps.data.helper.FileHelper;
+import eu.konggdev.strikemaps.app.util.helper.FileHelper;
 import eu.konggdev.strikemaps.map.MapComponent;
 import eu.konggdev.strikemaps.map.style.MapStyle;
 import eu.konggdev.strikemaps.ui.UIComponent;
@@ -32,8 +27,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Objects;
 
-import static android.media.MediaExtractor.MetricsConstants.MIME_TYPE;
-
 public class StyleDetailsBottomSheet extends BottomSheetDialogFragment {
     @NonNull
     AppController app;
@@ -121,11 +114,11 @@ public class StyleDetailsBottomSheet extends BottomSheetDialogFragment {
         TextView styleTypeView = view.findViewById(R.id.styleType);
 
         TextView builtInStyleAlert = view.findViewById(R.id.builtInStyleAlert);
-        ConstraintLayout editButtonLayout = view.findViewById(R.id.editButton);
-        ConstraintLayout copyButtonLayout = view.findViewById(R.id.copyButton);
-        ConstraintLayout exportButtonLayout = view.findViewById(R.id.exportButton);
-        ConstraintLayout deleteButtonLayout = view.findViewById(R.id.deleteButton);
-        ConstraintLayout closeButtonLayout = view.findViewById(R.id.closeButton);
+        MaterialCardView editButtonLayout = view.findViewById(R.id.editButton);
+        MaterialCardView copyButtonLayout = view.findViewById(R.id.copyButton);
+        MaterialCardView exportButtonLayout = view.findViewById(R.id.exportButton);
+        MaterialCardView deleteButtonLayout = view.findViewById(R.id.deleteButton);
+        MaterialCardView closeButtonLayout = view.findViewById(R.id.closeButton);
 
 
         styleNameView.setText(style.name);

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

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M720,630Q720,734 647,807Q574,880 470,880Q366,880 293,807Q220,734 220,630L220,260Q220,185 272.5,132.5Q325,80 400,80Q475,80 527.5,132.5Q580,185 580,260L580,610Q580,656 548,688Q516,720 470,720Q424,720 392,688Q360,656 360,610L360,240L440,240L440,610Q440,623 448.5,631.5Q457,640 470,640Q483,640 491.5,631.5Q500,623 500,610L500,260Q499,218 470.5,189Q442,160 400,160Q358,160 329,189Q300,218 300,260L300,630Q299,701 349,750.5Q399,800 470,800Q540,800 589,750.5Q638,701 640,630L640,240L720,240L720,630Z"/>
+    
+</vector>

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

@@ -1,60 +1,173 @@
-<LinearLayout
+<?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"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:background="#000000"
-        android:padding="24dp">
+        android:padding="12dp">
 
     <TextView
+            android:id="@+id/title"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="34dp"
+            android:gravity="center"
             android:text="New style"
             android:textColor="#FFFFFF"
-            android:textSize="22sp"
-            android:textStyle="bold" />
+            android:textSize="24sp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <Space
-            android:layout_width="match_parent"
-            android:layout_height="6dp" />
 
-    <com.google.android.material.button.MaterialButton
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/buttonFromBuiltInStyle"
             android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:text="From built-in style"
-            android:textAllCaps="false"
-            android:textColor="#FFFFFF"
-            app:backgroundTint="#1A1A1A"
-            app:cornerRadius="24dp" />
+            android:layout_height="38dp"
+            android:layout_marginTop="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
-    <Space
+        <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-            android:layout_height="4dp" />
+                android:layout_height="match_parent">
 
-    <com.google.android.material.button.MaterialButton
+            <ImageView
+                    android:id="@+id/builtInStyleIcon"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginStart="16dp"
+                    android:src="@android:drawable/ic_menu_edit"
+                    app:tint="#A4A3A3"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
+
+            <TextView
+                    android:id="@+id/builtInStyleText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="From built-In style"
+                    android:textColor="#FFFFFF"
+                    android:textSize="18sp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/buttonFromFile"
             android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:text="From file"
-            android:textAllCaps="false"
-            android:textColor="#FFFFFF"
-            app:backgroundTint="#1A1A1A"
-            app:cornerRadius="24dp" />
+            android:layout_height="38dp"
+            android:layout_marginTop="6dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
+            app:layout_constraintTop_toBottomOf="@id/buttonFromBuiltInStyle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
-    <Space
+        <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-            android:layout_height="4dp" />
+                android:layout_height="match_parent">
 
-    <com.google.android.material.button.MaterialButton
+            <ImageView
+                    android:id="@+id/fileIcon"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginStart="16dp"
+                    android:src="@drawable/ic_file"
+                    app:tint="#A4A3A3"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
+
+            <TextView
+                    android:id="@+id/fileBtnText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="From file"
+                    android:textColor="#FFFFFF"
+                    android:textSize="18sp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/buttonCreateEmpty"
             android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:text="Create empty"
-            android:textAllCaps="false"
-            android:textColor="#FFFFFF"
-            app:backgroundTint="#1A1A1A"
-            app:cornerRadius="24dp" />
+            android:layout_height="38dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="10dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
+            app:layout_constraintTop_toBottomOf="@id/buttonFromFile"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
-</LinearLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            <ImageView
+                    android:id="@+id/emptyIcon"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginStart="16dp"
+                    android:src="@drawable/ic_create"
+                    app:tint="#A4A3A3"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
+
+            <TextView
+                    android:id="@+id/emptyBtnText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="Create empty"
+                    android:textColor="#FFFFFF"
+                    android:textSize="18sp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:background="#000000"
         android:padding="12dp">
 
@@ -38,10 +38,10 @@
             android:layout_width="112dp"
             android:layout_height="27dp"
             android:layout_marginTop="4dp"
+            android:gravity="center"
             android:text="Style Type?"
             android:textColor="#FDFDFD"
             android:textSize="18sp"
-            android:gravity="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/fileName" />
@@ -66,26 +66,38 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/editButton"
             android:layout_width="match_parent"
             android:layout_height="38dp"
             android:layout_marginTop="16dp"
-            android:layout_marginBottom="2dp"
-            android:background="#1B1A1A"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
             app:layout_constraintTop_toBottomOf="@id/builtInStyleAlert"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent">
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
             <ImageView
                     android:id="@+id/hideIcon"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
                     android:layout_marginStart="16dp"
                     android:src="@android:drawable/ic_menu_edit"
-                app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="#A4A3A3"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
 
             <TextView
                     android:id="@+id/hideBtnText"
@@ -99,28 +111,42 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/copyButton"
             android:layout_width="match_parent"
             android:layout_height="38dp"
             android:layout_marginTop="6dp"
-            android:layout_marginBottom="2dp"
-            android:background="#1B1A1A"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
             app:layout_constraintTop_toBottomOf="@id/editButton"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent">
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
             <ImageView
                     android:id="@+id/copyIcon"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
                     android:layout_marginStart="16dp"
                     android:src="@drawable/ic_copy"
-                app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="#A4A3A3"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
 
             <TextView
                     android:id="@+id/copyBtnText"
@@ -134,29 +160,42 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/exportButton"
             android:layout_width="match_parent"
             android:layout_height="38dp"
             android:layout_marginTop="6dp"
-            android:layout_marginBottom="2dp"
-            android:background="#1B1A1A"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
+            app:layout_constraintTop_toBottomOf="@id/copyButton"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/copyButton">
+            app:layout_constraintEnd_toEndOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
             <ImageView
                     android:id="@+id/exportIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
                     android:layout_marginStart="16dp"
                     android:src="@android:drawable/ic_menu_save"
-                app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="#A4A3A3"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
 
             <TextView
                     android:id="@+id/exportBtnText"
@@ -166,35 +205,47 @@
                     android:text="Export style"
                     android:textColor="#FFFFFF"
                     android:textSize="20sp"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintEnd_toEndOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    </com.google.android.material.card.MaterialCardView>
+
+
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/deleteButton"
             android:layout_width="match_parent"
             android:layout_height="38dp"
             android:layout_marginTop="6dp"
-            android:layout_marginBottom="5dp"
-            android:background="#1B1A1A"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
+            app:layout_constraintTop_toBottomOf="@id/exportButton"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/exportButton"
-            app:layout_constraintVertical_bias="0.081">
+            app:layout_constraintEnd_toEndOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
             <ImageView
                     android:id="@+id/deleteIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
                     android:layout_marginStart="16dp"
                     android:src="@android:drawable/ic_menu_delete"
-                app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="#A4A3A3"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
 
             <TextView
                     android:id="@+id/deleteText"
@@ -204,34 +255,48 @@
                     android:text="Delete style"
                     android:textColor="#FFFFFF"
                     android:textSize="20sp"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintEnd_toEndOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    </com.google.android.material.card.MaterialCardView>
+
+
+    <com.google.android.material.card.MaterialCardView
             android:id="@+id/closeButton"
             android:layout_width="match_parent"
             android:layout_height="38dp"
             android:layout_marginTop="6dp"
             android:layout_marginBottom="10dp"
-            android:background="#1B1A1A"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackground"
+            app:cardBackgroundColor="#1B1A1A"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:strokeColor="#292828"
+            app:strokeWidth="1dp"
+            app:layout_constraintTop_toBottomOf="@id/deleteButton"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/deleteButton"
-            tools:layout_editor_absoluteY="251dp">
+            app:layout_constraintEnd_toEndOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
             <ImageView
                     android:id="@+id/closeIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
                     android:layout_marginStart="16dp"
                     android:src="@android:drawable/ic_menu_more"
-                app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="#A4A3A3"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
 
             <TextView
                     android:id="@+id/closeText"
@@ -241,10 +306,13 @@
                     android:text="Close"
                     android:textColor="#FFFFFF"
                     android:textSize="20sp"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintEnd_toEndOf="parent" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>