Make system tethering entry always available

This commit is contained in:
Mygod
2018-01-15 13:40:32 -08:00
parent 3a3e6b8689
commit 67aa86f0f7
7 changed files with 30 additions and 46 deletions

View File

@@ -13,16 +13,16 @@ import android.support.v7.util.SortedList
import android.support.v7.widget.DefaultItemAnimator
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.text.Html
import android.support.v7.widget.Toolbar
import android.view.LayoutInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.databinding.FragmentTetheringBinding
import be.mygod.vpnhotspot.databinding.ListitemInterfaceBinding
import be.mygod.vpnhotspot.widget.TextViewLinkHandler
class TetheringFragment : Fragment() {
class TetheringFragment : Fragment(), Toolbar.OnMenuItemClickListener {
companion object {
/**
* Source: https://android.googlesource.com/platform/frameworks/base/+/61fa313/core/res/res/values/config.xml#328
@@ -115,11 +115,8 @@ class TetheringFragment : Fragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
binding = DataBindingUtil.inflate(inflater, R.layout.fragment_tethering, container, false)
binding.empty.text = Html.fromHtml(getString(R.string.tethering_no_interfaces))
binding.empty.movementMethod = TextViewLinkHandler.create {
startActivity(Intent().setClassName("com.android.settings",
"com.android.settings.Settings\$TetherSettingsActivity"))
}
binding.toolbar.inflateMenu(R.menu.tethering)
binding.toolbar.setOnMenuItemClickListener(this)
binding.interfaces.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
val animator = DefaultItemAnimator()
animator.supportsChangeAnimations = false // prevent fading-in/out when rebinding
@@ -149,6 +146,15 @@ class TetheringFragment : Fragment() {
super.onStop()
}
override fun onMenuItemClick(item: MenuItem) = when (item.itemId) {
R.id.systemTethering -> {
startActivity(Intent().setClassName("com.android.settings",
"com.android.settings.Settings\$TetherSettingsActivity"))
true
}
else -> false
}
private fun crossFade(old: View, new: View) {
val shortAnimTime = resources.getInteger(android.R.integer.config_shortAnimTime).toLong()
old.animate().alpha(0F).setListener(object : AnimatorListenerAdapter() {

View File

@@ -1,32 +0,0 @@
package be.mygod.vpnhotspot.widget
import android.text.Spannable
import android.text.method.LinkMovementMethod
import android.text.style.URLSpan
import android.view.MotionEvent
import android.widget.TextView
/**
* Based on: https://stackoverflow.com/a/32443884/2245107
*/
abstract class TextViewLinkHandler : LinkMovementMethod() {
companion object {
fun create(handler: (String) -> Unit) = object : TextViewLinkHandler() {
override fun onLinkClick(url: String) = handler(url)
}
}
override fun onTouchEvent(widget: TextView, buffer: Spannable, event: MotionEvent): Boolean {
if (event.action != MotionEvent.ACTION_UP) return super.onTouchEvent(widget, buffer, event)
val x = event.x - widget.totalPaddingLeft + widget.scrollX
val y = event.y.toInt() - widget.totalPaddingTop + widget.scrollY
val layout = widget.layout
val line = layout.getLineForVertical(y)
val off = layout.getOffsetForHorizontal(line, x)
val link = buffer.getSpans(off, off, URLSpan::class.java)
if (link.isNotEmpty()) onLinkClick(link[0].url)
return true
}
abstract fun onLinkClick(url: String)
}