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

Commit 2b053e52 authored by Richard MacGregor's avatar Richard MacGregor
Browse files

New CMFM navigation layout. 

Updated design using flipping icons instead of checkboxes.
Long hold will now select a file.
File/Directory properties can be brought up via info button on right of
entry.

Change-Id: I54fd65b39888f8832379522b07a573db34dfb07e
parent ae97d0f1

res/anim/flip_in.xml

0 → 100644
+25 −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.

-->

<!-- Animation to flip icon into view -->

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

  android:duration="@android:integer/config_shortAnimTime"

  android:interpolator="@android:anim/decelerate_interpolator"

  android:fromXScale="0%"

  android:fromYScale="100%"

  android:pivotX="50%"

  android:toXScale="100%"

  android:toYScale="100%" />

res/anim/flip_out.xml

0 → 100644
+25 −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.

-->

<!-- Animation to flip icon out of view -->

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

  android:duration="@android:integer/config_shortAnimTime"

  android:interpolator="@android:anim/accelerate_interpolator"

  android:fromXScale="100%"

  android:fromYScale="100%"

  android:pivotX="50%"

  android:toXScale="0%"

  android:toYScale="100%" />

res/drawable/ic_check_selected.xml

0 → 100644
+28 −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">



    <group>

        <path

            android:fillColor="#000000"

            android:pathData="M9 16.17l-4.17-4.17-1.42 1.41 5.59 5.59 12-12-1.41-1.41z" />

    </group>

</vector>
 
 No newline at end of file

res/drawable/ic_details.xml

0 → 100644
+29 −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">



    <group>

        <path

            android:fillColor="#000000"

            android:pathData="M12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm1

15h-2v-6h2v6zm0-8h-2v-2h2v2z" />

    </group>

</vector>
 
 No newline at end of file

res/layout/navigation_view_details_item.xml

+7 −17
Original line number Diff line number Diff line
@@ -20,13 +20,6 @@ 
  android:layout_height="@dimen/default_row_height"

  android:orientation="horizontal">



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

    android:id="@+id/navigation_view_item_check"

    android:layout_width="@dimen/item_menu_row_button_width"

    android:layout_height="match_parent"

    android:contentDescription="@null"

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



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

    android:id="@+id/navigation_view_item_icon"

    android:layout_width="@dimen/default_row_height"
@@ -65,16 +58,13 @@ 
      android:singleLine="true"

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



    <TextView

      android:id="@+id/navigation_view_item_size"

      android:layout_width="wrap_content"

      android:layout_height="wrap_content"

      android:layout_alignParentBottom="true"

      android:layout_alignParentEnd="true"

      android:layout_marginBottom="@dimen/default_margin"

      android:singleLine="true"

      android:textAppearance="@style/secondary_text_appearance"

      android:textStyle="bold" />

  </RelativeLayout>



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