Migrate to emoji2
This commit is contained in:
@@ -45,7 +45,7 @@ open class Client(val mac: MacAddressCompat, val iface: String) {
|
||||
SpannableStringBuilder(if (record.nickname.isEmpty()) {
|
||||
if (record.macLookupPending) MacLookup.perform(mac)
|
||||
macIface
|
||||
} else emojize(record.nickname)).apply {
|
||||
} else record.nickname).apply {
|
||||
if (record.blocked) setSpan(StrikethroughSpan(), 0, length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ import androidx.appcompat.app.AlertDialog
|
||||
import androidx.appcompat.widget.PopupMenu
|
||||
import androidx.collection.LongSparseArray
|
||||
import androidx.databinding.BaseObservable
|
||||
import androidx.emoji2.text.EmojiCompat
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.findViewTreeLifecycleOwner
|
||||
@@ -55,7 +56,7 @@ class ClientsFragment : Fragment() {
|
||||
setTitle(getString(R.string.clients_nickname_title, MacAddressCompat(arg.mac).toString()))
|
||||
setPositiveButton(android.R.string.ok, listener)
|
||||
setNegativeButton(android.R.string.cancel, null)
|
||||
setNeutralButton(emojize(getText(R.string.clients_nickname_set_to_vendor)), listener)
|
||||
setNeutralButton(EmojiCompat.get().process(getText(R.string.clients_nickname_set_to_vendor)), listener)
|
||||
}
|
||||
|
||||
override fun onCreateDialog(savedInstanceState: Bundle?) = super.onCreateDialog(savedInstanceState).apply {
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
package be.mygod.vpnhotspot.client
|
||||
|
||||
import androidx.emoji.text.EmojiCompat
|
||||
|
||||
fun emojize(text: CharSequence?): CharSequence? = if (text == null) null else try {
|
||||
EmojiCompat.get().process(text)
|
||||
} catch (_: IllegalStateException) {
|
||||
text
|
||||
}
|
||||
Reference in New Issue
Block a user