From 10bebf8a896d19cb57e034673602fe79e3b976fc Mon Sep 17 00:00:00 2001
From: chschtsch <chschtsch@ya.ru>
Date: Wed, 2 Dec 2015 15:27:19 +0300
Subject: [PATCH] update cards & update dimens structure

---
 .../layout-land/fragment_videoitem_detail.xml | 61 ++++++++--------
 .../fragment_videoitem_detail.xml             | 66 +++++++++--------
 .../res/layout/fragment_videoitem_detail.xml  |  2 +-
 app/src/main/res/layout/video_item.xml        | 73 +++++++++----------
 app/src/main/res/values-land/dimens.xml       | 14 ++++
 app/src/main/res/values-sw600dp/dimens.xml    | 14 ++++
 app/src/main/res/values/dimens.xml            | 14 ++++
 app/src/main/res/values/dimentxt.xml          | 29 --------
 8 files changed, 144 insertions(+), 129 deletions(-)
 create mode 100644 app/src/main/res/values-land/dimens.xml
 create mode 100644 app/src/main/res/values-sw600dp/dimens.xml
 create mode 100644 app/src/main/res/values/dimens.xml
 delete mode 100644 app/src/main/res/values/dimentxt.xml

diff --git a/app/src/main/res/layout-land/fragment_videoitem_detail.xml b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
index 02201f9f4..0a00c4045 100644
--- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
@@ -45,10 +45,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailThumbnailView"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingRight="10dp"
-                    android:paddingLeft="10dp">
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp">
 
                     <TextView android:id="@+id/detailVideoTitleView"
                         android:layout_width="wrap_content"
@@ -56,14 +56,14 @@
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:textStyle="bold"
-                        android:paddingBottom="5dp"
-                        android:textSize="@dimen/text_video_title_land_size"
+                        android:paddingBottom="3dp"
+                        android:textSize="@dimen/text_video_title_size"
                         android:textAppearance="?android:attr/textAppearanceLarge"/>
 
                     <ImageView android:id="@+id/detailUploaderThumbnailView"
                         android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
@@ -76,18 +76,18 @@
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:textStyle="bold"
-                        android:textSize="@dimen/text_video_uploader_land_size"
+                        android:textSize="@dimen/text_video_uploader_size"
                         android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailViewCountView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="5dp"
+                        android:paddingBottom="3dp"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_views_land_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
+                        android:textSize="@dimen/text_video_views_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailThumbsDownCountView"
                         android:layout_width="wrap_content"
@@ -95,15 +95,15 @@
                         android:layout_below="@id/detailViewCountView"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_like_land_size"
+                        android:textSize="@dimen/text_video_like_size"
                         android:paddingRight="5dp"
                         android:paddingLeft="5dp"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
                     <ImageView android:id="@+id/detailThumbsDownImgView"
                         android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
+                        android:layout_width="30dp"
+                        android:layout_height="15dp"
                         android:layout_below="@id/detailViewCountView"
                         android:layout_toLeftOf="@id/detailThumbsDownCountView"
                         android:layout_toStartOf="@id/detailThumbsDownCountView"
@@ -119,18 +119,18 @@
                         android:layout_toStartOf="@id/detailThumbsDownImgView"
                         android:paddingRight="5dp"
                         android:paddingLeft="5dp"
-                        android:textSize="@dimen/text_video_like_land_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
+                        android:textSize="@dimen/text_video_like_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                     <ImageView android:id="@+id/detailThumbsUpImgView"
                         android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
+                        android:layout_width="30dp"
+                        android:layout_height="15dp"
                         android:layout_below="@id/detailViewCountView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
                         android:layout_toLeftOf="@id/detailThumbsUpCountView"
                         android:layout_toStartOf="@id/detailThumbsUpImgView"
+                        android:paddingRight="5dp"
+                        android:paddingLeft="5dp"
                         android:src="@drawable/thumbs_up" />
 
                     <TextView android:id="@+id/detailUploadDateView"
