fenix
/
Simple-File-Manager
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flip "Go to favorite" and "Sort"

This commit is contained in:
tibbi 2017-07-12 20:29:57 +02:00
parent 1dcfb9e817
commit 035d112c1d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -32,7 +32,7 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.22.4' compile 'com.simplemobiletools:commons:2.22.7'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }

4
app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
View File

@ -123,10 +123,10 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {
R.id.go_home -> goHome() R.id.go_home -> goHome()
R.id.go_to_favorite -> goToFavorite()
R.id.sort -> showSortingDialog() R.id.sort -> showSortingDialog()
R.id.add_favorite -> addFavorite() R.id.add_favorite -> addFavorite()
R.id.remove_favorite -> removeFavorite() R.id.remove_favorite -> removeFavorite()
R.id.go_to_favorite -> goToFavorite()
R.id.set_as_home -> setAsHome() R.id.set_as_home -> setAsHome()
R.id.temporarily_show_hidden -> temporarilyShowHidden() R.id.temporarily_show_hidden -> temporarilyShowHidden()
R.id.settings -> startActivity(Intent(this, SettingsActivity::class.java)) R.id.settings -> startActivity(Intent(this, SettingsActivity::class.java))
@ -173,7 +173,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
} }
} }
RadioGroupDialog(this, items, currFavoriteIndex) { RadioGroupDialog(this, items, currFavoriteIndex, R.string.go_to_favorite) {
openPath(it.toString()) openPath(it.toString())
} }
} }

9
app/src/main/res/menu/menu.xml
View File

@ -6,6 +6,11 @@
android:icon="@drawable/ic_home" android:icon="@drawable/ic_home"
android:title="@string/go_to_home_folder" android:title="@string/go_to_home_folder"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item
android:id="@+id/go_to_favorite"
android:icon="@drawable/ic_open"
android:title="@string/go_to_favorite"
app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/sort" android:id="@+id/sort"
android:icon="@drawable/ic_sort" android:icon="@drawable/ic_sort"
@ -21,10 +26,6 @@
android:icon="@drawable/ic_star_on" android:icon="@drawable/ic_star_on"
android:title="@string/remove_from_favorites" android:title="@string/remove_from_favorites"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item
android:id="@+id/go_to_favorite"
android:title="@string/go_to_favorite"
app:showAsAction="never"/>
<item <item
android:id="@+id/set_as_home" android:id="@+id/set_as_home"
android:title="@string/set_as_home_folder" android:title="@string/set_as_home_folder"