Skip to content

Commit

Permalink
Merge branch 'dev' into chat
Browse files Browse the repository at this point in the history 
 Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
  • Loading branch information
@leto
leto committed Nov 22, 2019
2 parents 67e6c4b + 67ba7d0 commit 6af0c33
Show file tree
Hide file tree
Showing 9 changed files with 230 additions and 67 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
16 changes: 13 additions & 3 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -79,4 +89,4 @@
</activity>
</application>

</manifest>
</manifest>
20 changes: 20 additions & 0 deletions app/src/main/java/org/myhush/silentdragon/AboutActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 5 additions & 0 deletions app/src/main/java/org/myhush/silentdragon/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/myhush/silentdragon/SettingsActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ class SettingsActivity : AppCompatActivity() {

chkDisallowInternet.isChecked = !DataModel.getGlobalAllowInternet()

lblVersionName.text = BuildConfig.VERSION_NAME
lblServerVersion.text = DataModel.mainResponseData?.serverversion ?: "Not Connected"
}
}
142 changes: 142 additions & 0 deletions app/src/main/res/layout/activity_about.xml
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 43 additions & 62 deletions app/src/main/res/layout/activity_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -95,6 +95,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/chkDisallowInternet" />


<View
android:id="@+id/divider3"
android:layout_width="0dp"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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 changes: 4 additions & 0 deletions app/src/main/res/menu/menu_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading

0 comments on commit 6af0c33

Please sign in to comment.