mirror of
https://github.com/yggdrasil-network/crispa-android.git
synced 2024-10-22 19:31:02 +00:00
Compare commits
No commits in common. "d6ac6fcca64865b203a281382a9e93670d756d24" and "04c58d2a57e671d41e32bf5f6749a6ea8fae9559" have entirely different histories.
d6ac6fcca6
...
04c58d2a57
@ -14,6 +14,7 @@
|
|||||||
<option value="$PROJECT_DIR$/yggdrasil" />
|
<option value="$PROJECT_DIR$/yggdrasil" />
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
|
<option name="resolveModulePerSourceSet" value="false" />
|
||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
@ -6,15 +6,14 @@ def acraSecretsProperties = new Properties()
|
|||||||
acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
|
acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 33
|
compileSdkVersion 32
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "io.github.chronosx88.yggdrasil"
|
applicationId "io.github.chronosx88.yggdrasil"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
|
targetSdkVersion 32
|
||||||
|
|
||||||
targetSdkVersion 33
|
versionCode 39
|
||||||
|
versionName "2.1.2"
|
||||||
versionCode 40
|
|
||||||
versionName "2.1.4"
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
|
setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
|
||||||
|
|
||||||
@ -74,19 +73,19 @@ gradle.projectsEvaluated {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
implementation 'ch.acra:acra-http:5.9.6'
|
implementation 'ch.acra:acra-http:5.8.3'
|
||||||
implementation 'ch.acra:acra-dialog:5.9.6'
|
implementation 'ch.acra:acra-dialog:5.8.3'
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation project(path: ':yggdrasil')
|
implementation project(path: ':yggdrasil')
|
||||||
|
|
||||||
implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
|
implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
||||||
implementation 'androidx.preference:preference-ktx:1.2.0'
|
implementation 'androidx.preference:preference-ktx:1.2.0'
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
|
|
||||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
|
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
|
||||||
implementation 'com.google.android.material:material:1.8.0-alpha03'
|
implementation 'com.google.android.material:material:1.7.0-alpha01'
|
||||||
implementation 'com.google.code.gson:gson:2.9.0'
|
implementation 'com.google.code.gson:gson:2.8.6'
|
||||||
implementation 'com.hbb20:ccp:2.4.0'
|
implementation 'com.hbb20:ccp:2.4.0'
|
||||||
implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1'
|
implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1'
|
||||||
implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer:3.1.1'
|
implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer:3.1.1'
|
||||||
|
@ -22,7 +22,21 @@ import kotlin.concurrent.thread
|
|||||||
class DNSListActivity : AppCompatActivity() {
|
class DNSListActivity : AppCompatActivity() {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val allDNS = emptyList<DNSInfo>()
|
val allDNS = arrayListOf(
|
||||||
|
DNSInfo(
|
||||||
|
InetAddress.getByName("[301:2522::53]"),
|
||||||
|
"CZ",
|
||||||
|
"DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd"),
|
||||||
|
DNSInfo(InetAddress.getByName("[301:2923::53]"),
|
||||||
|
"SK",
|
||||||
|
"DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd"),
|
||||||
|
DNSInfo(InetAddress.getByName("[300:4523::53]"),
|
||||||
|
"DE",
|
||||||
|
"DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd"),
|
||||||
|
DNSInfo(InetAddress.getByName("[303:8b1a::53]"),
|
||||||
|
"RU",
|
||||||
|
"DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd")
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
var isLoading = true;
|
var isLoading = true;
|
||||||
@ -117,8 +131,8 @@ class DNSListActivity : AppCompatActivity() {
|
|||||||
val item = menu.findItem(R.id.saveItem) as MenuItem
|
val item = menu.findItem(R.id.saveItem) as MenuItem
|
||||||
item.setActionView(R.layout.menu_save)
|
item.setActionView(R.layout.menu_save)
|
||||||
val saveButton = item
|
val saveButton = item
|
||||||
.actionView?.findViewById<Button>(R.id.saveButton)
|
.actionView.findViewById<Button>(R.id.saveButton)
|
||||||
saveButton?.setOnClickListener {
|
saveButton.setOnClickListener {
|
||||||
if(isLoading){
|
if(isLoading){
|
||||||
return@setOnClickListener
|
return@setOnClickListener
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,6 @@ import androidx.appcompat.app.AppCompatActivity
|
|||||||
import androidx.appcompat.widget.SwitchCompat
|
import androidx.appcompat.widget.SwitchCompat
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import dalvik.system.DexFile
|
import dalvik.system.DexFile
|
||||||
import mobile.Mobile
|
|
||||||
import org.yggdrasil.app.crispa.models.DNSInfo
|
import org.yggdrasil.app.crispa.models.DNSInfo
|
||||||
import org.yggdrasil.app.crispa.models.PeerInfo
|
import org.yggdrasil.app.crispa.models.PeerInfo
|
||||||
import org.yggdrasil.app.crispa.models.config.DNSInfoListAdapter
|
import org.yggdrasil.app.crispa.models.config.DNSInfoListAdapter
|
||||||
@ -215,7 +214,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
|
val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
|
||||||
}
|
}
|
||||||
val versionName = findViewById<Button>(R.id.about)
|
val versionName = findViewById<Button>(R.id.about)
|
||||||
versionName.text = """version:${BuildConfig.VERSION_NAME} build:${BuildConfig.VERSION_CODE} core:${Mobile.getVersion()}"""
|
versionName.text = """version:${BuildConfig.VERSION_NAME} build:${BuildConfig.VERSION_CODE}"""
|
||||||
versionName.setOnClickListener {
|
versionName.setOnClickListener {
|
||||||
val intent = Intent(this@MainActivity, AboutActivity::class.java)
|
val intent = Intent(this@MainActivity, AboutActivity::class.java)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
|
@ -339,8 +339,8 @@ class PeerListActivity : AppCompatActivity() {
|
|||||||
val item = menu.findItem(R.id.saveItem) as MenuItem
|
val item = menu.findItem(R.id.saveItem) as MenuItem
|
||||||
item.setActionView(R.layout.menu_save)
|
item.setActionView(R.layout.menu_save)
|
||||||
val saveButton = item
|
val saveButton = item
|
||||||
.actionView?.findViewById<Button>(R.id.saveButton)
|
.actionView.findViewById<Button>(R.id.saveButton)
|
||||||
saveButton?.setOnClickListener {
|
saveButton.setOnClickListener {
|
||||||
saveButton.isClickable = false
|
saveButton.isClickable = false
|
||||||
cancelPeerListPing()
|
cancelPeerListPing()
|
||||||
val result = Intent(this, MainActivity::class.java)
|
val result = Intent(this, MainActivity::class.java)
|
||||||
@ -354,8 +354,8 @@ class PeerListActivity : AppCompatActivity() {
|
|||||||
val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem
|
val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem
|
||||||
editUrl.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 {
|
||||||
editPeerListUrl()
|
editPeerListUrl()
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = "1.7.21"
|
ext.kotlin_version = "1.5.31"
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.2.2'
|
classpath 'com.android.tools.build:gradle:7.2.0'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
Loading…
Reference in New Issue
Block a user