[android] Improve bookmark description

Signed-off-by: Jean-BaptisteC <jeanbaptiste.charron@outlook.fr>

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java

@@ -429,14 +429,9 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
         View desc = inflater.inflate(R.layout.item_category_description, parent, false);
         TextView moreBtn = desc.findViewById(R.id.more_btn);
         TextView text = desc.findViewById(R.id.text);
-        TextView title = desc.findViewById(R.id.title);
-        TextView author = desc.findViewById(R.id.author);
         setMoreButtonVisibility(text, moreBtn);
         holder = new Holders.DescriptionViewHolder(desc, mSectionsDataSource.getCategory());
-        text.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
         moreBtn.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
-        title.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
-        author.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
         break;
     }
 
@@ -542,12 +537,12 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
     if (text.getMaxLines() == MAX_VISIBLE_LINES)
     {
       text.setMaxLines(Integer.MAX_VALUE);
-      moreBtn.setVisibility(View.GONE);
+      moreBtn.setText(R.string.placepage_less_button);
     }
     else
     {
       text.setMaxLines(MAX_VISIBLE_LINES);
-      moreBtn.setVisibility(View.VISIBLE);
+      moreBtn.setText(R.string.placepage_more_button);
     }
   }
 }

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

@@ -439,22 +439,18 @@ public class Holders
     static final float SPACING_MULTIPLE = 1.0f;
     static final float SPACING_ADD = 0.0f;
     @NonNull
-    private final TextView mTitle;
-    @NonNull
     private final TextView mDescText;
 
     DescriptionViewHolder(@NonNull View itemView, @NonNull BookmarkCategory category)
     {
       super(itemView);
       mDescText = itemView.findViewById(R.id.text);
-      mTitle = itemView.findViewById(R.id.title);
     }
 
     @Override
     void bind(@NonNull SectionPosition position,
               @NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
     {
-      mTitle.setText(sectionsDataSource.getCategory().getName());
       bindDescriptionIfEmpty(sectionsDataSource.getCategory());
     }
 

android/app/src/main/res/layout/edit_bookmark_common.xml

@@ -17,7 +17,7 @@
     android:orientation="vertical">
     <com.google.android.material.textfield.TextInputLayout
       android:id="@+id/edit_bookmark_name_input"
-      style="?fontBody1"
+      style="@style/MwmWidget.Editor.CustomTextInput"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColorHint="?android:textColorSecondary"
@@ -83,7 +83,7 @@
       tools:src="@drawable/ic_bookmark_none" />
   </RelativeLayout>
   <com.google.android.material.textfield.TextInputLayout
-    style="?fontBody1"
+    style="@style/MwmWidget.Editor.CustomTextInput"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_below="@id/rl__bookmark_set"

android/app/src/main/res/layout/fragment_edit_bookmark.xml

@@ -24,7 +24,6 @@
         android:contentDescription="@string/save" />
   </androidx.appcompat.widget.Toolbar>
   <FrameLayout
-    style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_below="@id/toolbar">

android/app/src/main/res/layout/item_category_description.xml

@@ -3,21 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/margin_base">
-
-  <TextView
-      android:id="@+id/title"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textAppearance="@style/MwmTextAppearance.Body2.Primary"
-      app:layout_constraintTop_toTopOf="parent" />
+    android:padding="@dimen/margin_half">
 
   <TextView
       android:id="@+id/author"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textAppearance="@style/MwmTextAppearance.Body3"
-      app:layout_constraintTop_toBottomOf="@id/title" />
+      app:layout_constraintTop_toTopOf="parent" />
 
   <LinearLayout
       android:layout_width="match_parent"
@@ -37,12 +30,12 @@
         android:id="@+id/more_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="start|bottom"
+        android:layout_gravity="end|bottom"
         android:background="@android:color/transparent"
         android:clickable="true"
-        android:gravity="start|top"
+        android:gravity="end|top"
         android:padding="@dimen/margin_base"
-        android:text="@string/category_desc_more"
+        android:text="@string/placepage_more_button"
         android:textColor="?attr/colorAccent"
         android:layout_marginTop="2dp" />
   </LinearLayout>

android/app/src/main/res/layout/item_category_title.xml

@@ -7,8 +7,9 @@
   android:layout_height="wrap_content"
   android:background="?windowBackgroundForced"
   android:gravity="start|center_vertical"
+  android:textSize="18sp"
   android:paddingStart="@dimen/margin_base"
-  android:paddingTop="@dimen/margin_base_plus"
+  android:paddingTop="@dimen/margin_half_plus"
   android:paddingEnd="@dimen/margin_base"
   android:paddingBottom="@dimen/margin_half_plus"
   android:text="@string/bookmarks" />