Switched to GridLayoutManager in entries recycler, classes moved

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

@@ -17,7 +17,7 @@
         android:id="@+id/entries_import_msg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
+        android:layout_marginStart="18dp"
         android:elevation="4dp"
         android:text="@string/entries_update"
         android:textSize="18sp"
@@ -53,13 +53,15 @@
     <SearchView
         android:id="@+id/entries_search_bar"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="2dp"
         android:iconifiedByDefault="false"
         android:queryHint="@string/entries_search_hint"
+        android:searchIcon="@null"
+        app:layout_constraintBottom_toBottomOf="@+id/entries_select_mode"
         app:layout_constraintEnd_toStartOf="@+id/entries_select_mode"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/entries_bar" />
+        app:layout_constraintTop_toBottomOf="@+id/entries_import_web" />
 
     <ImageButton
         android:id="@+id/entries_select_mode"
@@ -86,6 +88,7 @@
         android:id="@+id/entries_recycler"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:padding="2dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -1,13 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.checkbox.MaterialCheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/entry_checkbox"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/entry_card"
     android:layout_width="match_parent"
-    android:layout_height="32dp"
-    android:background="@null"
-    android:button="@null"
-    android:drawableEnd="?android:attr/listChoiceIndicatorMultiple"
-    android:paddingStart="24dp"
-    android:paddingEnd="20dp"
-    android:text="@string/placeholder"
-    android:textColor="@color/greyLight"
-    android:textSize="16sp" />
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/entry_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/entry_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/placeholder"
+            android:textColor="@color/greyLight"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/entry_checkbox"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/entry_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginEnd="8dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            app:layout_constraintBottom_toBottomOf="@+id/entry_name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/entry_name"
+            app:layout_constraintTop_toTopOf="@+id/entry_name"
+            tools:ignore="TouchTargetSizeCheck" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>

app/src/main/res/values-ru/strings.xml

@@ -17,7 +17,7 @@
     <string name="sources_error">Пожалуйста, проверьте URL</string>
 
     <string name="entries_update">Обновить спутники:</string>
-    <string name="entries_search_hint">Имя / Номер</string>
+    <string name="entries_search_hint">Поиск по Имени / Id</string>
     <string name="entries_update_error">Ошибка обновления спутников</string>
 
     <string name="modes_title">Выберите модуляцию трансивера</string>

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

@@ -20,7 +20,7 @@
     <string name="sources_error">Please check the entered URL</string>
 
     <string name="entries_update">TLE data update:</string>
-    <string name="entries_search_hint">Name / Id</string>
+    <string name="entries_search_hint">Search by Name / Id</string>
     <string name="entries_update_error">Error importing satellite data</string>
 
     <string name="modes_title">Choose transceiver mode</string>