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

Merge branch 'dev' into chat 

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
chat
Jonathan "Duke" Leto 5 years ago
parent
67e6c4b690 67ba7d096f
commit
6af0c3345e
9 changed files with 230 additions and 67 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. 2
      app/build.gradle
  2. 16
      app/src/main/AndroidManifest.xml
  3. 20
      app/src/main/java/org/myhush/silentdragon/AboutActivity.kt
  4. 5
      app/src/main/java/org/myhush/silentdragon/MainActivity.kt
  5. 1
      app/src/main/java/org/myhush/silentdragon/SettingsActivity.kt
  6. 142
      app/src/main/res/layout/activity_about.xml
  7. 105
      app/src/main/res/layout/activity_settings.xml
  8. 4
      app/src/main/res/menu/menu_main.xml
  9. 2
      app/src/main/res/values/strings.xml

2
app/build.gradle
View File

@ -18,7 +18,7 @@ android {
minSdkVersion 19
targetSdkVersion 28
versionCode 1
versionName "0.6.0-alpha2"
versionName "0.6.0-alpha3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}

16
app/src/main/AndroidManifest.xml
View File

@ -32,8 +32,18 @@
android:value=".SendActivity" />
</activity>
<activity
android:name=".QrReaderActivity"
android:screenOrientation="portrait" />
android:name="org.myhush.silentdragon.AboutActivity"
android:label="@string/title_activity_about"
android:parentActivityName="org.myhush.silentdragon.SendActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".SendActivity" />
</activity>
<activity
android:name="org.myhush.silentdragon.QrReaderActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".TxDetailsActivity"
android:label="@string/title_activity_tx_details"
@ -79,4 +89,4 @@
</activity>
</application>
</manifest>
</manifest>

20
app/src/main/java/org/myhush/silentdragon/AboutActivity.kt
View File

@ -0,0 +1,20 @@
// Copyright 2019 The Hush developers
package org.myhush.silentdragon
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_about.lblVersionName
class AboutActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_about)
updateUI()
}
fun updateUI() {
lblVersionName.text = BuildConfig.VERSION_NAME
}
}

5
app/src/main/java/org/myhush/silentdragon/MainActivity.kt
View File

@ -275,6 +275,11 @@ class MainActivity : AppCompatActivity(),
startActivity(intent)
return true
}
R.id.action_about -> {
val intent = Intent(this, AboutActivity::class.java)
startActivity(intent)
return true
}
R.id.action_refresh -> {
swiperefresh.isRefreshing = true
ConnectionManager.refreshAllData()

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

@ -84,7 +84,6 @@ class SettingsActivity : AppCompatActivity() {
chkDisallowInternet.isChecked = !DataModel.getGlobalAllowInternet()
lblVersionName.text = BuildConfig.VERSION_NAME
lblServerVersion.text = DataModel.mainResponseData?.serverversion ?: "Not Connected"
}
}

142
app/src/main/res/layout/activity_about.xml
View File

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
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"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.AboutActivity">
<android.support.constraint.ConstraintLayout
android:id="@+id/scrollView2"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
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" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="SilentDragonAndroid version"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lblVersionName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="version"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<View
android:id="@+id/divider"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblVersionName" />
tools:layout_editor_absoluteY="56dp" />
<TextView
android:id="@+id/Copyright"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="Copyright"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider" />
<TextView
android:id="@+id/CopyrightText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="2019 The Hush developers"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Copyright" />
<View
android:id="@+id/divider2"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/CopyrightText" />
tools:layout_editor_absoluteY="56dp" />
<TextView
android:id="@+id/License"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="License"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider2" />
<TextView
android:id="@+id/LicenseText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="GNU Public License V3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/License" />
<View
android:id="@+id/divider3"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/LicenseText" />
tools:layout_editor_absoluteY="56dp" />
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>

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

@ -28,6 +28,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="SilentDragon connection address"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/txtSettingsConnString"
android:layout_width="wrap_content"
@ -47,17 +58,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtSettingsConnString" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="SilentDragon connection address"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/divider"
android:layout_width="0dp"
@ -95,6 +95,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/chkDisallowInternet" />
<View
android:id="@+id/divider3"
android:layout_width="0dp"
@ -107,7 +108,31 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spinnerCurrency" />
app:layout_constraintTop_toBottomOf="@+id/textView4" />
<TextView
android:id="@+id/textView11"
android:layout_width="131dp"
android:layout_height="44dp"
android:layout_marginTop="16dp"
android:text="Currency"
android:textSize="30sp"
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="374dp"
android:layout_height="47dp"
android:layout_marginStart="10dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView11" />
<View
android:id="@+id/divider4"
@ -121,17 +146,8 @@
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/spinnerCurrency" />
<TextView
android:id="@+id/lblServerVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="TextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView10" />
<TextView
android:id="@+id/textView10"
@ -142,37 +158,24 @@
android:text="SilentDragon version"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblVersionName" />
<TextView
android:id="@+id/textView3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="SilentDragonAndroid version"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider3" />
app:layout_constraintTop_toBottomOf="@+id/divider4" />/>
<TextView
android:id="@+id/lblVersionName"
android:id="@+id/lblServerVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
app:layout_constraintTop_toBottomOf="@+id/textView10" />
<View
android:id="@+id/divider2"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/listDivider"
android:visibility="visible"
@ -181,27 +184,5 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblServerVersion" />
<Spinner
android:id="@+id/spinnerCurrency"
android:layout_width="374dp"
android:layout_height="47dp"
android:layout_marginStart="10dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView11" />
<TextView
android:id="@+id/textView11"
android:layout_width="131dp"
android:layout_height="44dp"
android:layout_marginTop="16dp"
android:text="Currency"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider4" />
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>

4
app/src/main/res/menu/menu_main.xml
View File

@ -7,6 +7,10 @@
android:title="@string/action_settings"
android:orderInCategory="100"
app:showAsAction="never"/>
<item android:id="@+id/action_about"
android:title="@string/action_about"
android:orderInCategory="100"
app:showAsAction="never"/>
<item android:title="Refresh" android:id="@+id/action_refresh"
compat:showAsAction="ifRoom"

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

@ -1,6 +1,7 @@
<resources>
<string name="app_name">SilentDragon</string>
<string name="action_settings">Settings</string>
<string name="action_about">About</string>
<string name="title_activity_scrolling">ScrollingActivity</string>
<string name="title_activity_receive">ReceiveActivity</string>
@ -11,6 +12,7 @@
<string name="title_activity_tx_details">TxDetailsActivity</string>
<string name="title_activity_qr_code_reader">QrCodeReaderActivity</string>
<string name="title_activity_settings">Settings</string>
<string name="title_activity_about">About</string>
<!-- Strings related to Settings -->

Write Preview
Loading…
Cancel
Save