diff options
Diffstat (limited to 'library/main/res')
-rw-r--r-- | library/main/res/color-v23/suw_flat_button_highlight.xml | 2 | ||||
-rw-r--r-- | library/main/res/values-as/strings.xml | 23 | ||||
-rw-r--r-- | library/main/res/values-night/styles.xml | 26 | ||||
-rw-r--r-- | library/main/res/values-or/strings.xml | 23 | ||||
-rw-r--r-- | library/main/res/values-v21/styles.xml | 6 | ||||
-rw-r--r-- | library/main/res/values/attrs.xml | 1 | ||||
-rw-r--r-- | library/main/res/values/dimens.xml | 5 | ||||
-rw-r--r-- | library/main/res/values/styles.xml | 13 |
8 files changed, 86 insertions, 13 deletions
diff --git a/library/main/res/color-v23/suw_flat_button_highlight.xml b/library/main/res/color-v23/suw_flat_button_highlight.xml index c5be14f..cdb1305 100644 --- a/library/main/res/color-v23/suw_flat_button_highlight.xml +++ b/library/main/res/color-v23/suw_flat_button_highlight.xml @@ -17,5 +17,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:color="?android:attr/colorAccent" - android:alpha="0.24" /> + android:alpha="?attr/suwButtonHighlightAlpha" /> </selector> diff --git a/library/main/res/values-as/strings.xml b/library/main/res/values-as/strings.xml new file mode 100644 index 0000000..be6e06b --- /dev/null +++ b/library/main/res/values-as/strings.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="suw_next_button_label" msgid="7269625133873553978">"পৰৱৰ্তী"</string> + <string name="suw_back_button_label" msgid="1460929053642711025">"উভতি যাওক"</string> + <string name="suw_more_button_label" msgid="7769076059705546563">"অধিক"</string> +</resources> diff --git a/library/main/res/values-night/styles.xml b/library/main/res/values-night/styles.xml new file mode 100644 index 0000000..912e149 --- /dev/null +++ b/library/main/res/values-night/styles.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2018 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + + <!-- DayNight themes --> + <style name="SuwThemeMaterial.DayNight" parent="SuwThemeMaterial" /> + <style name="SuwThemeGlif.DayNight" parent="SuwThemeGlif" /> + <style name="SuwThemeGlifV2.DayNight" parent="SuwThemeGlifV2" /> + <style name="SuwThemeGlifV3.DayNight" parent="SuwThemeGlifV3" /> + +</resources> diff --git a/library/main/res/values-or/strings.xml b/library/main/res/values-or/strings.xml new file mode 100644 index 0000000..c4d12ff --- /dev/null +++ b/library/main/res/values-or/strings.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="suw_next_button_label" msgid="7269625133873553978">"ପରବର୍ତ୍ତୀ"</string> + <string name="suw_back_button_label" msgid="1460929053642711025">"ପଛକୁ ଫେରନ୍ତୁ"</string> + <string name="suw_more_button_label" msgid="7769076059705546563">"ଅଧିକ"</string> +</resources> diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml index d2c27f6..fe71289 100644 --- a/library/main/res/values-v21/styles.xml +++ b/library/main/res/values-v21/styles.xml @@ -38,10 +38,6 @@ <!-- Button styles --> - <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary"> - <item name="android:fontFamily">sans-serif-medium</item> - </style> - <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" /> <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> @@ -50,6 +46,8 @@ <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item> <item name="android:indeterminateTint">@null</item> <item name="android:indeterminateTintMode">@null</item> + <item name="android:paddingStart">@dimen/suw_glif_progress_bar_padding</item> + <item name="android:paddingEnd">@dimen/suw_glif_progress_bar_padding</item> </style> <!-- Items styles --> diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index b3fcfe9..86b27fa 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -21,6 +21,7 @@ <attr name="suwLayoutTheme" format="reference" /> <attr name="suwMarginSides" format="dimension|reference" /> <attr name="suwEditTextBackgroundColor" format="color" /> + <attr name="suwButtonHighlightAlpha" format="float" /> <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only horizontal values are listed here as the header does not support vertical gravity. --> diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml index 1a8b516..63980ab 100644 --- a/library/main/res/values/dimens.xml +++ b/library/main/res/values/dimens.xml @@ -31,7 +31,7 @@ <dimen name="suw_glif_footer_padding_vertical">8dp</dimen> <dimen name="suw_glif_footer_min_height">72dp</dimen> <dimen name="suw_glif_margin_sides">24dp</dimen> - <dimen name="suw_glif_margin_top">48dp</dimen> + <dimen name="suw_glif_margin_top">56dp</dimen> <dimen name="suw_glif_v3_button_corner_radius">4dp</dimen> @@ -98,7 +98,7 @@ <!-- This is the extra spacing required to make the leading exactly 32sp --> <dimen name="suw_header_title_line_spacing_extra">3.67sp</dimen> - <dimen name="suw_glif_header_title_margin_top">15dp</dimen> + <dimen name="suw_glif_header_title_margin_top">16dp</dimen> <dimen name="suw_glif_header_title_margin_bottom">2dp</dimen> <dimen name="suw_glif_icon_max_height">32dp</dimen> @@ -139,6 +139,7 @@ <!-- The margin to compensate for the padding built-in to the widget itself --> <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen> <dimen name="suw_glif_progress_bar_margin_vertical">7dp</dimen> + <dimen name="suw_glif_progress_bar_padding">40dp</dimen> <!-- Edit Text dimensions --> <dimen name="suw_edit_text_min_height">56dp</dimen> diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index fa2a080..34a917f 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -58,6 +58,12 @@ <item name="android:activityCloseExitAnimation">@anim/suw_slide_back_out</item> </style> + <!-- DayNight themes --> + <style name="SuwThemeMaterial.DayNight" parent="SuwThemeMaterial.Light" /> + <style name="SuwThemeGlif.DayNight" parent="SuwThemeGlif.Light" /> + <style name="SuwThemeGlifV2.DayNight" parent="SuwThemeGlifV2.Light" /> + <style name="SuwThemeGlifV3.DayNight" parent="SuwThemeGlifV3.Light" /> + <!-- Content styles --> <!-- Ignore UnusedResources: Used by clients --> @@ -166,7 +172,7 @@ <!-- Before Honeycomb, layout_gravity is needed for FrameLayout to apply the margins --> <item name="android:layout_gravity">top</item> <item name="android:ellipsize">end</item> - <item name="android:maxLines">2</item> + <item name="android:maxLines">3</item> <item name="android:textSize">@dimen/suw_header_title_size</item> </style> @@ -204,11 +210,6 @@ <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> </style> - <!-- Ignore UnusedResources: used by clients --> - <style name="SuwGlifButton.Tertiary" - parent="SuwGlifButton.BaseTertiary" - tools:ignore="UnusedResources" /> - <!-- The start and end paddings are asymmetric because start buttons are borderless buttons which aligns the text label. --> <style name="SuwGlifButtonBar"> |