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

Commit 60b5090a authored by Richard MacGregor's avatar Richard MacGregor
Browse files

Picker Updates 

- Roots directory no longer uses navigation view
- Roots directory uses different item layouts than navigation
- Dialog header for roots view now correct
- Dialog header now changes layout for roots vs browsing lists
- Dialog header now reflects volume color
- ***NEW: CREATE NEW FOLDERS RIGHT FROM THE PICKER***

CLOUD-180

Change-Id: I2789d11f2315c441b02f4b38218e31d7eacb6efa
parent 3913b4de

res/drawable/ic_folder_new.xml

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

<!--

    Copyright (c) 2015 The CyanogenMod Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<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="#FFFFFF"

        android:pathData="M20,6h-8l-2-2H4C2.9,4,2,4.9,2,6l0,12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8C22,6.9,21.1,6,20,6z

M19,14h-3 v3h-2v-3h-3v-2h3V9h2v3h3V14z" />

</vector>
 
 No newline at end of file

res/layout/navigation_view_simple_item.xml

+3 −12
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

  android:id="@+id/navigation_view_details_item"

  android:layout_width="match_parent"

  android:layout_height="@dimen/default_row_height"

  android:layout_height="@dimen/navigation_view_simple_item_height"

  android:orientation="horizontal"

  android:background="@drawable/navigation_item_background">



  <com.cyanogenmod.filemanager.ui.widgets.FixedSizeImageView

    android:id="@+id/navigation_view_item_icon"

    android:layout_marginStart="@dimen/easy_mode_type_icon_margin_lr"

    android:layout_marginEnd="@dimen/easy_mode_type_icon_margin_lr"

    android:layout_marginStart="@dimen/navigation_view_simple_item_icon_margin"

    android:layout_marginEnd="@dimen/navigation_view_simple_item_icon_margin"

    android:layout_width="@dimen/circle_icon_wh"

    android:layout_height="@dimen/circle_icon_wh"

    android:layout_gravity="center_vertical"
@@ -37,18 +37,9 @@ 
    android:layout_width="0dp"

    android:layout_height="match_parent"

    android:layout_weight="1"

    android:layout_marginStart="@dimen/default_margin"

    android:layout_marginTop="@dimen/extra_margin"

    android:gravity="start|center_vertical"

    android:singleLine="true"

    android:ellipsize="middle"

    android:textAppearance="@style/primary_text_appearance" />



  <com.cyanogenmod.filemanager.ui.widgets.TransparentNonFocusableButtonItem

    android:id="@+id/navigation_view_item_info"

    android:layout_width="@dimen/item_menu_row_button_width"

    android:layout_height="match_parent"

    android:contentDescription="@null"

    android:src="@drawable/ic_details" />



</LinearLayout>

res/layout/navigation_view_simple_item_small.xml

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

<!-- Copyright (C) 2015 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

 -->



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

  android:id="@+id/navigation_view_details_item"

  android:layout_width="match_parent"

  android:layout_height="@dimen/navigation_view_simple_item_small_height"

  android:orientation="horizontal"

  android:background="@drawable/navigation_item_background">



  <com.cyanogenmod.filemanager.ui.widgets.FixedSizeImageView

    android:id="@+id/navigation_view_item_icon"

    android:layout_marginStart="@dimen/navigation_view_simple_item_small_icon_margin"

    android:layout_marginEnd="@dimen/navigation_view_simple_item_small_icon_margin"

    android:layout_width="@dimen/circle_icon_wh"

    android:layout_height="@dimen/circle_icon_wh"

    android:layout_gravity="center_vertical"

    android:scaleType="center"

    android:contentDescription="@null"

    android:src="@null" />



  <TextView

    android:id="@+id/navigation_view_item_name"

    android:layout_width="0dp"

    android:layout_height="match_parent"

    android:layout_weight="1"

    android:gravity="start|center_vertical"

    android:singleLine="true"

    android:ellipsize="middle"

    android:textAppearance="@style/primary_text_appearance" />



</LinearLayout>

res/layout/picker.xml

+35 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The CyanogenMod Project

<!-- Copyright (C) 2015 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -22,25 +22,33 @@ 
    android:background="@color/default_background"

    android:orientation="vertical">



  <!-- Breadcrumb -->

  <com.cyanogenmod.filemanager.ui.widgets.DialogBreadcrumbView

    android:id="@+id/breadcrumb_view"

    <com.cyanogenmod.filemanager.ui.widgets.PickerHeaderView

        android:id="@+id/picker_header"

        android:layout_width="match_parent"

    android:layout_height="@dimen/default_row_height"

    android:layout_marginStart="@dimen/extra_large_margin"

    android:layout_marginEnd="@dimen/extra_large_margin"

    android:visibility="gone"/>

        android:layout_height="@dimen/picker_header_height"

        android:background="@color/picker_header_color" />



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

    <com.cyanogenmod.filemanager.ui.widgets.ToggleSwipeViewPager

        android:id="@+id/picker_viewpager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/default_background">



        <!-- Roots View -->

        <ListView

            android:id="@+id/roots_listview"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@color/default_background"

            android:divider="@null" />



        <!-- Picker Navigation View -->

        <com.cyanogenmod.filemanager.ui.widgets.NavigationView

            android:id="@+id/navigation_view"

            android:layout_width="match_parent"

            android:layout_height="0dp"

    android:layout_weight="1"

    android:layout_marginStart="@dimen/extra_margin"

    android:layout_marginEnd="@dimen/extra_margin"

            filemanager:navigation="pickable" />



    </com.cyanogenmod.filemanager.ui.widgets.ToggleSwipeViewPager>



</LinearLayout>