fenix/Simple-App-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-App-Launcher.git synced 2025-02-01 09:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

define the regex of allowed launcher name characters

Browse Source
This commit is contained in:
tibbi 2016-08-18 00:47:21 +02:00
parent 3671a71cf0
commit f0bc064378
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
View File

@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity
import android.support.v7.view.ActionMode import android.support.v7.view.ActionMode
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import android.view.* import android.view.*
import android.widget.Toast
import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback
import com.bignerdranch.android.multiselector.MultiSelector import com.bignerdranch.android.multiselector.MultiSelector
import com.bignerdranch.android.multiselector.SwappingHolder import com.bignerdranch.android.multiselector.SwappingHolder
@ -17,6 +18,7 @@ import com.simplemobiletools.applauncher.models.AppLauncher
import kotlinx.android.synthetic.main.app_launcher_dialog_item.view.* import kotlinx.android.synthetic.main.app_launcher_dialog_item.view.*
import kotlinx.android.synthetic.main.edit_launcher.view.* import kotlinx.android.synthetic.main.edit_launcher.view.*
import java.util.* import java.util.*
import java.util.regex.Pattern
class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val itemClick: (AppLauncher) -> Unit) : class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val itemClick: (AppLauncher) -> Unit) :
RecyclerView.Adapter<RecyclerAdapter.ViewHolder>() { RecyclerView.Adapter<RecyclerAdapter.ViewHolder>() {
@ -83,10 +85,20 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
val alertDialog = builder.create() val alertDialog = builder.create()
alertDialog.show() alertDialog.show()
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
alertDialog.dismiss() val newName = editView.edit_launcher_edittext.text.toString()
if (isValidName(newName)) {
alertDialog.dismiss()
} else {
Toast.makeText(act, act.resources.getString(R.string.invalid_characters), Toast.LENGTH_SHORT).show()
}
} }
} }
private fun isValidName(newName: String): Boolean {
val pattern = Pattern.compile("[0-9a-zA-Z-_. ]+")
return pattern.matcher(newName).matches()
}
private fun deleteSelectedItems() { private fun deleteSelectedItems() {
val positions = multiSelector.selectedPositions val positions = multiSelector.selectedPositions
val deleteIds = ArrayList<String>(positions.size) val deleteIds = ArrayList<String>(positions.size)

1
app/src/main/res/values/strings.xml
View File

@ -5,6 +5,7 @@
<string name="rename_launcher">Rename launcher</string> <string name="rename_launcher">Rename launcher</string>
<string name="ok">OK</string> <string name="ok">OK</string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="invalid_characters">New launcher name contains invalid characters</string>
<!-- About --> <!-- About -->
<string name="about">About</string> <string name="about">About</string>