diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 26 | ||||
| -rw-r--r-- | res/values/dimens.xml | 75 | ||||
| -rw-r--r-- | res/values/filtershow_color.xml | 6 | ||||
| -rw-r--r-- | res/values/filtershow_strings.xml | 5 | ||||
| -rw-r--r-- | res/values/filtershow_styles.xml | 2 | ||||
| -rw-r--r-- | res/values/filtershow_values.xml | 16 | ||||
| -rwxr-xr-x | res/values/strings.xml | 29 | ||||
| -rw-r--r-- | res/values/styles.xml | 51 |
8 files changed, 178 insertions, 32 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 20b2930d7..9fd91923f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -14,18 +14,20 @@ limitations under the License. --> <resources> - <color name="default_background">#000</color> + + <color name="default_background">#fafafa</color> <!-- configuration for album set page --> - <color name="albumset_background">#1A1A1A</color> - <color name="albumset_placeholder">#333</color> - <color name="albumset_label_background">#EE414143</color> - <color name="albumset_label_title">#FBFBFB</color> - <color name="albumset_label_count">#A9ABAD</color> + <color name="albumset_background">#fafafa</color> + <color name="albumset_placeholder">#75000000</color> + <color name="albumset_label_background">#8A000000</color> <!-- 54% alpha --> + <color name="albumset_label_title">#FFFFFF</color> + <color name="albumset_label_count">#FFFFFF</color> + <color name="albumlist_label_title">#8E000000</color> <!-- configuration for album page --> - <color name="album_background">#1A1A1A</color> - <color name="album_placeholder">#333</color> + <color name="album_background">#fafafa</color> + <color name="album_placeholder">#75000000</color> <!-- configuration for photo page --> <color name="photo_background">#1A1A1A</color> @@ -74,4 +76,12 @@ <color name="lowlight">#650101</color> <color name="grey">#e7e7e7</color> <color name="disabled_knob">#575757</color> + <color name="toolbar_theme">#e53935</color> + <color name="multiselect_background">#ffffff</color> + <color name="edit_background">#212121</color> + <color name="edit_actionbar_background">#8A000000</color> + <color name="dialog_button_color">#009688</color> + <color name="timeline_title_text_color">#26000000</color> + <color name="timeline_title_number_text_color">#1a000000</color> + <color name="timeline_title_background_color">#fafafa</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ef742d2b5..2b72812de 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -112,23 +112,50 @@ <!-- configuration for legacy album set page --> <integer name="albumset_rows_land">2</integer> <integer name="albumset_rows_port">3</integer> - <dimen name="albumset_padding_top">7dp</dimen> - <dimen name="albumset_padding_bottom">7dp</dimen> - <dimen name="albumset_slot_gap">7dp</dimen> - - <dimen name="albumset_label_background_height">30dp</dimen> - <dimen name="albumset_title_offset">10dp</dimen> - <dimen name="albumset_count_offset">10dp</dimen> - <dimen name="albumset_title_font_size">12sp</dimen> - <dimen name="albumset_count_font_size">9sp</dimen> + <integer name="albumset_cols_land">3</integer> + <integer name="albumset_cols_port">2</integer> + + <dimen name="albumset_padding_top">4dp</dimen> + <dimen name="albumset_padding_bottom">4dp</dimen> + <dimen name="albumset_padding_left">4dp</dimen> + <dimen name="albumset_padding_right">4dp</dimen> + <dimen name="albumset_slot_gap">4dp</dimen> + <dimen name="albumset_label_background_height">48dp</dimen> + <dimen name="albumset_title_offset">12dp</dimen> + <dimen name="albumset_count_offset">18dp</dimen> + <dimen name="albumset_title_font_size">16sp</dimen> + <dimen name="albumset_count_font_size">16sp</dimen> <dimen name="albumset_left_margin">2dp</dimen> <dimen name="albumset_title_right_margin">20dp</dimen> + <dimen name="albumset_title_left_margin">12dp</dimen> + <dimen name="albumset_count_right_margin">18dp</dimen> <dimen name="albumset_icon_size">25dp</dimen> + <!-- configuration for albumset page in Landscape--> + <dimen name="albumset_slot_gap_land">29dp</dimen> + <dimen name="albumset_padding_top_land">30dp</dimen> + <dimen name="albumset_padding_bottom_land">30dp</dimen> + <dimen name="albumset_padding_left_land">30dp</dimen> + <dimen name="albumset_padding_right_land">30dp</dimen> + <!-- configuration for album page --> <integer name="album_rows_land">2</integer> <integer name="album_rows_port">4</integer> - <dimen name="album_slot_gap">5dp</dimen> + <integer name="album_cols_land">5</integer> + <integer name="album_cols_port">3</integer> + + <dimen name="album_slot_gap">3dp</dimen> + <dimen name="album_padding_top">3dp</dimen> + <dimen name="album_padding_bottom">3dp</dimen> + <dimen name="album_padding_left">3dp</dimen> + <dimen name="album_padding_right">3dp</dimen> + + <!-- configuration for album page in Landscape--> + <dimen name="album_slot_gap_land">7dp</dimen> + <dimen name="album_padding_top_land">16dp</dimen> + <dimen name="album_padding_bottom_land">7dp</dimen> + <dimen name="album_padding_left_land">16dp</dimen> + <dimen name="album_padding_right_land">16dp</dimen> <!-- configuration for manage page --> <dimen name="cache_pin_size">24dp</dimen> @@ -152,4 +179,32 @@ <dimen name="photoeditor_text_padding">10dp</dimen> <dimen name="photoeditor_original_text_size">18dp</dimen> <dimen name="photoeditor_original_text_margin">4dp</dimen> + <dimen name="timeline_grid_vertical_space">3dp</dimen> + <dimen name="slot_width">174dp</dimen> + <dimen name="slot_height">174dp</dimen> + <dimen name="toolbar_height">84dp</dimen> + <dimen name="slot_width_album">116dp</dimen> + <dimen name="slot_height_album">116dp</dimen> + + <!-- configuration for album page in listview --> + <integer name="albumlist_cols_land">1</integer> + <integer name="albumlist_cols_port">1</integer> + + <dimen name="albumlist_padding_top">18dp</dimen> + <dimen name="slot_height_albumlist">40dp</dimen> + <dimen name="albumlist_slot_gap">18dp</dimen> + <dimen name="albumlist_thumb_size">40dp</dimen> + <dimen name="albumlist_left_margin">16dp</dimen> + <dimen name="albumlist_title_margin">16dp</dimen> + <dimen name="albumlist_title_font_size">16sp</dimen> + <dimen name="albumlist_label_background_height">40dp</dimen> + <dimen name= "edit_main_font">13sp</dimen> + <dimen name="dialog_text_size">14sp</dimen> + + <dimen name="timeline_port_slot_gap">3dp</dimen> + <dimen name="timeline_land_slot_gap">7dp</dimen> + <dimen name="timeline_land_margin">16dp</dimen> + <dimen name="timeline_port_margin">3dp</dimen> + <dimen name="timeline_title_height">48dp</dimen> + <dimen name="timeline_title_font_size">14sp</dimen> </resources> diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index 4fb4495e7..fbfedc41f 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -20,7 +20,7 @@ <color name="red">#FF0000</color> <color name="blue">#0000FF</color> <color name="text_toolbar">#FFFFFF</color> - <color name="background_screen">#101010</color> + <color name="background_screen">#212121</color> <color name="background_toolbar">#363949</color> <color name="background_main_toolbar">#232323</color> <color name="toolbar_separation_line">#333333</color> @@ -36,7 +36,7 @@ <color name="filtershow_stateview_selected_background">#c8c8c8</color> <color name="filtershow_stateview_selected_text">#000000</color> <color name="filtershow_categoryview_background">#1a1a1a</color> - <color name="filtershow_categoryview_text">#a7a7a7</color> + <color name="filtershow_categoryview_text">#ffffff</color> <color name="filtershow_category_selection">#ffffffff</color> <color name="gradcontrol_point_center">#ffffffff</color> <color name="gradcontrol_point_edge">#ffffffff</color> @@ -49,5 +49,7 @@ <color name="draw_rect_border">#888888</color> <color name="color_chooser_unslected_border">#00000000</color> <color name="color_chooser_slected_border">#a7a7a7</color> + <color name="filtershow_image_mask">#4d000000</color> + <color name="filtershow_info_text">#DE000000</color> </resources>
\ No newline at end of file diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 57a858b9f..fdc8f6a16 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -340,4 +340,9 @@ <string name="fusion_pick_underlay">Pick Underlay</string> <string name="dualcam_no_segment_toast">No segment found at this point</string> + <string name="color">Color</string> + <string name="frames">Frames</string> + <string name="beautify">Beautify</string> + <string name="dualcam">Dual Camera</string> + </resources> diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml index 4162ccde9..1e97acced 100644 --- a/res/values/filtershow_styles.xml +++ b/res/values/filtershow_styles.xml @@ -58,7 +58,7 @@ <item name="android:indeterminateDrawable">@drawable/filtershow_slider</item> <item name="android:minHeight">13dip</item> <item name="android:maxHeight">13dip</item> - <item name="android:thumb">@drawable/filtershow_scrubber</item> + <item name="android:thumb">@drawable/adjust</item> <item name="android:thumbOffset">16dip</item> <item name="android:focusable">true</item> <item name="android:paddingStart">16dip</item> diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml index a788afefc..efa7ccb0a 100644 --- a/res/values/filtershow_values.xml +++ b/res/values/filtershow_values.xml @@ -16,7 +16,7 @@ <resources> <!-- Specify the screen orientation --> - <bool name="only_use_portrait">true</bool> + <bool name="only_use_portrait">false</bool> <!-- Text size for the state panel --> <dimen name="state_panel_text_size">16dip</dimen> @@ -28,7 +28,7 @@ <dimen name="category_panel_icon_size">64dip</dimen> <!-- Category Panel Text Size --> - <dimen name="category_panel_text_size">13dip</dimen> + <dimen name="category_panel_text_size">13sp</dimen> <!-- Category Panel Text Size --> <dimen name="category_panel_margin">4dip</dimen> @@ -65,4 +65,16 @@ <!-- Glow effect size --> <dimen name="edge_glow_size">50dip</dimen> + <dimen name="swap_button_width">168dp</dimen> + <dimen name="swap_button_height">32dp</dimen> + <dimen name="compare_margin_top">104dp</dimen> + <dimen name="compare_margin_right">10dp</dimen> + <dimen name="compare_margin_top_scaled">96dp</dimen> + <dimen name="compare_margin_right_scaled">60dp</dimen> + <dimen name="color_button_width">36dp</dimen> + <dimen name="color_button_height">36dp</dimen> + <dimen name="seekbar_width_filter">216dp</dimen> + <dimen name="scaled_image_height">454dp</dimen> + <dimen name="scaled_image_width">330dp</dimen> + </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index b553dbdc9..405c44350 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -107,7 +107,7 @@ <string name="wallpaper">Setting wallpaper\u2026</string> <string name="camera_setas_wallpaper">Wallpaper</string> <!-- Toast message for share items --> - <string name="cannot_share_items">Selected items for share should less than 300</string> + <string name="cannot_share_items">Max selected items for share is 300</string> <!-- Details dialog "OK" button. Dismisses dialog. --> <string name="delete">Delete</string> @@ -542,7 +542,7 @@ <string name="pano_progress_text">Rendering panorama</string> <!-- The label on the button that will save an edited image --> - <string name="save" msgid="8140440041190264400">Save</string> + <string name="save" msgid="8140440041190264400">Done</string> <!-- A label representing the action of importing media item(s) [CHAR LIMIT=20] --> <string name="ingest_import">@string/Import</string> @@ -1135,6 +1135,11 @@ CHAR LIMIT = NONE] --> <item quantity="other">%1$d photos</item> </plurals> + <plurals name="number_of_videos"> + <item quantity="one">%1$d Video</item> + <item quantity="other">%1$d Videos</item> + </plurals> + <!-- The label for the bass boost knob of the audio effects dialog. --> <string name="bass_boost_strength">Bass boost</string> @@ -1160,7 +1165,25 @@ CHAR LIMIT = NONE] --> <string name="action_consumes_rights">Rights will be consumed for playing this media</string> <string name="text_makeup_whiten">Whiten</string> <string name="text_makeup_Soften">Soften</string> + + <string-array name="title_array_nav_items"> + <item>Timeline</item> + <item>Albums</item> + <item>Videos</item> + </string-array> + + <string name="navigation_drawer_title">Gallery</string> + <!-- Timeline screen title --> + <string name="timeline_title">Timeline</string> + <!-- Albums screen title --> + <string name="albums_title">Albums</string> + <!-- Videos screen title --> + <string name="videos_title">Videos</string> + <string name="action_viewtype_list">List view</string> + <string name="action_viewtype_grid">Grid view</string> + <string name="tvEmptyAlbum">No photos found</string> + <string name="tvEmptyVideos">No videos found</string> <string name="text_makeup_trimface">Trimface</string> <string name="text_makeup_bigeye">Bigeye</string> - + <string name="drawer_desc">drawer</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 14e8e299b..e4b02fc04 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -19,17 +19,23 @@ <item name="listPreferredItemHeightSmall">48dp</item> <item name="switchStyle">@android:style/Widget.CompoundButton</item> </style> - <style name="Theme.Gallery.Dialog" parent="android:Theme.Holo.Dialog"/> - <style name="Theme.Gallery" parent="Theme.GalleryBase"> - <item name="android:displayOptions"></item> + + <style name="Theme.Gallery.Dialog" parent="android:Theme.Holo.Dialog" /> + + <style name="Theme.Gallery" parent="android:Theme.Material.Light"> <item name="android:windowContentOverlay">@null</item> - <item name="android:actionBarStyle">@style/Holo.ActionBar</item> - <item name="android:windowBackground">@android:color/black</item> - <item name="android:colorBackground">@null</item> <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowDrawsSystemBarBackgrounds">true</item> + <item name="android:statusBarColor">@android:color/transparent</item> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:windowActionModeOverlay">true</item> + <item name="android:actionOverflowButtonStyle">@style/EditOverflow</item> + <item name="android:logo">@android:color/transparent</item> </style> <style name="Theme.FilterShow" parent="Theme.Gallery"> <item name="android:windowBackground">@null</item> + <item name="android:actionBarStyle">@style/FilterShowActionBar</item> </style> <style name="Theme.Crop" parent="Theme.GalleryBase"> <item name="android:displayOptions"></item> @@ -297,4 +303,37 @@ <item name="android:drawablePadding">8dp</item> <item name="android:background">@drawable/bg_pressed</item> </style> + + <style name="AppTheme" parent="android:Theme.Material.Light"> + <item name="android:windowDrawsSystemBarBackgrounds">true</item> + <item name="android:statusBarColor">@android:color/transparent</item> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:windowActionBar">false</item> + <item name="android:windowActionModeOverlay">true</item> + <item name="android:actionModeBackground">@color/multiselect_background</item> + <item name="android:actionModeShareDrawable">@drawable/multiselect_share</item> + <item name="android:actionOverflowButtonStyle">@style/MyOverFlow</item> + <item name="android:homeAsUpIndicator">@drawable/back</item> + <item name="android:actionModeCloseDrawable">@drawable/multiselected_back</item> + </style> + + <style name="QueryTheme" parent="android:Theme.Material"> + <item name="android:statusBarColor">#ab5810</item> + </style> + + <style name="ToolbarTheme" parent="android:Theme.Material" /> + + <style name="ToolbarPopUpTheme" parent="android:Theme.Material.Light" /> + + <!-- Styles --> + <style name="MyOverFlow" parent="@android:style/Widget.Holo.ActionButton.Overflow"> + <item name="android:src">@drawable/multiselect_more</item> + </style> + <style name="EditOverflow" parent="@android:style/Widget.Holo.ActionButton.Overflow"> + <item name="android:src">@drawable/more</item> + </style> + <style name="FilterShowActionBar" parent="@android:style/Widget.Holo.Light.ActionBar"> + <item name="android:background">@color/edit_actionbar_background</item> + </style> </resources> |