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

Commit b8ab6d3f authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'album-rounded-corner-q' into 'v1-q' 

[Q] Make album and video corner rounded

See merge request !21
parents ff888b39 a963e637

res/values/colors.xml

+4 −4
Original line number Diff line number Diff line
@@ -25,18 +25,18 @@ 
    <color name="albumset_label_background">@color/black_transparent_4</color>

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

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

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

    <color name="albumlist_label_title">@color/color_default_primary_text</color>



    <color name="darker_transparent">@color/black_transparent_5</color>



    <!-- configuration for album page -->

    <color name="album_background">@color/default_background</color>

    <color name="album_placeholder">@color/default_background</color>

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



    <!-- configuration for photo page -->

    <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_action_bar">@color/default_background</color>

    <color name="photo_page_bottom_panel">#8A000000</color>



    <!-- configuration for manage cache page -->
@@ -93,5 +93,5 @@ 
    <color name="timeline_title_background_color">@color/default_background</color>



    <color name="navigation_accent_disabled">@color/disable_tab_color</color>

    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_blue1</color>

    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_accent</color>

</resources>

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ 
    <dimen name="timeline_grid_vertical_space">3dp</dimen>

    <dimen name="slot_width">174dp</dimen>

    <dimen name="slot_height">174dp</dimen>

    <dimen name="toolbar_height">80dp</dimen>

    <dimen name="toolbar_height">56dp</dimen>

    <dimen name="slot_width_album">116dp</dimen>

    <dimen name="slot_height_album">116dp</dimen>

    <dimen name="crop_icon_size">30dp</dimen>

res/values/styles.xml

+9 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        <item name="android:windowContentOverlay">@null</item>

        <item name="android:colorBackgroundCacheHint">@null</item>

        <item name="android:windowDrawsSystemBarBackgrounds">true</item>

        <item name="android:statusBarColor">@color/primary</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>
@@ -319,10 +319,13 @@ 
    </style>



    <style name="AppTheme" parent="Theme.AppCompat.Light">

        <item name="colorPrimary">@color/primary</item>

        <item name="colorPrimaryDark">@color/primaryDark</item>

        <item name="android:colorPrimary">@color/primary</item>

        <item name="android:colorPrimaryDark">@color/primaryDark</item>

        <item name="android:windowDisablePreview">true</item>

        <item name="android:windowDrawsSystemBarBackgrounds">true</item>

        <item name="android:windowBackground">@android:color/black</item>

        <item name="android:statusBarColor">@color/primary</item>

        <item name="android:windowBackground">@color/primary</item>

        <item name="android:windowTranslucentNavigation">false</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowActionModeOverlay">true</item>
@@ -339,10 +342,11 @@ 
        <item name="android:statusBarColor">#ab5810</item>

    </style>



    <style name="ToolbarTheme" parent="android:Theme.Material" >

    <style name="ToolbarTheme" parent="android:Theme.Material.Light" >

        <item name="android:actionOverflowButtonStyle">@style/WhiteOverflow</item>

        <item name="colorPrimary">@color/primary</item>

        <item name="colorPrimaryDark">@color/primaryDark</item>

        <item name="android:colorControlNormal">@color/color_default_primary_text</item>

    </style>



    <style name="MytoolbarStyle" parent="android:Theme.Material.Light" >
@@ -362,7 +366,7 @@ 
        <item name="android:src">@drawable/multiselect_more</item>

    </style>

    <style name="WhiteOverflow" parent="@android:style/Widget.Material.ActionButton.Overflow">

        <item name="android:src">@drawable/more</item>

        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>

    </style>

    <style name="FilterShowActionBar" parent="@android:style/Widget.Material.Light.ActionBar">

        <item name="android:background">@color/edit_actionbar_background</item>

src/com/android/gallery3d/app/AlbumPage.java

+0 −12
Original line number Diff line number Diff line
@@ -634,7 +634,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
        } else {

            inflator.inflate(R.menu.album, menu);

            mActionBar.setTitle(mMediaSet.getName());

            changeMenuItemColor(menu);



            FilterUtils.setupMenuItems(mActionBar, mMediaSetPath, true);
@@ -654,17 +653,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
        return true;

    }



    private void changeMenuItemColor(Menu menu){

        for(int i = 0; i < menu.size(); i++){

            Drawable drawable = menu.getItem(i).getIcon();

            if(drawable != null) {

                drawable.mutate();

                drawable.setColorFilter(mActivity.getResources().getColor(R.color.color_default_primary_text), PorterDuff.Mode.SRC_ATOP);

            }

        }



    }



    private boolean allVideoFiles() {

        if (mMediaSet == null)

            return false;

src/com/android/gallery3d/app/AlbumSetPage.java

+0 −12
Original line number Diff line number Diff line
@@ -626,23 +626,11 @@ public class AlbumSetPage extends ActivityState implements 
            moreItem.setVisible(mActivity.getResources().getBoolean(

                    R.bool.config_show_more_images));

            mActionBar.setTitle(R.string.albums_title);

            changeMenuItemColor(menu);

        }

        return true;

    }





    private void changeMenuItemColor(Menu menu){

        for(int i = 0; i < menu.size(); i++){

            Drawable drawable = menu.getItem(i).getIcon();

            if(drawable != null) {

                drawable.mutate();

                drawable.setColorFilter(mActivity.getResources().getColor(R.color.color_default_primary_text), PorterDuff.Mode.SRC_ATOP);

            }

        }



    }



    @Override

    protected boolean onItemSelected(MenuItem item) {

        Activity activity = mActivity;