@@ -139,7 +139,7 @@
                         android:layout_below="@id/detailUploaderView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_land_size"
+                        android:textSize="@dimen/text_video_upload_date_size"
                         android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailDescriptionView"
@@ -148,14 +148,19 @@
                         android:layout_below="@id/detailUploadDateView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_description_land_size"
+                        android:textSize="@dimen/text_video_description_size"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 </RelativeLayout>
             </RelativeLayout>
+
             <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
                 android:layout_below="@id/detailVideoInfo" >
 
                 <TextView android:id="@+id/detailNextVideoTitle"
@@ -163,10 +168,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:paddingLeft="6dp"
-                    android:paddingRight="6dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="6dp"
+                    android:textSize="@dimen/text_video_upload_date_size"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/black"
                     android:text="@string/nextVideoTitle"
@@ -188,7 +190,6 @@
                         android:layout_alignBottom="@id/detailNextVideoFrame"
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
-
             </RelativeLayout>
 
             <Button android:id="@+id/detailShowSimilarButton"
@@ -203,12 +204,12 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/playVideoButton"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:backgroundTint="@color/primaryColorYoutube"
         android:src="@drawable/ic_play_arrow_black"
-        android:layout_margin="16dip"/>
+        android:layout_margin="20dp"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
index 9bf507fef..0a00c4045 100644
--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
@@ -45,10 +45,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailThumbnailView"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingRight="10dp"
-                    android:paddingLeft="10dp">
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp">
 
                     <TextView android:id="@+id/detailVideoTitleView"
                         android:layout_width="wrap_content"
@@ -56,14 +56,14 @@
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:textStyle="bold"
-                        android:paddingBottom="5dp"
-                        android:textSize="@dimen/text_video_title_sw600dp_size"
+                        android:paddingBottom="3dp"
+                        android:textSize="@dimen/text_video_title_size"
                         android:textAppearance="?android:attr/textAppearanceLarge"/>
 
                     <ImageView android:id="@+id/detailUploaderThumbnailView"
                         android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
@@ -76,18 +76,18 @@
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:textStyle="bold"
-                        android:textSize="@dimen/text_video_uploader_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
+                        android:textSize="@dimen/text_video_uploader_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailViewCountView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="5dp"
+                        android:paddingBottom="3dp"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_views_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
+                        android:textSize="@dimen/text_video_views_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailThumbsDownCountView"
                         android:layout_width="wrap_content"
@@ -95,15 +95,15 @@
                         android:layout_below="@id/detailViewCountView"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/text_video_like_sw600dp_size"
+                        android:textSize="@dimen/text_video_like_size"
                         android:paddingRight="5dp"
                         android:paddingLeft="5dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
+                        android:textAppearance="?android:attr/textAppearanceMedium" />
 
                     <ImageView android:id="@+id/detailThumbsDownImgView"
                         android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
+                        android:layout_width="30dp"
+                        android:layout_height="15dp"
                         android:layout_below="@id/detailViewCountView"
                         android:layout_toLeftOf="@id/detailThumbsDownCountView"
                         android:layout_toStartOf="@id/detailThumbsDownCountView"
@@ -119,18 +119,18 @@
                         android:layout_toStartOf="@id/detailThumbsDownImgView"
                         android:paddingRight="5dp"
                         android:paddingLeft="5dp"
-                        android:textSize="@dimen/text_video_like_sw600dp_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
+                        android:textSize="@dimen/text_video_like_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                     <ImageView android:id="@+id/detailThumbsUpImgView"
                         android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                        android:layout_width="40dp"
-                        android:layout_height="20dp"
+                        android:layout_width="30dp"
+                        android:layout_height="15dp"
                         android:layout_below="@id/detailViewCountView"
-                        android:paddingRight="5dp"
-                        android:paddingLeft="5dp"
                         android:layout_toLeftOf="@id/detailThumbsUpCountView"
                         android:layout_toStartOf="@id/detailThumbsUpImgView"
