diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/activity_main.xml | 20 | ||||
| -rw-r--r-- | res/layout/audible_card.xml | 4 | ||||
| -rw-r--r-- | res/layout/bootanim_card.xml | 4 | ||||
| -rw-r--r-- | res/layout/bottom_actions.xml | 22 | ||||
| -rw-r--r-- | res/layout/component_selector.xml | 7 | ||||
| -rw-r--r-- | res/layout/font_card.xml | 4 | ||||
| -rw-r--r-- | res/layout/fragment_pager_list.xml | 89 | ||||
| -rw-r--r-- | res/layout/icon_card.xml | 4 | ||||
| -rw-r--r-- | res/layout/navbar_card.xml | 4 | ||||
| -rw-r--r-- | res/layout/per_app_theme_list.xml | 5 | ||||
| -rw-r--r-- | res/layout/save_apply_button.xml | 42 | ||||
| -rw-r--r-- | res/layout/status_bar_card.xml | 4 | ||||
| -rw-r--r-- | res/layout/style_card.xml | 4 | ||||
| -rw-r--r-- | res/layout/title_card.xml | 105 | ||||
| -rw-r--r-- | res/layout/wallpaper_component_selection_item.xml | 4 |
15 files changed, 167 insertions, 155 deletions
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 01a91a6..552bed3 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -29,7 +29,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:layout_gravity="center_vertical"> - <org.cyanogenmod.theme.chooser.PagerContainer + <org.cyanogenmod.theme.chooser2.PagerContainer android:id="@+id/pager_container" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -38,14 +38,22 @@ <android.support.v4.view.ThemeViewPager android:id="@+id/viewpager" android:layout_width="@dimen/theme_fragment_width" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:overScrollMode="never"/> - </org.cyanogenmod.theme.chooser.PagerContainer> + </org.cyanogenmod.theme.chooser2.PagerContainer> </LinearLayout> - <include layout="@layout/component_selector"/> - <include layout="@layout/save_apply_button"/> - <include layout="@layout/bottom_actions"/> + <!-- wrap the below layouts for fitting to the system windows --> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + + <include layout="@layout/component_selector"/> + <include layout="@layout/save_apply_button"/> + <include layout="@layout/bottom_actions"/> + + </FrameLayout> </FrameLayout> diff --git a/res/layout/audible_card.xml b/res/layout/audible_card.xml index 764a04e..b8856d1 100644 --- a/res/layout/audible_card.xml +++ b/res/layout/audible_card.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentCardView +<org.cyanogenmod.theme.chooser2.ComponentCardView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -65,4 +65,4 @@ android:src="@drawable/ic_addcomponent"/> </LinearLayout> </FrameLayout> -</org.cyanogenmod.theme.chooser.ComponentCardView> +</org.cyanogenmod.theme.chooser2.ComponentCardView> diff --git a/res/layout/bootanim_card.xml b/res/layout/bootanim_card.xml index ad3cb01..c3a0f1b 100644 --- a/res/layout/bootanim_card.xml +++ b/res/layout/bootanim_card.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentCardView +<org.cyanogenmod.theme.chooser2.ComponentCardView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/bootani_preview_container" android:layout_width="match_parent" @@ -51,4 +51,4 @@ android:src="@drawable/ic_addcomponent"/> </LinearLayout> </FrameLayout> -</org.cyanogenmod.theme.chooser.ComponentCardView> +</org.cyanogenmod.theme.chooser2.ComponentCardView> diff --git a/res/layout/bottom_actions.xml b/res/layout/bottom_actions.xml index 67f8461..ef4225d 100644 --- a/res/layout/bottom_actions.xml +++ b/res/layout/bottom_actions.xml @@ -34,7 +34,8 @@ android:id="@+id/per_app_theming" android:layout_width="80dp" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:background="@drawable/bottom_action_item_background"> <FrameLayout android:layout_width="match_parent" @@ -45,13 +46,22 @@ android:layout_gravity="top|center_horizontal" android:layout_margin="8dp" android:src="@drawable/ic_appthemer"/> - <ImageView + <org.cyanogenmod.theme.widget.LatoTextView android:id="@+id/new_tag" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|left" android:layout_marginLeft="6dp" - android:src="@drawable/tag_new" + android:paddingStart="4dp" + android:paddingEnd="4dp" + android:gravity="center" + android:text="@string/new_feature_label" + android:textAllCaps="true" + android:textSize="10dp" + android:textColor="@color/tag_text_color" + android:textStyle="bold" + android:fontFamily="sans-serif-condensed" + android:background="@drawable/bg_tag_new" android:visibility="gone"/> </FrameLayout> @@ -69,7 +79,8 @@ android:layout_width="80dp" android:layout_height="wrap_content" android:layout_marginLeft="20dp" - android:orientation="vertical"> + android:orientation="vertical" + android:background="@drawable/bottom_action_item_background"> <ImageView android:layout_width="30dp" @@ -89,7 +100,4 @@ </LinearLayout> - <org.cyanogenmod.theme.widget.NavBarSpace - android:layout_width="match_parent" - android:layout_height="@dimen/navigation_bar_height"/> </LinearLayout> diff --git a/res/layout/component_selector.xml b/res/layout/component_selector.xml index 14b13de..42be00b 100644 --- a/res/layout/component_selector.xml +++ b/res/layout/component_selector.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentSelector +<org.cyanogenmod.theme.chooser2.ComponentSelector xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/component_selector" android:orientation="vertical" @@ -42,7 +42,4 @@ </org.cyanogenmod.theme.widget.AutoSnapHorizontalScrollView> - <org.cyanogenmod.theme.widget.NavBarSpace - android:layout_width="match_parent" - android:layout_height="@dimen/navigation_bar_height"/> -</org.cyanogenmod.theme.chooser.ComponentSelector>
\ No newline at end of file +</org.cyanogenmod.theme.chooser2.ComponentSelector>
\ No newline at end of file diff --git a/res/layout/font_card.xml b/res/layout/font_card.xml index 3b4808d..3a58f93 100644 --- a/res/layout/font_card.xml +++ b/res/layout/font_card.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentCardView +<org.cyanogenmod.theme.chooser2.ComponentCardView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/font_preview_container" android:layout_width="match_parent" @@ -64,4 +64,4 @@ android:src="@drawable/ic_addcomponent"/> </LinearLayout> </FrameLayout> -</org.cyanogenmod.theme.chooser.ComponentCardView> +</org.cyanogenmod.theme.chooser2.ComponentCardView> diff --git a/res/layout/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml index ca1d092..609dbaa 100644 --- a/res/layout/fragment_pager_list.xml +++ b/res/layout/fragment_pager_list.xml @@ -77,90 +77,7 @@ </FrameLayout> <!-- Title card --> - <FrameLayout - android:id="@+id/title_card" - android:layout_width="@dimen/theme_preview_width" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:background="@drawable/card_themepreview_bg"> - <LinearLayout - android:id="@+id/title_layout" - android:layout_width="match_parent" - android:layout_height="@dimen/title_card_height" - android:alpha="0"> - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" - android:orientation="vertical"> - <org.cyanogenmod.theme.widget.LatoTextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:textColor="@color/theme_title_text_color"/> - <org.cyanogenmod.theme.widget.LatoTextView - android:id="@+id/author" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:textColor="@color/theme_author_text_color" - android:textSize="14dp" /> - </LinearLayout> - <ImageView - android:id="@+id/customize" - android:layout_width="47dp" - android:layout_height="match_parent" - android:scaleType="center" - android:src="@drawable/ic_theme_customize"/> - - <ImageView - android:id="@+id/overflow" - android:layout_width="36dp" - android:layout_height="match_parent" - android:layout_marginStart="1dp" - android:layout_marginEnd="8dp" - android:scaleType="center" - android:src="@drawable/ic_overflow_dark" - android:visibility="gone"/> - - <ImageView - android:id="@+id/delete" - android:layout_width="36dp" - android:layout_height="match_parent" - android:layout_marginStart="1dp" - android:layout_marginEnd="8dp" - android:scaleType="center" - android:src="@drawable/ic_theme_delete"/> - - <ImageView - android:id="@+id/reset" - android:layout_width="36dp" - android:layout_height="match_parent" - android:layout_marginStart="1dp" - android:layout_marginEnd="8dp" - android:scaleType="center" - android:src="@drawable/ic_theme_reset" - android:visibility="gone"/> - </LinearLayout> - <ProgressBar - android:id="@+id/apply_progress" - android:layout_width="match_parent" - android:layout_height="@dimen/apply_progress_height" - android:layout_gravity="center_vertical|right" - android:paddingStart="@dimen/apply_progress_padding" - android:paddingEnd="@dimen/apply_progress_padding" - android:indeterminate="false" - android:max="100" - android:progress="0" - android:progressDrawable="@drawable/apply_progress_bar" - android:visibility="gone" - style="@android:style/Widget.ProgressBar.Horizontal"/> - </FrameLayout> + <include layout="@layout/title_card"/> <!-- Each card in this layout should have a Space below it with one final Space for devices that have a navbar --> @@ -171,7 +88,7 @@ android:orientation="vertical" android:layout_marginTop="@dimen/additional_cards_margin_top" android:visibility="invisible"> - <org.cyanogenmod.theme.chooser.WallpaperCardView + <org.cyanogenmod.theme.chooser2.WallpaperCardView android:id="@+id/wallpaper_card" android:layout_width="match_parent" android:layout_height="@dimen/wallpaper_card_height" @@ -179,7 +96,7 @@ /> <Space android:layout_width="match_parent" android:layout_height="@dimen/expanded_card_margin_top" /> - <org.cyanogenmod.theme.chooser.WallpaperCardView + <org.cyanogenmod.theme.chooser2.WallpaperCardView android:id="@+id/lockscreen_card" android:visibility="gone" android:layout_width="match_parent" diff --git a/res/layout/icon_card.xml b/res/layout/icon_card.xml index 1cf454b..591a1a4 100644 --- a/res/layout/icon_card.xml +++ b/res/layout/icon_card.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentCardView +<org.cyanogenmod.theme.chooser2.ComponentCardView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/icon_container" android:layout_width="match_parent" @@ -76,4 +76,4 @@ android:src="@drawable/ic_addcomponent"/> </LinearLayout> </FrameLayout> -</org.cyanogenmod.theme.chooser.ComponentCardView>
\ No newline at end of file +</org.cyanogenmod.theme.chooser2.ComponentCardView>
\ No newline at end of file diff --git a/res/layout/navbar_card.xml b/res/layout/navbar_card.xml index b196f6a..437f4c3 100644 --- a/res/layout/navbar_card.xml +++ b/res/layout/navbar_card.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentCardView +<org.cyanogenmod.theme.chooser2.ComponentCardView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/navigation_bar_container" android:layout_width="match_parent" @@ -92,4 +92,4 @@ android:src="@drawable/ic_addcomponent"/> </LinearLayout> </FrameLayout> -</org.cyanogenmod.theme.chooser.ComponentCardView>
\ No newline at end of file +</org.cyanogenmod.theme.chooser2.ComponentCardView>
\ No newline at end of file diff --git a/res/layout/per_app_theme_list.xml b/res/layout/per_app_theme_list.xml index be595c9..1feb993 100644 --- a/res/layout/per_app_theme_list.xml +++ b/res/layout/per_app_theme_list.xml @@ -34,14 +34,15 @@ android:elevation="10dp" android:layout_marginLeft="@dimen/theme_list_side_margin" android:layout_marginRight="@dimen/theme_list_side_margin" - android:background="@drawable/per_app_theme_list_background"/> + android:background="@drawable/per_app_theme_list_background" + android:listSelector="@drawable/per_app_theme_list_item_background"/> <TextView android:id="@+id/applying_theme_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:textColor="@color/per_app_theme_list_item_text_color" + android:textColor="@color/per_app_theme_applying_text_color" android:text="@string/per_app_theme_applying" android:textSize="16dp" android:alpha="0"/> diff --git a/res/layout/save_apply_button.xml b/res/layout/save_apply_button.xml index ac0fee9..1009c9c 100644 --- a/res/layout/save_apply_button.xml +++ b/res/layout/save_apply_button.xml @@ -16,36 +16,12 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/save_apply_layout" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom|left" - android:visibility="gone"> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1"/> - - <Button - android:id="@+id/save_apply_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" - android:background="@drawable/save_apply_button_selector"/> - - </LinearLayout> - - <org.cyanogenmod.theme.widget.NavBarSpace - android:layout_width="match_parent" - android:layout_height="@dimen/navigation_bar_height"/> - -</LinearLayout>
\ No newline at end of file +<Button xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/save_apply_button" + android:layout_width="@dimen/save_apply_fab_width" + android:layout_height="@dimen/save_apply_fab_height" + android:layout_gravity="bottom|end" + android:layout_marginEnd="8dp" + android:layout_marginBottom="8dp" + android:background="@drawable/save_apply_button_selector" + android:visibility="gone"/> diff --git a/res/layout/status_bar_card.xml b/res/layout/status_bar_card.xml index 331db00..d67abf6 100644 --- a/res/layout/status_bar_card.xml +++ b/res/layout/status_bar_card.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentCardView +<org.cyanogenmod.theme.chooser2.ComponentCardView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/status_bar_container" android:layout_width="match_parent" @@ -107,4 +107,4 @@ android:src="@drawable/ic_addcomponent"/> </LinearLayout> </FrameLayout> -</org.cyanogenmod.theme.chooser.ComponentCardView>
\ No newline at end of file +</org.cyanogenmod.theme.chooser2.ComponentCardView>
\ No newline at end of file diff --git a/res/layout/style_card.xml b/res/layout/style_card.xml index e1906cc..c9f95b3 100644 --- a/res/layout/style_card.xml +++ b/res/layout/style_card.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<org.cyanogenmod.theme.chooser.ComponentCardView +<org.cyanogenmod.theme.chooser2.ComponentCardView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/style_card" android:layout_width="match_parent" @@ -54,4 +54,4 @@ android:src="@drawable/ic_addcomponent"/> </LinearLayout> </FrameLayout> -</org.cyanogenmod.theme.chooser.ComponentCardView> +</org.cyanogenmod.theme.chooser2.ComponentCardView> diff --git a/res/layout/title_card.xml b/res/layout/title_card.xml new file mode 100644 index 0000000..61efa88 --- /dev/null +++ b/res/layout/title_card.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 The CyanogenMod 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. + --> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/title_card" + android:layout_width="@dimen/theme_preview_width" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:background="@drawable/card_themepreview_bg"> + <LinearLayout + android:id="@+id/title_layout" + android:layout_width="match_parent" + android:layout_height="@dimen/title_card_height" + android:alpha="0"> + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:layout_marginStart="16dp" + android:orientation="vertical"> + <org.cyanogenmod.theme.widget.LatoTextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textColor="@color/theme_title_text_color"/> + <org.cyanogenmod.theme.widget.LatoTextView + android:id="@+id/author" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textColor="@color/theme_author_text_color" + android:textSize="14dp" /> + </LinearLayout> + <ImageView + android:id="@+id/customize" + android:layout_width="47dp" + android:layout_height="match_parent" + android:scaleType="center" + android:src="@drawable/ic_theme_customize" + android:background="@drawable/theme_card_action_item_background"/> + + <ImageView + android:id="@+id/overflow" + android:layout_width="36dp" + android:layout_height="match_parent" + android:layout_marginStart="1dp" + android:layout_marginEnd="8dp" + android:scaleType="center" + android:src="@drawable/ic_overflow_dark" + android:visibility="gone" + android:background="@drawable/theme_card_action_item_background"/> + + <ImageView + android:id="@+id/delete" + android:layout_width="36dp" + android:layout_height="match_parent" + android:layout_marginStart="1dp" + android:layout_marginEnd="8dp" + android:scaleType="center" + android:src="@drawable/ic_theme_delete" + android:background="@drawable/theme_card_action_item_background"/> + + <ImageView + android:id="@+id/reset" + android:layout_width="36dp" + android:layout_height="match_parent" + android:layout_marginStart="1dp" + android:layout_marginEnd="8dp" + android:scaleType="center" + android:src="@drawable/ic_theme_reset" + android:visibility="gone" + android:background="@drawable/theme_card_action_item_background"/> + </LinearLayout> + <ProgressBar + android:id="@+id/apply_progress" + android:layout_width="match_parent" + android:layout_height="@dimen/apply_progress_height" + android:layout_gravity="center_vertical|right" + android:paddingStart="@dimen/apply_progress_padding" + android:paddingEnd="@dimen/apply_progress_padding" + android:indeterminate="false" + android:max="100" + android:progress="0" + android:progressDrawable="@drawable/apply_progress_bar" + android:visibility="gone" + style="@android:style/Widget.ProgressBar.Horizontal"/> +</FrameLayout> diff --git a/res/layout/wallpaper_component_selection_item.xml b/res/layout/wallpaper_component_selection_item.xml index ace5c34..697820d 100644 --- a/res/layout/wallpaper_component_selection_item.xml +++ b/res/layout/wallpaper_component_selection_item.xml @@ -17,7 +17,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:cyngn="http://schemas.android.com/apk/res/org.cyanogenmod.theme.chooser" + xmlns:themes="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="@dimen/component_selection_cell_height" @@ -56,7 +56,7 @@ android:layout_marginTop="@dimen/animated_lock_screen_text_margin_top" android:layout_marginBottom="@dimen/animated_lock_screen_text_margin_bottom" style="@style/animated_lock_screen_badge_text_style" - cyngn:autoFitText="true" + themes:autoFitText="true" android:text="@string/animated_lock_screen_badge_text"/> </LinearLayout> </FrameLayout> |