ChronosXYZ/crispa-android
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/crispa-android.git synced 2024-11-09 12:01:01 +00:00
Code Issues Projects Releases Wiki Activity

1. #36. menu edit url layout fix.

Browse Source
This commit is contained in:
vadym 2020-12-07 09:26:55 +02:00
parent 0aa8e4629c
commit 6c97fe1dc4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -8,7 +8,7 @@ android {
applicationId "io.github.chronosx88.yggdrasil" applicationId "io.github.chronosx88.yggdrasil"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 30 targetSdkVersion 30
versionCode 7 versionCode 8
versionName "1.6" versionName "1.6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
setProperty("archivesBaseName", project.getParent().name+"-"+versionName) setProperty("archivesBaseName", project.getParent().name+"-"+versionName)

6
app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
View File

@ -79,7 +79,7 @@ class PeerListActivity : AppCompatActivity() {
var peerListUrl: String = var peerListUrl: String =
preferences.getString(PEER_LIST, "")!! preferences.getString(PEER_LIST, "")!!
if(!peerListUrl.isNullOrBlank()){ if(!peerListUrl.isNullOrBlank()){
peerListUrl = this@PeerListActivity.peerListUrl this@PeerListActivity.peerListUrl = peerListUrl
} }
var extras = intent.extras var extras = intent.extras
var peerList = findViewById<ListView>(R.id.peerList) var peerList = findViewById<ListView>(R.id.peerList)
@ -119,7 +119,7 @@ class PeerListActivity : AppCompatActivity() {
} }
} }
} }
var json = downloadJson(peerListUrl) var json = downloadJson(this@PeerListActivity.peerListUrl)
var countries = CCPCountry.getLibraryMasterCountriesEnglish() var countries = CCPCountry.getLibraryMasterCountriesEnglish()
val mapType: Type = object : val mapType: Type = object :
TypeToken<Map<String?, Map<String, Status>>>() {}.type TypeToken<Map<String?, Map<String, Status>>>() {}.type
@ -349,7 +349,7 @@ class PeerListActivity : AppCompatActivity() {
} }
val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem
item.setActionView(R.layout.menu_edit_url) editUrl.setActionView(R.layout.menu_edit_url)
val editUrlButton = editUrl val editUrlButton = editUrl
.actionView.findViewById<Button>(R.id.editUrlButton) .actionView.findViewById<Button>(R.id.editUrlButton)
editUrlButton.setOnClickListener { editUrlButton.setOnClickListener {