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

Commit 92a34bb6 authored by Linus Lee's avatar Linus Lee Committed by Rajesh Yengisetty
Browse files

CMFM: Switch sort options to use similar logic to navigation sort 

This merges the sort logic into one place and leverages the dialog

Change-Id: I039f93ef5b575090230b205c44963732141e01af
parent 1ee66ded

res/drawable/ic_sort_relevance.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">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M2,9v8h2v-4h2v4h2V9c0-1.1-0.9-2-2-2H4C2.9,7,2,7.9,2,9z M6,11H4V9h2V11z M18,9v6

h4v2h-4c-1.1,0-2-0.9-2-2V9c0-1.1,0.9-2,2-2h4v2H18z

M15,11V9c0-1.1-0.9-2-2-2H9v10h2h2c1.1,0,2-0.9,2-2v-2c0-0.6-0.4-1-1-1

C14.6,12,15,11.6,15,11z M11,9h2v2h-2V9z M13,15h-2v-2h2V15z" />

</vector>
 
 No newline at end of file

res/layout/sort_view_options.xml

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:orientation="horizontal">

        <include

            android:id="@+id/sort_item_relevance"

            android:layout_width="64dp"

            android:layout_height="80dp"

            layout="@layout/sort_item" />

        <include

            android:id="@+id/sort_item_abc"

            android:layout_width="64dp"

res/values/arrays.xml

+10 −8
Original line number Diff line number Diff line
@@ -85,14 +85,16 @@ 


    <!-- Search - Sort search results mode -->

    <string-array name="sort_search_results_mode_labels" translatable="false">

        <item>@string/pref_sort_search_results_mode_none</item>

        <item>@string/pref_sort_search_results_mode_name</item>

        <item>@string/pref_sort_search_results_mode_relevance</item>

    </string-array>

    <string-array name="sort_search_results_mode_values" translatable="false">

        <item>0</item>

        <item>1</item>

        <item>2</item>

        <item>@string/sort_by_name_asc</item>

        <item>@string/sort_by_name_desc</item>

        <item>@string/sort_by_date_asc</item>

        <item>@string/sort_by_date_desc</item>

        <item>@string/sort_by_size_asc</item>

        <item>@string/sort_by_size_desc</item>

        <item>@string/sort_by_type_asc</item>

        <item>@string/sort_by_type_desc</item>

        <item>@string/sort_by_relevance_asc</item>

        <item>@string/sort_by_relevance_desc</item>

    </string-array>



    <!-- Compression modes -->

res/values/strings.xml

+5 −6
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ 
    <string name="sort_by_date">Date</string>

    <string name="sort_by_size">Size</string>

    <string name="sort_by_type">Type</string>

    <string name="sort_by_relevance">Relevance</string>

    <string name="sort_by_asc">Ascending</string>

    <string name="sort_by_desc">Descending</string>

    <!-- Navigation View - Sort - Sort by name (ascending) -->
@@ -204,6 +205,10 @@ 
    <string name="sort_by_type_asc">By type \u25B2</string>

    <!-- Navigation View - Sort - Sort by type (descending) -->

    <string name="sort_by_type_desc">By type \u25BC</string>

    <!-- Search - Sort by relevance (ascending) -->

    <string name="sort_by_relevance_asc">By relevance \u25B2</string>

    <!-- Search - Sort by relevance (descending) -->

    <string name="sort_by_relevance_desc">By relevance \u25BC</string>



    <!-- Navigation View - Layout - Icons -->

    <string name="layout_icons">Icons</string>
@@ -710,12 +715,6 @@ 
    <string name="pref_highlight_terms">Highlight search terms</string>

    <!-- Preferences - Search - Sort results mode -->

    <string name="pref_sort_search_results_mode">Sort results mode</string>

    <!-- Preferences - Search - Sort results mode. None -->

    <string name="pref_sort_search_results_mode_none">No sort</string>

    <!-- Preferences - Search - Sort results mode. None -->

    <string name="pref_sort_search_results_mode_name">By name</string>

    <!-- Preferences - Search - Sort results mode. Relevance -->

    <string name="pref_sort_search_results_mode_relevance">By relevance</string>

    <!-- Preferences - Search - Privacity category -->

    <string name="pref_search_privacity_category">Privacy</string>

    <!-- Preferences - Search - Save search terms -->

res/xml/preferences_search.xml

+3 −5
Original line number Diff line number Diff line
@@ -37,12 +37,10 @@ 
        android:defaultValue="true" />



      <!-- Sort results mode -->

      <ListPreference

        android:key="cm_filemanager_sort_search_results_mode"

      <Preference

        android:key="cm_filemanager_sort_search_results_mode2"

        android:title="@string/pref_sort_search_results_mode"

        android:entries="@array/sort_search_results_mode_labels"

        android:entryValues="@array/sort_search_results_mode_values"

        android:defaultValue="2"

        android:defaultValue="9"

        android:persistent="true" />



    </PreferenceCategory>