Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccbf7a79 authored by Arne Coucheron's avatar Arne Coucheron Committed by LuK1337
Browse files

Gallery2: Fix various issues and glitches 

* Remove unnecessary navbar toggles, and add missing ones
* Modify picker dialog style
* Update main gallery layout so new bottom navigation works
  properly, and fix various other issues related to it
* Don't hide action bar in editor when adjusting effects, so
  we can see the values we adjust
* Update toolbar layout

Change-Id: I2a8f0b57ec874434c0fd0bb55de784b5d8379091
parent 075c174d

res/layout/action_mode.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

res/layout/gallery_main.xml

+20 −17
Original line number Diff line number Diff line
@@ -41,29 +41,32 @@ 
        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">



            <!-- Toolbar -->

            <include layout="@layout/toolbar" />



            <!-- Main content -->

            <include layout="@layout/gl_root_group" />



        </RelativeLayout>



        <!-- Bottom bar -->

        <android.support.design.widget.BottomNavigationView

            android:id="@+id/bottom_navigation"

                android:elevation="8dp"

            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" />



            <include layout="@layout/gl_root_group"/>

    </RelativeLayout>



        <!-- This layout will overlap all the others -->

        <include

            android:id="@+id/toolbar"

            layout="@layout/toolbar"  />

    </RelativeLayout>

</LinearLayout>

res/layout/gl_root_group.xml

+1 −2
Original line number Diff line number Diff line
@@ -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"

res/layout/popup_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

/>

res/layout/toolbar.xml

+13 −8
Original line number Diff line number Diff line
@@ -28,13 +28,18 @@ 
  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="wrap_content"

    android:theme="@style/ToolbarTheme">



    <Toolbar

        android:id="@+id/toolbar"

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"

        android:background="@color/primary"

        android:elevation="8dp"

    android:theme="@style/ToolbarTheme"

        android:titleTextAppearance="@style/ToolbarTitleStyle"

    android:popupTheme="@style/ToolbarPopUpTheme" >

        android:popupTheme="@style/ToolbarPopUpTheme" />



</Toolbar>
 
</android.support.design.widget.AppBarLayout>