diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/action_mode.xml | 3 | ||||
-rw-r--r-- | res/layout/filtershow_main_panel.xml | 2 | ||||
-rw-r--r-- | res/layout/gallery_main.xml | 39 | ||||
-rw-r--r-- | res/layout/gl_root_group.xml | 3 | ||||
-rw-r--r-- | res/layout/popup_list_item.xml | 4 | ||||
-rw-r--r-- | res/layout/toolbar.xml | 24 | ||||
-rw-r--r-- | res/menu/albumset.xml | 2 | ||||
-rwxr-xr-x | res/values/colors.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 8 |
9 files changed, 50 insertions, 37 deletions
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml index efa920dda..186ce5ba6 100644 --- a/res/layout/action_mode.xml +++ b/res/layout/action_mode.xml @@ -24,6 +24,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="match_parent"> + <ImageView android:layout_gravity="right|center_vertical" android:layout_width="8dp" android:layout_height="8dp" @@ -33,7 +34,7 @@ android:divider="?android:attr/listDividerAlertDialog" android:textAppearance="?android:attr/textAppearanceLargePopupMenu" android:textColor="@color/black_transparent_4" - android:textSize="20sp" + android:textSize="18sp" android:singleLine="true" android:gravity="start|center_vertical" android:paddingEnd="15dip" diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml index 5b0510a1c..a77221ce5 100644 --- a/res/layout/filtershow_main_panel.xml +++ b/res/layout/filtershow_main_panel.xml @@ -37,7 +37,7 @@ <FrameLayout android:id="@+id/category_panel_container" android:layout_width="match_parent" android:visibility="visible" - android:layout_height="0dip" + android:layout_height="wrap_content" android:layout_gravity="center" android:paddingRight="5dp" android:paddingLeft="5dp" diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml index 7c6c2bc05..4b4edbd6b 100644 --- a/res/layout/gallery_main.xml +++ b/res/layout/gallery_main.xml @@ -34,35 +34,38 @@ android:id="@+id/drawerLayout" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent"> - <!-- MAIN CONTENT --> <RelativeLayout android:id="@+id/gallery_root" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:layout_above="@+id/bottom_navigation"> - <android.support.design.widget.BottomNavigationView - android:id="@+id/bottom_navigation" - android:elevation="8dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - app:menu="@menu/navigation_items" - app:itemBackground="@color/primary" - app:itemIconTint="@drawable/item_bg" - app:itemTextColor="@drawable/item_bg" /> + <!-- Toolbar --> + <include layout="@layout/toolbar" /> + + <!-- Main content --> + <include layout="@layout/gl_root_group" /> - <include layout="@layout/gl_root_group"/> </RelativeLayout> - <!-- This layout will overlap all the others --> - <include - android:id="@+id/toolbar" - layout="@layout/toolbar" /> + <!-- Bottom bar --> + <android.support.design.widget.BottomNavigationView + android:id="@+id/bottom_navigation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/primary" + android:layout_alignParentBottom="true" + app:menu="@menu/navigation_items" + app:itemBackground="@color/primary" + app:itemIconTint="@drawable/item_bg" + app:itemTextColor="@drawable/item_bg" /> + </RelativeLayout> + </LinearLayout> diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml index eee2b49f8..630217153 100644 --- a/res/layout/gl_root_group.xml +++ b/res/layout/gl_root_group.xml @@ -19,8 +19,7 @@ <RelativeLayout android:id="@+id/gl_parent_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginBottom="56dp"> + android:layout_height="match_parent"> <com.android.gallery3d.ui.GLRootView android:id="@+id/gl_root_view" android:layout_width="match_parent" diff --git a/res/layout/popup_list_item.xml b/res/layout/popup_list_item.xml index 0fad174aa..a2f7c31bb 100644 --- a/res/layout/popup_list_item.xml +++ b/res/layout/popup_list_item.xml @@ -19,12 +19,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLargePopupMenu" - android:textSize="20sp" + android:textSize="18sp" android:textColor="@color/black_transparent_4" android:singleLine="true" android:gravity="center_vertical" android:paddingStart="16dp" android:paddingEnd="16dp" - android:minHeight="?android:attr/listPreferredItemHeight" + android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minWidth="196dp" /> diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml index cf9b8a9ca..4c2a03a4e 100644 --- a/res/layout/toolbar.xml +++ b/res/layout/toolbar.xml @@ -28,14 +28,20 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<Toolbar xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="@dimen/toolbar_height" - android:paddingTop="24dp" - android:background="@color/primary" - android:elevation="8dp" - android:theme="@style/ToolbarTheme" - android:titleTextAppearance="@style/ToolbarTitleStyle" - android:popupTheme="@style/ToolbarPopUpTheme" > + android:layout_height="wrap_content" + android:theme="@style/ToolbarTheme"> + + <Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="@dimen/toolbar_height" + android:paddingTop="24dp" + android:background="@color/primary" + android:elevation="8dp" + android:titleTextAppearance="@style/ToolbarTitleStyle" + android:popupTheme="@style/ToolbarPopUpTheme" /> + +</android.support.design.widget.AppBarLayout> -</Toolbar> diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml index 603fb9b7e..b21bf3d38 100644 --- a/res/menu/albumset.xml +++ b/res/menu/albumset.xml @@ -24,7 +24,7 @@ <item android:id="@+id/action_select" android:icon="@drawable/ic_selection" android:title="@string/select_album" - android:showAsAction="never" /> + android:showAsAction="ifRoom" /> <item android:id="@+id/action_manage_offline" android:title="@string/make_available_offline" android:visible="false" diff --git a/res/values/colors.xml b/res/values/colors.xml index 429348e35..9388e9898 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -32,7 +32,7 @@ <color name="album_placeholder">@color/white</color> <!-- configuration for photo page --> - <color name="photo_background">@color/primary</color> + <color name="photo_background">@color/black</color> <color name="photo_placeholder">@color/light_black</color> <color name="photo_page_action_bar">#8A000000</color> <color name="photo_page_bottom_panel">#8A000000</color> diff --git a/res/values/styles.xml b/res/values/styles.xml index dafe0d9c9..ebc975da9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -23,7 +23,7 @@ <item name="switchStyle">@android:style/Widget.CompoundButton</item> </style> - <style name="Theme.Gallery.Dialog" parent="android:Theme.Holo.Dialog" /> + <style name="Theme.Gallery.Dialog" parent="android:Theme.Material.Dialog" /> <style name="Theme.Gallery" parent="android:Theme.Material.Light"> <item name="android:colorPrimary">@color/primary</item> @@ -66,7 +66,9 @@ <item name="android:background">@null</item> <item name="android:src">@drawable/icn_media_play</item> </style> - <style name="DialogPickerTheme" parent="Theme.Gallery"> + <style name="DialogPickerTheme" parent="android:Theme.Material"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primaryDark</item> </style> <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar"> </style> @@ -338,6 +340,8 @@ <style name="ToolbarTheme" parent="android:Theme.Material" > <item name="android:actionOverflowButtonStyle">@style/WhiteOverflow</item> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primaryDark</item> </style> <style name="ToolbarTitleStyle" parent="android:TextAppearance.Material.Widget.Toolbar.Title"> |