replace the "Remove all excluded folders" with an "Add folder"

This commit is contained in:
tibbi 2017-03-17 22:41:08 +01:00
parent 82a74ebd25
commit 05fb1efe57
19 changed files with 23 additions and 10 deletions

View file

@ -4,7 +4,6 @@ import android.graphics.PorterDuff
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.extensions.config import com.simplemobiletools.gallery.extensions.config
import kotlinx.android.synthetic.main.activity_excluded_folders.* import kotlinx.android.synthetic.main.activity_excluded_folders.*
@ -46,16 +45,13 @@ class ExcludedFoldersActivity : SimpleActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {
R.id.remove_all -> removeAllExcludedFolders() R.id.add_folder -> addExcludedFolder()
else -> return super.onOptionsItemSelected(item) else -> return super.onOptionsItemSelected(item)
} }
return true return true
} }
private fun removeAllExcludedFolders() { private fun addExcludedFolder() {
ConfirmationDialog(this, getString(R.string.remove_all_description)) {
config.removeAllExcludedFolders()
updateExcludedFolders()
}
} }
} }

View file

@ -2,8 +2,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/remove_all" android:id="@+id/add_folder"
android:icon="@drawable/ic_cross" android:icon="@drawable/ic_plus"
android:title="@string/remove_all" android:title="@string/add_folder"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
</menu> </menu>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Redimensionar</string> <string name="resize">Redimensionar</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Größe ändern</string> <string name="resize">Größe ändern</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Redimensionar</string> <string name="resize">Redimensionar</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Redimensionner</string> <string name="resize">Redimensionner</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Redimensionar</string> <string name="resize">Redimensionar</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Resize</string> <string name="resize">Resize</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Resize</string> <string name="resize">Resize</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Resize</string> <string name="resize">Resize</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Zmień rozmiar</string> <string name="resize">Zmień rozmiar</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Redimensionar</string> <string name="resize">Redimensionar</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Изменить размер</string> <string name="resize">Изменить размер</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Pridané priečinky</string> <string name="include_folders">Pridané priečinky</string>
<string name="manage_included_folders">Spravovať pridané priečinky</string> <string name="manage_included_folders">Spravovať pridané priečinky</string>
<string name="add_folder">Pridať priečinok</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Zmeniť veľkosť</string> <string name="resize">Zmeniť veľkosť</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Ändra storlek</string> <string name="resize">Ändra storlek</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Yeniden boyutlandır</string> <string name="resize">Yeniden boyutlandır</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">缩放</string> <string name="resize">缩放</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">縮放</string> <string name="resize">縮放</string>

View file

@ -35,6 +35,7 @@
<!-- Include folders --> <!-- Include folders -->
<string name="include_folders">Included folders</string> <string name="include_folders">Included folders</string>
<string name="manage_included_folders">Manage included folders</string> <string name="manage_included_folders">Manage included folders</string>
<string name="add_folder">Add folder</string>
<!-- Resizing --> <!-- Resizing -->
<string name="resize">Resize</string> <string name="resize">Resize</string>