diff options
| author | Lars Greiss <kufikugel@googlemail.com> | 2014-03-11 00:21:29 +0100 |
|---|---|---|
| committer | Lars Greiss <kufikugel@googlemail.com> | 2014-03-16 14:42:56 +0100 |
| commit | d64cbea17ae4f3a0f865f6fc4841b55a709c8110 (patch) | |
| tree | 89e6f7e2fd334c62ac088dea3b3ee941a46404b8 | |
| parent | 0541b04a943520dc94f1c9fd861e07dd8b7dfd3f (diff) | |
Cardslib: make it RTL/LTR aware (2/3)
to support new FB feature and RTL compatiblity
Change-Id: Iefe29c254f80b6ee3c98aa143b44ff59ade059d4
| -rw-r--r-- | res/layout/base_header_layout.xml | 4 | ||||
| -rw-r--r-- | res/layout/inner_base_header.xml | 4 | ||||
| -rw-r--r-- | res/values/dimens.xml | 44 | ||||
| -rw-r--r-- | res/values/styles.xml | 50 | ||||
| -rw-r--r-- | res/values/styles_undo.xml | 16 |
5 files changed, 59 insertions, 59 deletions
diff --git a/res/layout/base_header_layout.xml b/res/layout/base_header_layout.xml index 841d4fa..a031925 100644 --- a/res/layout/base_header_layout.xml +++ b/res/layout/base_header_layout.xml @@ -25,7 +25,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" style="@style/card.header_compound_view"> <!-- This is the Inner Content Header which you can populate runtime @@ -42,7 +42,7 @@ android:id="@+id/card_header_button_frame" style="@style/card.header_button_frame" android:layout_alignParentTop="true" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_width="wrap_content" android:layout_height="wrap_content"> diff --git a/res/layout/inner_base_header.xml b/res/layout/inner_base_header.xml index 4ab0f93..4ae8b27 100644 --- a/res/layout/inner_base_header.xml +++ b/res/layout/inner_base_header.xml @@ -29,9 +29,7 @@ You can customize it with your layout xml file and your CardHeader. You can popolate your elements with CardHeader#setupInnerViewElements(android.view.ViewGroup, android.view.View) method --> <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" android:id="@+id/card_header_inner_simple_title" style="@style/card.header_simple_title"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index eb6942c..74bd074 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -25,46 +25,46 @@ <!-- Main --> <dimen name="card_main_layout_view_margin_top">0dp</dimen> - <dimen name="card_main_layout_view_margin_left">0dp</dimen> + <dimen name="card_main_layout_view_margin_start">0dp</dimen> <dimen name="card_main_layout_view_margin_bottom">0dp</dimen> - <dimen name="card_main_layout_view_margin_right">0dp</dimen> + <dimen name="card_main_layout_view_margin_end">0dp</dimen> <!-- Header --> <dimen name="card_header_outer_view_margin_top">0dp</dimen> - <dimen name="card_header_outer_view_margin_left">0dp</dimen> + <dimen name="card_header_outer_view_margin_start">0dp</dimen> <dimen name="card_header_outer_view_margin_bottom">0dp</dimen> - <dimen name="card_header_outer_view_margin_right">0dp</dimen> + <dimen name="card_header_outer_view_margin_end">0dp</dimen> <!--Button Header --> - <dimen name="card_header_button_padding_left">10dp</dimen> - <dimen name="card_header_button_padding_right">0dp</dimen> + <dimen name="card_header_button_padding_start">10dp</dimen> + <dimen name="card_header_button_padding_end">0dp</dimen> <dimen name="card_header_button_padding_bottom">0dp</dimen> <dimen name="card_header_button_padding_top">0dp</dimen> - <dimen name="card_header_button_margin_right">2dp</dimen> - <dimen name="card_header_button_overflow_margin_right">3dp</dimen> + <dimen name="card_header_button_margin_end">2dp</dimen> + <dimen name="card_header_button_overflow_margin_end">3dp</dimen> <!-- Title Header --> - <dimen name="card_header_simple_title_margin_left">10dp</dimen> + <dimen name="card_header_simple_title_margin_start">10dp</dimen> <dimen name="card_header_simple_title_margin_top">5dp</dimen> <dimen name="card_header_simple_title_text_size">20sp</dimen> - <dimen name="card_header_simple_title_margin_right">20dp</dimen> + <dimen name="card_header_simple_title_margin_end">20dp</dimen> <dimen name="card_header_simple_title_margin_bottom">0dp</dimen> <!-- Content --> <dimen name="card_content_outer_view_margin_top">0dp</dimen> - <dimen name="card_content_outer_view_margin_left">0dp</dimen> + <dimen name="card_content_outer_view_margin_start">0dp</dimen> <dimen name="card_content_outer_view_margin_bottom">0dp</dimen> - <dimen name="card_content_outer_view_margin_right">0dp</dimen> + <dimen name="card_content_outer_view_margin_end">0dp</dimen> - <dimen name="card_main_simple_title_margin_left">5dp</dimen> + <dimen name="card_main_simple_title_margin_start">5dp</dimen> <dimen name="card_main_simple_title_margin_top">0dp</dimen> <!-- Shadow --> <dimen name="card_shadow_height">3dp</dimen> <dimen name="card_shadow_view_margin_top">0dp</dimen> - <dimen name="card_shadow_view_margin_left">@dimen/card_background_default_radius</dimen> + <dimen name="card_shadow_view_margin_start">@dimen/card_background_default_radius</dimen> <dimen name="card_shadow_view_margin_bottom">0dp</dimen> - <dimen name="card_shadow_view_margin_right">@dimen/card_background_default_radius</dimen> + <dimen name="card_shadow_view_margin_end">@dimen/card_background_default_radius</dimen> <!-- Thumbnail --> <dimen name="card_thumbnail_width">72dp</dimen> @@ -72,23 +72,23 @@ <!-- Expand --> <dimen name="card_expand_layout_padding">2dp</dimen> - <dimen name="card_expand_simple_title_paddingLeft">10dp</dimen> - <dimen name="card_expand_simple_title_paddingRight">10dp</dimen> + <dimen name="card_expand_simple_title_paddingStart">10dp</dimen> + <dimen name="card_expand_simple_title_paddingEnd">10dp</dimen> <dimen name="card_expand_simple_title_text_size">14sp</dimen> <!-- List --> - <dimen name="list_card_padding_left">8dp</dimen> - <dimen name="list_card_padding_right">8dp</dimen> + <dimen name="list_card_padding_start">8dp</dimen> + <dimen name="list_card_padding_end">8dp</dimen> <dimen name="list_card_padding_bottom">6dp</dimen> <dimen name="list_card_padding_top">2dp</dimen> <!-- Grid --> - <dimen name="grid_card_padding_left">2dp</dimen> - <dimen name="grid_card_padding_right">2dp</dimen> + <dimen name="grid_card_padding_start">2dp</dimen> + <dimen name="grid_card_padding_end">2dp</dimen> <dimen name="grid_card_padding_bottom">2dp</dimen> <dimen name="grid_card_padding_top">2dp</dimen> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2e48427..7e3be33 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -28,8 +28,8 @@ <style name="card.shadow_outer_layout"> <item name="android:layout_marginTop">@dimen/card_shadow_view_margin_top</item> <item name="android:layout_marginBottom">@dimen/card_shadow_view_margin_bottom</item> - <item name="android:layout_marginLeft">@dimen/card_shadow_view_margin_left</item> - <item name="android:layout_marginRight">@dimen/card_shadow_view_margin_right</item> + <item name="android:layout_marginStart">@dimen/card_shadow_view_margin_start</item> + <item name="android:layout_marginEnd">@dimen/card_shadow_view_margin_end</item> </style> <!--Style for shadow image--> @@ -45,8 +45,8 @@ <style name="card.header_outer_layout"> <item name="android:layout_marginTop">@dimen/card_header_outer_view_margin_top</item> <item name="android:layout_marginBottom">@dimen/card_header_outer_view_margin_bottom</item> - <item name="android:layout_marginLeft">@dimen/card_header_outer_view_margin_left</item> - <item name="android:layout_marginRight">@dimen/card_header_outer_view_margin_right</item> + <item name="android:layout_marginStart">@dimen/card_header_outer_view_margin_start</item> + <item name="android:layout_marginEnd">@dimen/card_header_outer_view_margin_end</item> </style> <!--Style for Header Compound View --> @@ -56,13 +56,15 @@ <!--Style for simple title header inner view--> <style name="card.header_simple_title"> - <item name="android:layout_gravity">left|center_vertical</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_gravity">start|center_vertical</item> <item name="android:fontFamily">sans-serif-condensed</item> <item name="android:textColor">@color/card_text_color_header</item> <item name="android:textSize">@dimen/card_header_simple_title_text_size</item> - <item name="android:layout_marginLeft">@dimen/card_header_simple_title_margin_left</item> + <item name="android:layout_marginStart">@dimen/card_header_simple_title_margin_start</item> <item name="android:layout_marginTop">@dimen/card_header_simple_title_margin_top</item> - <item name="android:layout_marginRight">@dimen/card_header_simple_title_margin_right</item> + <item name="android:layout_marginEnd">@dimen/card_header_simple_title_margin_end</item> <item name="android:layout_marginBottom">@dimen/card_header_simple_title_margin_bottom</item> </style> @@ -76,19 +78,19 @@ <style name="card.header_button_base"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:layout_alignParentRight">true</item> - <item name="android:paddingLeft">@dimen/card_header_button_padding_left</item> + <item name="android:layout_alignParentEnd">true</item> + <item name="android:paddingStart">@dimen/card_header_button_padding_start</item> <item name="android:focusable">false</item> <item name="android:focusableInTouchMode">false</item> <item name="android:clickable">true</item> <item name="android:layout_centerVertical">true</item> - <item name="android:layout_marginRight">@dimen/card_header_button_margin_right</item> + <item name="android:layout_marginEnd">@dimen/card_header_button_margin_end</item> </style> <!-- Button Overflow in Header --> <style name="card.header_button_base.overflow" > <item name="android:background">@drawable/card_menu_button_rounded_overflow</item> - <item name="android:layout_marginRight">@dimen/card_header_button_overflow_margin_right</item> + <item name="android:layout_marginEnd">@dimen/card_header_button_overflow_margin_end</item> </style> <!-- Button to Expand/Collapse in Header --> @@ -110,16 +112,16 @@ <item name="android:minHeight">@dimen/card_base_empty_height</item> <item name="android:layout_marginTop">@dimen/card_content_outer_view_margin_top</item> <item name="android:layout_marginBottom">@dimen/card_content_outer_view_margin_bottom</item> - <item name="android:layout_marginLeft">@dimen/card_content_outer_view_margin_left</item> - <item name="android:layout_marginRight">@dimen/card_content_outer_view_margin_right</item> + <item name="android:layout_marginStart">@dimen/card_content_outer_view_margin_start</item> + <item name="android:layout_marginEnd">@dimen/card_content_outer_view_margin_end</item> </style> <!--Style for simple title inner main view--> <style name="card.base_simple_title"> <item name="android:textStyle">bold</item> <item name="android:fontFamily">sans-serif</item> - <item name="android:layout_gravity">left|center_vertical</item> - <item name="android:layout_marginLeft">@dimen/card_main_simple_title_margin_left</item> + <item name="android:layout_gravity">start|center_vertical</item> + <item name="android:layout_marginStart">@dimen/card_main_simple_title_margin_start</item> <item name="android:layout_marginTop">@dimen/card_main_simple_title_margin_top</item> </style> @@ -131,8 +133,8 @@ <item name="android:background">@drawable/card_selector</item> <item name="android:layout_marginTop">@dimen/card_main_layout_view_margin_top</item> <item name="android:layout_marginBottom">@dimen/card_main_layout_view_margin_bottom</item> - <item name="android:layout_marginLeft">@dimen/card_main_layout_view_margin_left</item> - <item name="android:layout_marginRight">@dimen/card_main_layout_view_margin_right</item> + <item name="android:layout_marginStart">@dimen/card_main_layout_view_margin_start</item> + <item name="android:layout_marginEnd">@dimen/card_main_layout_view_margin_end</item> </style> <!-- Style for Hidden Expand Layout ****************************************--> @@ -145,12 +147,12 @@ <!--Style for simple title expand/collapse inner view--> <style name="card.expand_simple_title"> - <item name="android:layout_gravity">left|center_vertical</item> + <item name="android:layout_gravity">start|center_vertical</item> <item name="android:gravity">center_vertical</item> <item name="android:fontFamily">sans-serif-condensed</item> <item name="android:textSize">@dimen/card_expand_simple_title_text_size</item> - <item name="android:paddingLeft">@dimen/card_expand_simple_title_paddingLeft</item> - <item name="android:paddingRight">@dimen/card_expand_simple_title_paddingRight</item> + <item name="android:paddingStart">@dimen/card_expand_simple_title_paddingStart</item> + <item name="android:paddingEnd">@dimen/card_expand_simple_title_paddingEnd</item> <item name="android:textColor">@color/card_expand_title_color</item> </style> @@ -176,8 +178,8 @@ <!-- Style for Lists ******************************************************--> <style name="list_card"> - <item name="android:paddingLeft">@dimen/list_card_padding_left</item> - <item name="android:paddingRight">@dimen/list_card_padding_right</item> + <item name="android:paddingStart">@dimen/list_card_padding_start</item> + <item name="android:paddingEnd">@dimen/list_card_padding_end</item> <item name="android:paddingBottom">@dimen/list_card_padding_bottom</item> <item name="android:paddingTop">@dimen/list_card_padding_top</item> </style> @@ -194,8 +196,8 @@ </style> <style name="grid_card"> - <item name="android:paddingLeft">@dimen/grid_card_padding_left</item> - <item name="android:paddingRight">@dimen/grid_card_padding_right</item> + <item name="android:paddingStart">@dimen/grid_card_padding_start</item> + <item name="android:paddingEnd">@dimen/grid_card_padding_end</item> <item name="android:paddingBottom">@dimen/grid_card_padding_bottom</item> <item name="android:paddingTop">@dimen/grid_card_padding_top</item> </style> diff --git a/res/values/styles_undo.xml b/res/values/styles_undo.xml index e85ba81..b52f5c3 100644 --- a/res/values/styles_undo.xml +++ b/res/values/styles_undo.xml @@ -24,8 +24,8 @@ <item name="android:layout_width">match_parent</item> <item name="android:layout_height">48dp</item> <item name="android:layout_gravity">bottom</item> - <item name="android:layout_marginLeft">8dp</item> - <item name="android:layout_marginRight">8dp</item> + <item name="android:layout_marginStart">8dp</item> + <item name="android:layout_marginEnd">8dp</item> <item name="android:layout_marginBottom">16dp</item> <item name="android:orientation">horizontal</item> <item name="android:background">@drawable/undobar</item> @@ -39,9 +39,9 @@ <item name="android:layout_width">0dp</item> <item name="android:layout_weight">1</item> <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginLeft">16dp</item> + <item name="android:layout_marginStart">16dp</item> <item name="android:layout_gravity">center_vertical</item> - <item name="android:layout_marginRight">16dp</item> + <item name="android:layout_marginEnd">16dp</item> <item name="android:textAppearance">?android:textAppearanceSmall</item> <item name="android:textColor">#fff</item> @@ -50,10 +50,10 @@ <style name="list_card_UndoBarButton"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> - <item name="android:paddingLeft">16dp</item> - <item name="android:paddingRight">16dp</item> + <item name="android:paddingStart">16dp</item> + <item name="android:paddingEnd">16dp</item> <item name="android:background">@drawable/card_undo</item> - <item name="android:drawableLeft">@drawable/ic_undobar_undo</item> + <item name="android:drawableStart">@drawable/ic_undobar_undo</item> <item name="android:drawablePadding">12dp</item> <item name="android:textAppearance">?android:textAppearanceSmall</item> <item name="android:textAllCaps">true</item> @@ -62,4 +62,4 @@ <item name="android:text">@string/list_card_undo_title</item> </style> -</resources>
\ No newline at end of file +</resources> |