+                        android:paddingRight="5dp"
+                        android:paddingLeft="5dp"
                         android:src="@drawable/thumbs_up" />
 
                     <TextView android:id="@+id/detailUploadDateView"
@@ -139,7 +139,7 @@
                         android:layout_below="@id/detailUploaderView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_sw600dp_size"
+                        android:textSize="@dimen/text_video_upload_date_size"
                         android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailDescriptionView"
@@ -148,14 +148,19 @@
                         android:layout_below="@id/detailUploadDateView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_description_sw600dp_size"
+                        android:textSize="@dimen/text_video_description_size"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 </RelativeLayout>
             </RelativeLayout>
+
             <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
                 android:layout_below="@id/detailVideoInfo" >
 
                 <TextView android:id="@+id/detailNextVideoTitle"
@@ -163,10 +168,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:paddingLeft="6dp"
-                    android:paddingRight="6dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="6dp"
+                    android:textSize="@dimen/text_video_upload_date_size"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/black"
                     android:text="@string/nextVideoTitle"
@@ -188,8 +190,8 @@
                         android:layout_alignBottom="@id/detailNextVideoFrame"
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
-
             </RelativeLayout>
+
             <Button android:id="@+id/detailShowSimilarButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -202,12 +204,12 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/playVideoButton"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:backgroundTint="@color/primaryColorYoutube"
         android:src="@drawable/ic_play_arrow_black"
-        android:layout_margin="16dip"/>
+        android:layout_margin="20dp"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 02f7a0eb9..0ef9f9acb 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -204,8 +204,8 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/playVideoButton"
-        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:backgroundTint="@color/primaryColorYoutube"
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index 76aac8c74..a38f2b9b9 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:padding="6dp">
 
     <android.support.v7.widget.CardView
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -12,14 +13,14 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="6dp"
         card_view:cardCornerRadius="4dp" >
 
         <RelativeLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="92dp">
+            android:layout_height="wrap_content"
+            android:padding="6dp">
 
             <ImageView android:id="@+id/itemThumbnailView"
                 android:contentDescription="@string/itemThumbnailViewDescription"
@@ -42,42 +43,40 @@
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textSize="@dimen/text_search_title_size"/>
 
-            <TextView android:id="@+id/itemUploaderView"
-                android:layout_width="wrap_content"
-                android:layout_height="18dp"
-                android:layout_toRightOf="@id/itemThumbnailView"
-                android:layout_toEndOf="@id/itemThumbnailView"
-                android:layout_below="@id/itemVideoTitleView"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/text_search_uploader_size"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@id/itemThumbnailView">
 
-            <TextView android:id="@+id/itemUploadDateView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/itemThumbnailView"
-                android:layout_toEndOf="@id/itemThumbnailView"
-                android:layout_below="@id/itemUploaderView"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/text_search_uploadtime_size"
-                />
+                <TextView android:id="@+id/itemUploaderView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="18dp"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/text_search_uploader_size"/>
 
-            <TextView android:id="@+id/itemDurationView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/itemThumbnailView"
-                android:layout_alignRight="@id/itemThumbnailView"
-                android:layout_alignEnd="@id/itemThumbnailView"
-                android:layout_marginRight="2dp"
-                android:layout_marginEnd="2dp"
-                android:layout_marginBottom="2dp"
-                android:paddingTop="1dp"
-                android:paddingBottom="1dp"
-                android:paddingRight="5dp"
-                android:paddingLeft="5dp"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/text_search_duration_size"
-                android:background="@color/durationBackground"
-                android:textColor="@color/durationText"/>
+                <TextView android:id="@+id/itemUploadDateView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/text_search_uploadtime_size"
+                    />
+
+                <TextView android:id="@+id/itemDurationView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:layout_marginEnd="2dp"
+                    android:layout_marginBottom="2dp"
+                    android:paddingTop="1dp"
+                    android:paddingBottom="1dp"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/text_search_duration_size"
+                    android:background="@color/durationBackground"
+                    android:textColor="@color/durationText"/>
+
+            </LinearLayout>
 
         </RelativeLayout>
     </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
