New design of bookmark categories activity.

5 files changed, 27 insertions, 34 deletions

diff --git a/android/res/layout/map.xml b/android/res/layout/activity_map.xml
index fe0c482f63..fe0c482f63 100644
--- a/android/res/layout/map.xml
+++ b/android/res/layout/activity_map.xml
diff --git a/android/res/layout/download_item_extended.xml b/android/res/layout/download_item_extended.xml
index 1f604b016c..4764aa8d24 100644
--- a/android/res/layout/download_item_extended.xml
+++ b/android/res/layout/download_item_extended.xml
@@ -33,7 +33,7 @@
       android:textColor="@android:color/white"/>
 
   <ImageView
-      android:id="@+id/disclosure_image"
+      android:id="@+id/tv__set_size"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentRight="true"
diff --git a/android/res/layout/download_item_group.xml b/android/res/layout/download_item_group.xml
index 2c34826bb5..18c78a7042 100644
--- a/android/res/layout/download_item_group.xml
+++ b/android/res/layout/download_item_group.xml
@@ -17,7 +17,7 @@
       android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
 
   <ImageView
-      android:id="@+id/disclosure_image"
+      android:id="@+id/tv__set_size"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentRight="true"
diff --git a/android/res/layout/item_bookmark_category.xml b/android/res/layout/item_bookmark_category.xml
index b8295919b7..d15af3309a 100644
--- a/android/res/layout/item_bookmark_category.xml
+++ b/android/res/layout/item_bookmark_category.xml
@@ -3,36 +3,34 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:gravity="center_vertical"
-              android:paddingBottom="@dimen/margin_medium"
-              android:paddingLeft="@dimen/margin_tiny_and_half"
-              android:paddingRight="@dimen/margin_tiny_and_half"
-              android:paddingTop="@dimen/margin_medium">
+              android:minHeight="@dimen/height_item_oneline"
+              android:paddingLeft="@dimen/margin_medium"
+              android:paddingRight="@dimen/margin_medium">
 
   <CheckBox
-      android:id="@+id/pin_set_visible"
+      android:id="@+id/chb__set_visible"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="0"
-      android:button="@drawable/eye"
-      android:focusable="false"
-      android:layout_marginLeft="@dimen/margin_tiny"
-      android:padding="@dimen/margin_tiny_and_half"/>
+      android:button="@drawable/btn_bookmark_visibility"
+      android:focusable="false"/>
 
   <TextView
-      android:id="@+id/psi_name"
+      android:id="@+id/tv__set_name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_tiny_and_half"
+      android:layout_marginLeft="@dimen/margin_medium"
       android:layout_weight="1"
       android:ellipsize="marquee"
       android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
+      android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-  <ImageView
-      android:id="@+id/disclosure_image"
-      android:layout_width="wrap_content"
+  <TextView
+      android:id="@+id/tv__set_size"
+      android:layout_width="48dp"
       android:layout_height="wrap_content"
       android:layout_weight="0"
-      android:src="@drawable/ic_next_item"/>
+      android:gravity="right"
+      android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/item_bookmark_hint.xml b/android/res/layout/item_bookmark_hint.xml
index c9d7209653..e6ed927259 100644
--- a/android/res/layout/item_bookmark_hint.xml
+++ b/android/res/layout/item_bookmark_hint.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    android:id="@+id/tv__bookmarks_usage"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/bookmarks_usage_hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:paddingBottom="@dimen/dp_x_3"
-        android:paddingLeft="@dimen/dp_x_8"
-        android:paddingRight="@dimen/dp_x_8"
-        android:paddingTop="@dimen/dp_x_3"
-        android:text="@string/bookmarks_usage_hint"
-        android:textSize="@dimen/sp_x_3" />
-
-</FrameLayout>
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:paddingBottom="@dimen/dp_x_3"
+    android:paddingLeft="@dimen/dp_x_8"
+    android:paddingRight="@dimen/dp_x_8"
+    android:paddingTop="@dimen/dp_x_3"
+    android:text="@string/bookmarks_usage_hint"
+    android:textAppearance="@style/MwmTextAppearance.Body2"/>