From 9ed4a65fd21a022c2dd932b82e970bc79daf712b Mon Sep 17 00:00:00 2001 From: chschtsch Date: Wed, 2 Dec 2015 16:23:31 +0300 Subject: [PATCH] move all dimensions do dimens.xml --- .../layout-land/fragment_videoitem_detail.xml | 16 +-- .../fragment_videoitem_detail.xml | 16 +-- .../res/layout/fragment_videoitem_detail.xml | 16 +-- app/src/main/res/layout/video_item.xml | 103 +++++++++--------- app/src/main/res/values-land/dimens.xml | 42 +++++-- app/src/main/res/values-sw600dp/dimens.xml | 21 ++-- app/src/main/res/values/dimens.xml | 43 ++++++-- 7 files changed, 153 insertions(+), 104 deletions(-) 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 0a00c4045..f1c3707ea 100644 --- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml +++ b/app/src/main/res/layout-land/fragment_videoitem_detail.xml @@ -57,7 +57,7 @@ android:layout_alignParentStart="true" android:textStyle="bold" android:paddingBottom="3dp" - android:textSize="@dimen/text_video_title_size" + android:textSize="@dimen/video_item_detail_title_text_size" android:textAppearance="?android:attr/textAppearanceLarge"/> @@ -119,7 +119,7 @@ android:layout_toStartOf="@id/detailThumbsDownImgView" android:paddingRight="5dp" android:paddingLeft="5dp" - android:textSize="@dimen/text_video_like_size" + android:textSize="@dimen/video_item_detail_likes_text_size" android:textAppearance="?android:attr/textAppearanceMedium"/> @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:textSize="@dimen/text_video_upload_date_size" + android:textSize="@dimen/video_item_detail_upload_date_text_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:text="@string/nextVideoTitle" 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 0a00c4045..f1c3707ea 100644 --- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml +++ b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml @@ -57,7 +57,7 @@ android:layout_alignParentStart="true" android:textStyle="bold" android:paddingBottom="3dp" - android:textSize="@dimen/text_video_title_size" + android:textSize="@dimen/video_item_detail_title_text_size" android:textAppearance="?android:attr/textAppearanceLarge"/> @@ -119,7 +119,7 @@ android:layout_toStartOf="@id/detailThumbsDownImgView" android:paddingRight="5dp" android:paddingLeft="5dp" - android:textSize="@dimen/text_video_like_size" + android:textSize="@dimen/video_item_detail_likes_text_size" android:textAppearance="?android:attr/textAppearanceMedium"/> @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:textSize="@dimen/text_video_upload_date_size" + android:textSize="@dimen/video_item_detail_upload_date_text_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:text="@string/nextVideoTitle" diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml index 0ef9f9acb..35f6e01b0 100644 --- a/app/src/main/res/layout/fragment_videoitem_detail.xml +++ b/app/src/main/res/layout/fragment_videoitem_detail.xml @@ -57,7 +57,7 @@ android:layout_alignParentStart="true" android:textStyle="bold" android:paddingBottom="3dp" - android:textSize="@dimen/text_video_title_size" + android:textSize="@dimen/video_item_detail_title_text_size" android:textAppearance="?android:attr/textAppearanceLarge"/> @@ -119,7 +119,7 @@ android:layout_toStartOf="@id/detailThumbsDownImgView" android:paddingRight="5dp" android:paddingLeft="5dp" - android:textSize="@dimen/text_video_like_size" + android:textSize="@dimen/video_item_detail_likes_text_size" android:textAppearance="?android:attr/textAppearanceMedium"/> @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:textSize="@dimen/text_video_upload_date_size" + android:textSize="@dimen/video_item_detail_upload_date_text_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:text="@string/nextVideoTitle" diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml index a38f2b9b9..eacb5f88f 100644 --- a/app/src/main/res/layout/video_item.xml +++ b/app/src/main/res/layout/video_item.xml @@ -4,7 +4,7 @@ xmlns:card_view="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="6dp"> + android:padding="@dimen/video_item_search_card_margin"> + card_view:cardCornerRadius="@dimen/video_item_search_card_radius" > - + android:layout_marginRight="@dimen/video_item_search_image_right_margin" + android:padding="@dimen/video_item_search_card_padding"> - - - + android:layout_height="wrap_content"> - - - - - + + + + + + + + + + + - + \ No newline at end of file diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 008c66dfb..68a141f42 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -1,14 +1,36 @@ - 14sp - 11sp - 12sp - 12sp + + + + + 14sp + 11sp + 12sp + 12sp + + 140dp + 80dp + 14sp + 14sp + + 6dp + 6dp + 6dp + 1sp + 5sp + 2sp + + 4dp - 24sp - 18sp - 16sp - 18sp - 18sp - 18sp + + + + + 24sp + 18sp + 16sp + 18sp + 18sp + 18sp \ 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 index 31b3d148a..4c547e7f3 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -1,14 +1,13 @@ - 14sp - 11sp - 12sp - 12sp - - 20sp - 16sp - 14sp - 16sp - 16sp - 16sp + + + + + 20sp + 16sp + 14sp + 16sp + 16sp + 16sp \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 9e74b58ea..9cf3c0c67 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,14 +1,37 @@ - 14sp - 11sp - 12sp - 12sp + + + + + 14sp + 11sp + 12sp + 12sp + + 140dp + 80dp + 14sp + 14sp + + 6dp + 6dp + 6dp + 1sp + 5sp + 2sp + + 4dp + + + + + + 18sp + 14sp + 12sp + 14sp + 14sp + 14sp - 18sp - 14sp - 12sp - 14sp - 14sp - 14sp \ No newline at end of file