new file mode 100644
index 000000000..008c66dfb
--- /dev/null
+++ b/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="text_search_title_size">14sp</dimen>
+    <dimen name="text_search_duration_size">11sp</dimen>
+    <dimen name="text_search_uploader_size">12sp</dimen>
+    <dimen name="text_search_uploadtime_size">12sp</dimen>
+
+    <dimen name="text_video_title_size">24sp</dimen>
+    <dimen name="text_video_views_size">18sp</dimen>
+    <dimen name="text_video_like_size">16sp</dimen>
+    <dimen name="text_video_uploader_size">18sp</dimen>
+    <dimen name="text_video_upload_date_size">18sp</dimen>
+    <dimen name="text_video_description_size">18sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
new file mode 100644
index 000000000..31b3d148a
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="text_search_title_size">14sp</dimen>
+    <dimen name="text_search_duration_size">11sp</dimen>
+    <dimen name="text_search_uploader_size">12sp</dimen>
+    <dimen name="text_search_uploadtime_size">12sp</dimen>
+
+    <dimen name="text_video_title_size">20sp</dimen>
+    <dimen name="text_video_views_size">16sp</dimen>
+    <dimen name="text_video_like_size">14sp</dimen>
+    <dimen name="text_video_uploader_size">16sp</dimen>
+    <dimen name="text_video_upload_date_size">16sp</dimen>
+    <dimen name="text_video_description_size">16sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..9e74b58ea
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="text_search_title_size">14sp</dimen>
+    <dimen name="text_search_duration_size">11sp</dimen>
+    <dimen name="text_search_uploader_size">12sp</dimen>
+    <dimen name="text_search_uploadtime_size">12sp</dimen>
+
+    <dimen name="text_video_title_size">18sp</dimen>
+    <dimen name="text_video_views_size">14sp</dimen>
+    <dimen name="text_video_like_size">12sp</dimen>
+    <dimen name="text_video_uploader_size">14sp</dimen>
+    <dimen name="text_video_upload_date_size">14sp</dimen>
+    <dimen name="text_video_description_size">14sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimentxt.xml b/app/src/main/res/values/dimentxt.xml
deleted file mode 100644
index 7d9242073..000000000
--- a/app/src/main/res/values/dimentxt.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="text_search_title_size">14sp</dimen>
-    <dimen name="text_search_duration_size">11sp</dimen>
-    <dimen name="text_search_uploader_size">12sp</dimen>
-    <dimen name="text_search_uploadtime_size">12sp</dimen>
-
-    <dimen name="text_video_title_size">18sp</dimen>
-    <dimen name="text_video_views_size">14sp</dimen>
-    <dimen name="text_video_like_size">12sp</dimen>
-    <dimen name="text_video_uploader_size">14sp</dimen>
-    <dimen name="text_video_upload_date_size">14sp</dimen>
-    <dimen name="text_video_description_size">14sp</dimen>
-
-
-    <dimen name="text_video_title_sw600dp_size">20sp</dimen>
-    <dimen name="text_video_views_sw600dp_size">16sp</dimen>
-    <dimen name="text_video_like_sw600dp_size">14sp</dimen>
-    <dimen name="text_video_uploader_sw600dp_size">16sp</dimen>
-    <dimen name="text_video_upload_date_sw600dp_size">16sp</dimen>
-    <dimen name="text_video_description_sw600dp_size">16sp</dimen>
-
-    <dimen name="text_video_title_land_size">24sp</dimen>
-    <dimen name="text_video_views_land_size">18sp</dimen>
-    <dimen name="text_video_like_land_size">16sp</dimen>
-    <dimen name="text_video_uploader_land_size">18sp</dimen>
-    <dimen name="text_video_upload_date_land_size">18sp</dimen>
-    <dimen name="text_video_description_land_size">18sp</dimen>
-</resources>
\ No newline at end of file