meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: Adds Field to Specify Device IP (#663)

Browse source
This commit is contained in:
Jonathan Bennett 2023-07-17 18:28:32 -05:00 • committed by GitHub
parent 4e410622d8
commit bbb9ca3921
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -14,6 +14,7 @@ import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.RemoteException
import android.util.Patterns
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -24,6 +25,7 @@ import android.widget.RadioButton
import android.widget.TextView
import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.asLiveData
@ -455,6 +457,27 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
}
}
private fun addManualDeviceButton() {
val b = binding.radioButtonManual
val e = binding.editManualAddress
b.isEnabled = false
binding.deviceRadioGroup.addView(b)
b.setOnClickListener {
b.isChecked = onSelected(BTScanModel.DeviceListEntry("", "t" + e.text, true))
}
binding.deviceRadioGroup.addView(e)
e.doAfterTextChanged {
b.isEnabled = Patterns.IP_ADDRESS.matcher(e.text).matches()
}
}
private fun updateDevicesButtons(devices: MutableMap<String, BTScanModel.DeviceListEntry>?) {
// Remove the old radio buttons and repopulate
binding.deviceRadioGroup.removeAllViews()
@ -481,6 +504,8 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
}
}
addManualDeviceButton()
// get rid of the warning text once at least one device is paired.
// If we are running on an emulator, always leave this message showing so we can test the worst case layout
val curRadio = scanModel.selectedAddress