gilardh
/
SilentDragonAndroid
forked from hush/SilentDragonAndroid-old
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Cleaned up Settings UI and began adding custom wormhole support

master
jahway603 4 years ago
parent
4e3306f59e
commit
668347fd5e
3 changed files with 119 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      app/src/main/java/org/myhush/silentdragon/ui/SettingsActivity.kt
  2. 119
      app/src/main/res/layout/activity_settings.xml
  3. 6
      app/src/main/res/values/strings.xml

34
app/src/main/java/org/myhush/silentdragon/ui/SettingsActivity.kt
View File

@ -2,12 +2,10 @@
package org.myhush.silentdragon.ui
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import android.widget.Adapter
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.*
import androidx.appcompat.app.AppCompatActivity
import kotlinx.android.synthetic.main.activity_settings.*
import org.myhush.silentdragon.ConnectionManager
import org.myhush.silentdragon.DataModel
@ -22,6 +20,9 @@ class SettingsActivity : AppCompatActivity() {
updateUI()
val result = findViewById<View>(R.id.currentWormhole) as TextView
val myhush_default_wormhole : String = "https://wormhole.myhush.org"
btnDisconnect.setOnClickListener {
DataModel.setConnString(
null,
@ -43,6 +44,20 @@ class SettingsActivity : AppCompatActivity() {
updateUI()
}
btnSetWormhole.setOnClickListener {
val inputText = findViewById<View>(R.id.wormholeInput) as EditText
val customWormhole = inputText.getText().toString()
// set to default if nothing in wormhole entry EditText object
if (inputText.text.isBlank()) {
result.setText(myhush_default_wormhole)
Toast.makeText(this, "YEAH: " + myhush_default_wormhole, Toast.LENGTH_SHORT).show()
} else {
result.setText(customWormhole)
Toast.makeText(this, "YEAH: " + customWormhole, Toast.LENGTH_SHORT).show()
}
}
spinnerCurrency!!.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>, view: View, pos: Int, id: Long) {
@ -51,10 +66,11 @@ class SettingsActivity : AppCompatActivity() {
DataModel.selectedCurrency = cur // Set cur as selected
// Save currency
var pref: SharedPreferences = getSharedPreferences("MainFile",0)
var pref: SharedPreferences = getSharedPreferences("MainFile", 0)
var editor: SharedPreferences.Editor = pref.edit()
editor.putString("currency",
editor.putString(
"currency",
DataModel.selectedCurrency
)
@ -79,7 +95,11 @@ class SettingsActivity : AppCompatActivity() {
}
var adapter: ArrayAdapter<String> = ArrayAdapter(this, android.R.layout.simple_spinner_item, items)
var adapter: ArrayAdapter<String> = ArrayAdapter(
this,
android.R.layout.simple_spinner_item,
items
)
adapter.setDropDownViewResource(android.R.layout.simple_spinner_item)
spinnerCurrency.adapter = adapter

119
app/src/main/res/layout/activity_settings.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -16,17 +16,9 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintVertical_bias="1.0"
android:focusable="true"
android:focusableInTouchMode="true">
<TextView
android:id="@+id/textView"
@ -80,7 +72,7 @@
android:text="@string/wormhole_settings"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider"/>
app:layout_constraintTop_toBottomOf="@+id/divider" />
<CheckBox
android:id="@+id/chkDisallowInternet"
@ -95,7 +87,7 @@
app:layout_constraintTop_toBottomOf="@+id/textWormholeSettings" />
<TextView
android:id="@+id/textView4"
android:id="@+id/wormholeAlert"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -107,50 +99,110 @@
app:layout_constraintTop_toBottomOf="@+id/chkDisallowInternet" />
<View
android:id="@+id/divider3"
android:id="@+id/divider5"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wormholeAlert" />
<TextView
android:id="@+id/customWormholeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/wormhole_custom_title"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider5" />
<TextView
android:id="@+id/currentWormhole"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="@string/wormhole"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/customWormholeTitle" />
<EditText
android:id="@+id/wormholeInput"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:autoText="false"
android:clickable="false"
android:hint="@string/change_below"
android:inputType="text"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/currentWormhole" />
<Button
android:id="@+id/btnSetWormhole"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/wormhole_custom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wormholeInput" />
<View
android:id="@+id/divider3"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView4" />
app:layout_constraintTop_toBottomOf="@+id/btnSetWormhole" />
<TextView
android:id="@+id/textView11"
android:layout_width="110dp"
android:layout_height="36dp"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:text="@string/currency"
android:textAlignment="center"
android:textIsSelectable="false"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider3" />
<Spinner
android:id="@+id/spinnerCurrency"
android:layout_width="360dp"
android:layout_height="30dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_width="100dp"
android:layout_height="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView11" />
app:layout_constraintTop_toBottomOf="@+id/divider3" />
<View
android:id="@+id/divider4"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
@ -168,24 +220,25 @@
android:text="@string/silentdragon_version"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider4" />
app:layout_constraintTop_toBottomOf="@+id/divider4"
app:layout_constraintRight_toRightOf="@+id/lblServerVersion"/>
<TextView
android:id="@+id/lblServerVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:text=""
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView10" />
app:layout_constraintStart_toEndOf="@+id/textView10"
app:layout_constraintTop_toBottomOf="@+id/divider4" />
<View
android:id="@+id/divider2"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
@ -195,4 +248,4 @@
app:layout_constraintTop_toBottomOf="@+id/lblServerVersion" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

6
app/src/main/res/values/strings.xml
View File

@ -14,6 +14,8 @@
<string name="address">Address</string>
<string name="cancel">Cancel</string>
<string name="amount">Amount</string>
<string name="wormhole">Wormhole</string>
<string name="test_string" translatable="false">Test String</string>
<!-- TxDetailsActivity.kt -->
<string name="reply">Reply</string>
@ -82,8 +84,12 @@
<string name="wormhole_settings">Wormhole Settings</string>
<string name="disallow_routing_over_external_service">Disallow routing over external service/internet</string>
<string name="only_attempts_direct_connection">If checked, the app will only attempt a direct connection to SilentDragon, and not route traffic over the internet via the WormHole service at wormhole.myhush.org . Please see the https://myhush.org/silentdragon for more details</string>
<string name="wormhole_custom_title">Current Wormhole:</string>
<string name="wormhole_custom">Set custom Wormhole</string>
<string name="myhush_default_wormhole" translatable="false">https://wormhole.myhush.org</string>
<string name="currency">Currency</string>
<string name="silentdragon_version">SilentDragon version</string>
<string name="change_below">Enter wormhole link here and click below to set</string>
<!-- activity_about.xml -->
<string name="website">Visit our website</string>

Write Preview
Loading…
Cancel
Save