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

Commit a0dc1b87 authored by Joey Rizzoli's avatar Joey Rizzoli Committed by Arne Coucheron
Browse files

Gallery2: Replace hamburger menu with bottom bar 



Change-Id: I20caa58fe11ee6f4148cb0bcb0ccbcdcf3a9612e
Signed-off-by: default avatarJoey Rizzoli <joey@cyanogenmoditalia.it>
parent ae2d5c13

Android.mk

+12 −4
Original line number Diff line number Diff line
@@ -6,17 +6,25 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_JAVA_LIBRARIES := telephony-common



LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES := ahbottomnavigation

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common

LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit

LOCAL_STATIC_JAVA_LIBRARIES += mp4parser

LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit



LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)

LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)



LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res

LOCAL_RESOURCE_DIR += \

    $(LOCAL_PATH)/res \

    $(TOP)/external/ahbottomnavigation/ahbottomnavigation/src/main/res \

    $(TOP)/frameworks/support/v7/appcompat/res



LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages com.aurelhubert.ahbottomnavigation \

    --extra-packages android.support.v7.appcompat



LOCAL_PACKAGE_NAME := Gallery2

res/drawable/ic_album.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="@color/tab_icon_2"

        android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z"/>

</vector>

res/drawable/ic_timeline.xml

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="@color/tab_icon_1"

        android:pathData="M9.45605,12.4586 L16.2515,12.4586 L16.2515,19.7214 L9.45608,19.7214 Z M20,8 L4,8

L4,6 L20,6 L20,8 Z M18,2 L6,2 L6,4 L18,4 L18,2 Z M22,12 L22,20

C22,21.1,21.1,22,20,22 L4,22 C2.9,22,2,21.1,2,20 L2,12 C2,10.9,2.9,10,4,10

L20,10 C21.1,10,22,10.9,22,12 Z M16,16 L10,12.73 L10,19.26 L16,16 Z" />

</vector>

res/drawable/ic_video.xml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="@color/tab_icon_3"

        android:pathData="M18,4 L20,8 L17,8 L15,4 L13,4 L15,8 L12,8 L10,4 L8,4 L10,8 L7,8 L5,4 L4,4

C2.9,4,2.01,4.9,2.01,6 L2,18 C2,19.1,2.9,20,4,20 L20,20 C21.1,20,22,19.1,22,18

L22,4 L18,4 Z" />

</vector>

res/layout/gallery_main.xml

+19 −50
Original line number Diff line number Diff line
@@ -28,67 +28,36 @@ 
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->



<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/drawerLayout"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent" >



    <!-- MAIN CONTENT -->

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



            <com.aurelhubert.ahbottomnavigation.AHBottomNavigation

                android:id="@+id/bottom_navigation"

                android:elevation="8dp"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_alignParentBottom="true" />



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

        </RelativeLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical" >



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

        <include

            android:id="@+id/toolbar"

            layout="@layout/toolbar"  />

    </LinearLayout>



    <RelativeLayout

        android:id="@+id/drawerPane"

        android:layout_width="270dp"

        android:layout_height="match_parent"

        android:layout_gravity="start"

        android:background="@color/white"

        android:clickable="true" >



        <!-- Header -->



        <RelativeLayout

            android:id="@+id/header"

            android:layout_width="match_parent"

            android:layout_height="150dp"

            android:background="@drawable/drawer_bg" >



            <TextView

                android:id="@+id/appName"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentBottom="true"

                android:layout_marginBottom="16dp"

                android:layout_marginStart="16dp"

                android:fontFamily="sans-serif"

                android:text="@string/navigation_drawer_title"

                android:textColor="@color/white"

                android:textSize="24sp" />

        </RelativeLayout>



        <ListView

            android:id="@+id/navList"

            android:layout_width="270dp"

            android:layout_height="match_parent"

            android:layout_below="@id/header"

            android:layout_marginTop="4dp"

            android:divider="@android:color/transparent" />

    </RelativeLayout>



</android.support.v4.widget.DrawerLayout>
 
 No newline at end of file
 
</LinearLayout>