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

Commit 7e1b2d25 authored by Luca Stefani's avatar Luca Stefani Committed by Arne Coucheron
Browse files

Gallery2: Switch to navigationbar from support libs 

Change-Id: I01789c0ca9ed89eb976da8a634e49e1ad95962e9
parent 82b6848e

Android.mk

+4 −3
Original line number Original line Diff line number Diff line
@@ -6,7 +6,8 @@ LOCAL_MODULE_TAGS := optional 




LOCAL_JAVA_LIBRARIES := telephony-common

LOCAL_JAVA_LIBRARIES := telephony-common





LOCAL_STATIC_JAVA_LIBRARIES := ahbottomnavigation

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common

LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common
@@ -18,12 +19,12 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) 




LOCAL_RESOURCE_DIR += \

LOCAL_RESOURCE_DIR += \

    $(LOCAL_PATH)/res \

    $(LOCAL_PATH)/res \

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

    $(TOP)/frameworks/support/design/res \

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

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





LOCAL_AAPT_FLAGS := \

LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --auto-add-overlay \

    --extra-packages com.aurelhubert.ahbottomnavigation \

    --extra-packages android.support.design \

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

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





LOCAL_PACKAGE_NAME := Gallery2

LOCAL_PACKAGE_NAME := Gallery2

res/drawable/item_bg.xml

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

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

    <item android:color="@color/navigation_accent_enabled" android:state_checked="true" />

    <item android:color="@color/navigation_accent_disabled" />

</selector>

res/layout/gallery_main.xml

+7 −2
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 




<LinearLayout

<LinearLayout

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

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

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

    android:id="@+id/drawerLayout"

    android:id="@+id/drawerLayout"

    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_width="match_parent"
@@ -45,12 +46,16 @@ 
            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="match_parent">

            android:layout_height="match_parent">





            <com.aurelhubert.ahbottomnavigation.AHBottomNavigation

            <android.support.design.widget.BottomNavigationView

                android:id="@+id/bottom_navigation"

                android:id="@+id/bottom_navigation"

                android:elevation="8dp"

                android:elevation="8dp"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentBottom="true" />

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

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

        </RelativeLayout>

        </RelativeLayout>

res/menu/navigation_items.xml

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

     <item android:id="@+id/action_timeline"

          android:title="@string/timeline_title"

          android:icon="@drawable/ic_timeline" />

     <item android:id="@+id/action_album"

          android:title="@string/albums_title"

          android:icon="@drawable/ic_album" />

     <item android:id="@+id/action_videos"

          android:title="@string/videos_title"

          android:icon="@drawable/ic_video" />

</menu>

res/values/colors.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -88,4 +88,7 @@ 
    <color name="timeline_title_text_color">@color/black_transparent_4</color>

    <color name="timeline_title_text_color">@color/black_transparent_4</color>

    <color name="timeline_title_number_text_color">@color/black_transparent_3</color>

    <color name="timeline_title_number_text_color">@color/black_transparent_3</color>

    <color name="timeline_title_background_color">@color/white</color>

    <color name="timeline_title_background_color">@color/white</color>



    <color name="navigation_accent_disabled">#747474</color>

    <color name="navigation_accent_enabled">@color/white</color>

</resources>
 
</resources>