Browse Source

Merge branch 'master' into dev

duke
Jonathan "Duke" Leto 4 years ago
parent
commit
06f113f55e
  1. 4
      .travis.yml
  2. 23
      app/build.gradle
  3. 4
      app/src/androidTest/java/org/myhush/silentdragon/zqwandroid/ExampleInstrumentedTest.kt
  4. 2
      app/src/main/java/org/myhush/silentdragon/AboutActivity.kt
  5. 2
      app/src/main/java/org/myhush/silentdragon/ConnectionManager.kt
  6. 10
      app/src/main/java/org/myhush/silentdragon/MainActivity.kt
  7. 8
      app/src/main/java/org/myhush/silentdragon/QrReaderActivity.kt
  8. 10
      app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt
  9. 4
      app/src/main/java/org/myhush/silentdragon/SendActivity.kt
  10. 2
      app/src/main/java/org/myhush/silentdragon/SettingsActivity.kt
  11. 8
      app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt
  12. 6
      app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt
  13. 6
      app/src/main/java/org/myhush/silentdragon/UnconfirmedTxItemFragment.kt
  14. 4
      app/src/main/res/layout/activity_about.xml
  15. 10
      app/src/main/res/layout/activity_main.xml
  16. 4
      app/src/main/res/layout/activity_qr_reader.xml
  17. 10
      app/src/main/res/layout/activity_receive.xml
  18. 10
      app/src/main/res/layout/activity_send.xml
  19. 8
      app/src/main/res/layout/activity_settings.xml
  20. 10
      app/src/main/res/layout/activity_tx_details.xml
  21. 14
      app/src/main/res/layout/content_main.xml
  22. 12
      app/src/main/res/layout/content_receive.xml
  23. 20
      app/src/main/res/layout/content_send.xml
  24. 24
      app/src/main/res/layout/content_tx_details.xml
  25. 4
      app/src/main/res/layout/fragment_transaction_item.xml
  26. 8
      app/src/main/res/layout/fragment_unconfirmed_tx_item.xml
  27. 137
      app/src/main/res/values-ca/strings.xml
  28. 135
      app/src/main/res/values-es/strings.xml
  29. 137
      app/src/main/res/values-hr/strings.xml
  30. 4
      app/src/main/res/values-it/strings.xml
  31. 4
      app/src/main/res/values-ja/strings.xml
  32. 137
      app/src/main/res/values-sr/strings.xml
  33. 2
      build.gradle
  34. 2
      gradle.properties
  35. 4
      gradle/wrapper/gradle-wrapper.properties

4
.travis.yml

@ -11,8 +11,8 @@ android:
components:
- tools
- platform-tools
- build-tools-28.0.3
- android-28
- build-tools-29.0.3
- android-29
- $ANDROID_TARGET
- extra-android-m2repository
- sys-img-${ANDROID_ABI}-${ANDROID_TARGET}

23
app/build.gradle

@ -6,15 +6,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 28
compileSdkVersion 29
buildToolsVersion "29.0.3"
defaultConfig {
applicationId "org.myhush.silentdragon"
minSdkVersion 19
targetSdkVersion 28
minSdkVersion 17
targetSdkVersion 29
versionCode 2
versionName "0.5.14"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
@ -51,17 +52,17 @@ if (secretsPropertiesFile.exists()) {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidmads.library.qrgenearator:QRGenearator:1.0.3'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'com.beust:klaxon:5.0.1'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.gms:play-services-vision:17.0.2'
implementation 'com.android.support:support-vector-drawable:28.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
}

4
app/src/androidTest/java/org/myhush/silentdragon/zqwandroid/ExampleInstrumentedTest.kt

@ -1,7 +1,7 @@
package org.myhush.silentdragon.zqwandroid
import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith

2
app/src/main/java/org/myhush/silentdragon/AboutActivity.kt

@ -1,7 +1,7 @@
// Copyright 2019-2020 The Hush developers
package org.myhush.silentdragon
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_about.lblVersionName

2
app/src/main/java/org/myhush/silentdragon/ConnectionManager.kt

@ -146,7 +146,7 @@ object ConnectionManager {
.url("https://api.coingecko.com/api/v3/simple/price?ids=hush&vs_currencies=${currencies}")
.build()
val response: Response = client.newCall(request).execute()
val json: JSONObject = JSONObject(response.body()?.string())["hush"] as JSONObject
val json: JSONObject = JSONObject(response.body()?.string() as @NonNull String)["hush"] as JSONObject
if (json.length() > 0){
for (cur: String in json.keys()){

10
app/src/main/java/org/myhush/silentdragon/MainActivity.kt

@ -11,10 +11,10 @@ import android.os.Build
import android.os.Bundle
import android.os.Handler
import android.os.StrictMode
import android.support.constraint.ConstraintLayout
import android.support.design.widget.Snackbar
import android.support.v4.text.HtmlCompat
import android.support.v7.app.AppCompatActivity
import androidx.constraintlayout.widget.ConstraintLayout
import com.google.android.material.snackbar.Snackbar
import androidx.core.text.HtmlCompat
import androidx.appcompat.app.AppCompatActivity
import android.text.Html
import android.util.Log
import android.view.Menu
@ -123,7 +123,7 @@ class MainActivity : AppCompatActivity(),
private fun loadSharedPref() {
var ref: SharedPreferences = getSharedPreferences("MainFile", 0)
DataModel.selectedCurrency = ref.getString("currency", "BTC")
DataModel.selectedCurrency = ref.getString("currency", "BTC").toString()
}
private fun setMainStatus(status: String) {

8
app/src/main/java/org/myhush/silentdragon/QrReaderActivity.kt

@ -6,9 +6,9 @@ import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Bundle
import android.support.v4.app.ActivityCompat
import android.support.v4.content.ContextCompat
import android.support.v7.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.appcompat.app.AppCompatActivity
import android.util.Log
import android.view.Menu
import android.view.MenuItem
@ -120,7 +120,7 @@ class QrReaderActivity : AppCompatActivity() {
println("Preview size: ${cameraSource.previewSize}")
}
} catch (ie: IOException) {
Log.e("CAMERA SOURCE", ie.message)
Log.e("CAMERA SOURCE", ie.toString())
}
}

10
app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt

@ -6,8 +6,8 @@ import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.design.widget.TabLayout
import android.support.v7.app.AppCompatActivity
import com.google.android.material.tabs.TabLayout
import androidx.appcompat.app.AppCompatActivity
import android.util.Log
import android.view.Menu
import android.view.MenuItem
@ -35,7 +35,7 @@ class ReceiveActivity : AppCompatActivity() {
supportActionBar?.setDisplayHomeAsUpEnabled(true)
tabAddressType.setOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
tabAddressType.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
override fun onTabReselected(p0: TabLayout.Tab?) {}
override fun onTabUnselected(p0: TabLayout.Tab?) {}
@ -89,7 +89,7 @@ class ReceiveActivity : AppCompatActivity() {
addrTxt.setOnClickListener {
val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
val clip = ClipData.newPlainText(getString(R.string.hush_address), addr)
clipboard.primaryClip = clip
clipboard.setPrimaryClip(clip)
Toast.makeText(applicationContext, getString(R.string.copied_address_to_clipboard), Toast.LENGTH_SHORT).show()
}
}
@ -123,7 +123,7 @@ class ReceiveActivity : AppCompatActivity() {
return true
}
else -> super.onOptionsItemSelected(item)
else -> super.onOptionsItemSelected(item as MenuItem)
}
}
}

4
app/src/main/java/org/myhush/silentdragon/SendActivity.kt

@ -9,8 +9,8 @@ import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.provider.ContactsContract
import android.support.v4.content.ContextCompat
import android.support.v7.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.appcompat.app.AppCompatActivity
import android.text.Editable
import android.text.InputType
import android.text.SpannableStringBuilder

2
app/src/main/java/org/myhush/silentdragon/SettingsActivity.kt

@ -2,7 +2,7 @@
package org.myhush.silentdragon
import android.content.SharedPreferences
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import android.widget.Adapter

8
app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt

@ -6,9 +6,9 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.support.constraint.ConstraintLayout
import android.support.v4.app.Fragment
import android.support.v4.content.ContextCompat
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.fragment.app.Fragment
import androidx.core.content.ContextCompat
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -44,7 +44,7 @@ class TransactionItemFragment : Fragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
tx = Klaxon().parse(it.getString(ARG_PARAM1))
tx = Klaxon().parse(it.getString(ARG_PARAM1).toString())
param2 = it.getString(ARG_PARAM2)
}
}

6
app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt

@ -4,7 +4,7 @@ package org.myhush.silentdragon
import android.annotation.SuppressLint
import android.app.Activity
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import com.beust.klaxon.Klaxon
import kotlinx.android.synthetic.main.activity_tx_details.*
import kotlinx.android.synthetic.main.content_tx_details.*
@ -14,7 +14,7 @@ import java.text.DecimalFormat
import java.util.*
import android.content.Intent
import android.net.Uri
import android.support.constraint.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintLayout
import android.view.Menu
import android.view.MenuItem
import android.view.View
@ -136,7 +136,7 @@ class TxDetailsActivity : AppCompatActivity() {
return true
}
else -> super.onOptionsItemSelected(item)
else -> super.onOptionsItemSelected(item as MenuItem)
}
}

6
app/src/main/java/org/myhush/silentdragon/UnconfirmedTxItemFragment.kt

@ -5,8 +5,8 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.support.constraint.ConstraintLayout
import android.support.v4.app.Fragment
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -37,7 +37,7 @@ class UnconfirmedTxItemFragment : Fragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
tx = Klaxon().parse(it.getString(ARG_PARAM1))
tx = Klaxon().parse(it.getString(ARG_PARAM1).toString())
param2 = it.getString(ARG_PARAM2)
}
}

4
app/src/main/res/layout/activity_about.xml

@ -7,7 +7,7 @@
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.AboutActivity">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/scrollView2"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -307,5 +307,5 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/CopyrightText" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

10
app/src/main/res/layout/activity_main.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.MainActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_main"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/activity_qr_reader.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.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"
@ -50,4 +50,4 @@
android:layout_marginEnd="8dp" android:textAlignment="center" android:textColor="@color/colorAccent"
android:layout_marginBottom="32dp"
app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/layout/activity_receive.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.ReceiveActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_receive"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_send.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.SendActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_send"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/layout/activity_settings.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.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"
@ -7,7 +7,7 @@
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.SettingsActivity">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/scrollView2"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -184,5 +184,5 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblServerVersion" />
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/layout/activity_tx_details.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.TxDetailsActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_tx_details"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

14
app/src/main/res/layout/content_main.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.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"
@ -62,7 +62,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_launcher_dragon_foreground" />
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swiperefresh"
android:layout_width="match_parent"
android:layout_height="0dp"
@ -87,8 +87,8 @@
android:textSize="18sp" android:padding="16dp"/>
</LinearLayout>
</ScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
<android.support.constraint.ConstraintLayout
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="364dp" app:layout_constraintTop_toBottomOf="@+id/imageView3"
android:layout_marginBottom="32dp" app:layout_constraintBottom_toBottomOf="parent"
@ -144,8 +144,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnReconnect" />
</android.support.constraint.ConstraintLayout>
<android.support.design.widget.BottomNavigationView
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width="match_parent"
android:layout_height="0dp" app:menu="@menu/menu_nav"
android:id="@+id/bottomNav"
@ -154,4 +154,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

12
app/src/main/res/layout/content_receive.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.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"
@ -34,21 +34,21 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/txtRcvAddrTitle" android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@+id/imageView" android:textColor="@color/light_grey"/>
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:layout_width="395dp"
android:layout_height="wrap_content"
android:id="@+id/tabAddressType"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent">
<android.support.design.widget.TabItem
<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="zAddr"/>
<android.support.design.widget.TabItem
<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="tAddr"/>
</android.support.design.widget.TabLayout>
</android.support.constraint.ConstraintLayout>
</com.google.android.material.tabs.TabLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

20
app/src/main/res/layout/content_send.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.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"
@ -12,11 +12,11 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.constraint.ConstraintLayout android:layout_width="match_parent"
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" android:id="@+id/linearLayout3">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -89,9 +89,9 @@
app:layout_constraintBaseline_toBaselineOf="@+id/textView7"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/AmountLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -174,8 +174,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="218dp"
android:id="@+id/MemoLayout" android:layout_marginTop="8dp"
@ -221,7 +221,7 @@
android:id="@+id/txtMemoSize" android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBaseline_toBaselineOf="@+id/txtSendMemoTitle"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<Button
android:text="@string/send"
android:layout_width="wrap_content"
@ -241,6 +241,6 @@
app:layout_constraintTop_toBottomOf="@+id/MemoLayout"
app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="16dp"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="16dp"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

24
app/src/main/res/layout/content_tx_details.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.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"
@ -11,10 +11,10 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.constraint.ConstraintLayout android:layout_width="match_parent"
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" android:id="@+id/linearLayouttxd3">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="60dp" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="16dp" android:id="@+id/constraintLayout"
@ -46,9 +46,9 @@
app:layout_constraintStart_toEndOf="@+id/imgTypeColor" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="8dp"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -88,8 +88,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView5" />
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:id="@+id/layoutAmount"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout2" android:layout_marginBottom="8dp"
@ -130,9 +130,9 @@
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp" android:textSize="18sp" android:textAlignment="textEnd"
app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="16dp"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layoutMemo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -176,7 +176,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView14" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<Button
android:text="@string/view_on_block_explorer"
android:layout_width="wrap_content"
@ -189,6 +189,6 @@
android:layout_marginEnd="8dp" app:layout_constraintVertical_bias="0.0"
android:background="@color/colorAccent" android:textColor="@android:color/white"
android:paddingLeft="10dp" android:paddingRight="10dp"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/fragment_transaction_item.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/outlineLayout"
@ -54,4 +54,4 @@
app:layout_constraintStart_toEndOf="@+id/txdate"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/fragment_unconfirmed_tx_item.xml

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.myhush.silentdragon.UnconfirmedTxItemFragment" android:id="@+id/frameLayout">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layoutUnconfirmedItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -54,5 +54,5 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/txtUnconfirmedTx"
app:layout_constraintTop_toBottomOf="@+id/txtUnconfirmedTx" />
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

137
app/src/main/res/values-ca/strings.xml

@ -0,0 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- catalan -->
<!-- general -->
<string name="is_not_a_valid_connection_string">%1$s no és un fil de connexió vàlid</string>
<string name="valid_address">Adreça Vàlida</string>
<string name="balance">Balanç</string>
<string name="scan_qr_code">Escaneja el Codi QR</string>
<string name="send">Envia</string>
<string name="address">Adreça</string>
<string name="cancel">Cancel·la</string>
<string name="amount">Quantitat</string>
<!-- TxDetailsActivity.kt -->
<string name="reply">Resposta</string>
<string name="shielded_address">(Adreça blindada)</string>
<string name="unconfirmed_tx"> (Tx No Confirmada)</string>
<string name="confirm_transaction">Confirmar Transacció</string>
<string name="confirm_and_send">Confirmar i Enviar</string>
<!-- content_main.xml -->
<string name="past_transactions">Transaccions Anteriors</string>
<string name="or">O</string>
<string name="reconnect">Torna a Connectar</string>
<string name="help">Ajuda</string>
<string name="help_text">Aquesta aplicació fa de control remot per al teu full node.\n\nPer tal que el teu tel·lèfon Android es pugui connectar amb el teu escriptori, necessites arrencar el SilentDragon d\'escriptori i sincronitzar-lo del tot.\n\nUn cop el teu node estigui sincronitzat, ves a Apps -> Connectar App Mòbil per veure el Codi de Connexió QR que pots escanejar des d\'aquesta app per connectar el SilentDragon.</string>
<!-- MainActivity.kt -->
<string name="app_name">SilentDragon</string>
<string name="no_connection">Sense Connexió</string>
<string name="connecting">Connectant&#8230;</string>
<string name="loading">Carregant&#8230;</string>
<!-- content_tx_details -->
<string name="memo">Memo</string>
<string name="memo_contents">Continguts Memo</string>
<string name="view_on_block_explorer">Veure al Block Explorer</string>
<string name="date_time">Data Hora</string>
<!-- fragment_transaction_item -->
<string name="date">Data</string>
<string name="amt">Quant</string>
<!-- fragment_unconfirmed_tx_item -->
<string name="unconfirmed_transaction">Transacció No Confirmada</string>
<!-- UnconfirmedTxItemFragment.kt -->
<string name="sending">Enviant </string>
<string name="receiving">Rebent </string>
<!-- menu_qrcodereader.xml -->
<string name="manual_input">Introducció Manual</string>
<!-- menu_recieve -->
<string name="share">Compartir</string>
<!-- menu_txdetails -->
<string name="view">Veure</string>
<!-- TxDetailsActivity.kt -->
<string name="sent">Enviat</string>
<string name="received">Rebut</string>
<!-- menu_main -->
<string name="refresh">Refrescar</string>
<!-- connectionManager.kt -->
<string name="Connecting_over_internet_not_enabled_in_desktop_node">No s\'ha activat la connexió del node d\'escriptori a internet.</string>
<string name="Connecting_over_internet_is_disabled_in_settings">La configuració de connexió a internet esta desactivada.</string>
<!-- activity_qr_reader -->
<string name="how_to_connect_sd2sda">Ves a \"Apps\" -> \"Connectar app mòbil\" al teu escriptori i escaneja el Codi QR per connectar</string>
<!-- activity_settings -->
<string name="disconnect">Desconnectar</string>
<string name="silentDragon_connection_address">Adreça de connexió de SilentDragon</string>
<string name="disallow_routing_over_external_service">No permetre l\'enrutament a internet/servei extern</string>
<string name="only_attempts_direct_connection">Si es selecciona, la app només es connectarà directament amb el SilentDragon, i no enrutarà cap tràfic a internet via el servei WormHole a wormhole.myhush.org . Si us plau, fes un cop d\'ull a https://myhush.org/silentdragon per a més detalls</string>
<string name="currency">Moneda</string>
<string name="silentdragon_version">SilentDragon versió</string>
<!-- activity_about.xml -->
<string name="website">Visita la nostra web</string>
<string name="discord">Uneix-te al nostre Discord</string>
<string name="twitter">Twitter</string>
<string name="github">GitHub</string>
<string name="credits">Crèdits</string>
<string name="license">Llicència</string>
<string name="sda_version">SilentDragonAndroid versió</string>
<string name="copyright">Copyright</string>
<!-- SettingActivity.kt -->
<string name="not_connected">No Connectat</string>
<!-- QrReaderActivity.kt -->
<string name="paste_the_code_here_manually">Enganxa el codi aquí manualment</string>
<string name="ok">OK</string>
<string name="is_not_a_valid_hush_address">%1$s no és una adreça HUSH vàlida!</string>
<!-- ReceiveActivity.kt.kt -->
<string name="receive">Rebre</string>
<string name="no_address">Cap adreça!</string>
<string name="hush_address">Adreça Hush</string>
<string name="copied_address_to_clipboard">Adreça copiada al porta-retalls</string>
<string name="your_hush_transparent_address">La teva adreça Hush transparent</string>
<string name="your_hush_shielded_address">La teva adreça Hush blindada</string>
<!-- SendActivity.kt -->
<string name="send_transaction">Enviar Transacció</string>
<string name="not_a_valid_hush_address">Adreça Hush no vàlida!</string>
<string name="no_memo_for_taddresses">(No Memo per a les t-Addresses)</string>
<string name="memo_optional">Memo (Opcional)</string>
<string name="send_anyway">Enviar de totes maneres</string>
<string name="invalid_amount">Quantitat invàlida!</string>
<string name="invalid_destination_Hush_address">Adreça de Hush de destí invàlida!</string>
<string name="send_from_taddr">Enviar desde t-addr?</string>
<string name="cant_send_a_memo_to_a_taddr">No es pot enviar un Memo a les adreces transparents</string>
<string name="error_sending_transaction">Error a l\'enviar la transacció!</string>
<string name="memo_field_over_512">El camp Memo és massa llarg! Ha de tenir com a molt 512 bytes.</string>
<string name="more_than_shielded_address">%1$s %2$s és més que el balanç de la teva adreça blindada. Aquesta Tx haurà de ser enviada des d\'una adreça transparent i no serà privada.\n\nEstàs completament segur?</string>
<string name="max_spend_in_a_single_tx">No es pot gastar més de %1$d %2$s en una sola Tx"</string>
<string name="reply_to">Respon a</string>
<!-- content_send -->
<string name="to">A</string>
<string name="fee">Comissió:</string>
<string name="include_reply_to_address">Incloure adreça de resposta</string>
<string name="action_settings">Configuració</string>
<string name="action_about">Sobre aquesta app</string>
<string name="transaction_details">Detalls de la Transacció</string>
<string name="title_activity_settings">Configuració</string>
<string name="title_activity_about">Sobre aquesta app</string>
</resources>

135
app/src/main/res/values-es/strings.xml

@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- general -->
<string name="is_not_a_valid_connection_string">%1$s no es una cadena de conexión válida</string>
<string name="valid_address">Dirección válida</string>
<string name="balance">Balance</string>
<string name="scan_qr_code">Escanear código QR</string>
<string name="send">Enviar</string>
<string name="address">Dirección</string>
<string name="cancel">Cancelar</string>
<string name="amount">Cantidad</string>
<!-- TxDetailsActivity.kt -->
<string name="reply">Responder</string>
<string name="shielded_address">(Dirección blindada)</string>
<string name="unconfirmed_tx"> (Tx sin confirmar)</string>
<string name="confirm_transaction">Confirmar transacción</string>
<string name="confirm_and_send">Confirmar y enviar</string>
<!-- content_main.xml -->
<string name="past_transactions">Transacciones pasadas</string>
<string name="or">O</string>
<string name="reconnect">Reconectar</string>
<string name="help">Ayuda</string>
<string name="help_text">Esta aplicación hace control remoto para su nodo completo.&lt;br>&lt;br>Para permitir que su teléfono Android se conecte a su escritorio, debe ejecutar SilentDragon y sincronizarlo por completo.&lt;br>&lt;br>Después de sincronizar su nodo, vaya a &lt;b>Aplicaciones -> Conectar aplicación móvil&lt;/b> para ver el código QR de conexión, que puedes escanear desde esta aplicación para conectar SilentDragon.</string>
<!-- MainActivity.kt -->
<string name="app_name">SilentDragon</string>
<string name="no_connection">Sin conexión</string>
<string name="connecting">Conectando&#8230;</string>
<string name="loading">Cargando&#8230;</string>
<!-- content_tx_details -->
<string name="memo">memo</string>
<string name="memo_contents">Contenido del memo</string>
<string name="view_on_block_explorer">Ver en el explorador de bloques</string>
<string name="date_time">Fecha Hora</string>
<!-- fragment_transaction_item -->
<string name="date">Fecha</string>
<string name="amt">Amt</string>
<!-- fragment_unconfirmed_tx_item -->
<string name="unconfirmed_transaction">Transacción sin confirmar</string>
<!-- UnconfirmedTxItemFragment.kt -->
<string name="sending">Enviando </string>
<string name="receiving">Recibiendo </string>
<!-- menu_qrcodereader.xml -->
<string name="manual_input">Entrada manual</string>
<!-- menu_recieve -->
<string name="share">Compartir</string>
<!-- menu_txdetails -->
<string name="view">Ver</string>
<!-- TxDetailsActivity.kt -->
<string name="sent">Enviado</string>
<string name="received">recibido</string>
<!-- menu_main -->
<string name="refresh">Actualizar</string>
<!-- connectionManager.kt -->
<string name="Connecting_over_internet_not_enabled_in_desktop_node">La conexión a través de Internet no fue habilitada por el nodo de escritorio.</string>
<string name="Connecting_over_internet_is_disabled_in_settings">La conexión a través de Internet está deshabilitada en la configuración.</string>
<!-- activity_qr_reader -->
<string name="how_to_connect_sd2sda">Go to \"Apps\" -> \"Conectar aplicación móvil\" en su escritorio y escanee el Código QR para conectar</string>
<!-- activity_settings -->
<string name="disconnect">Desconectar</string>
<string name="silentDragon_connection_address">Dirección de conexión de SilentDragon</string>
<string name="disallow_routing_over_external_service">No permitir el enrutamiento a través de servicios externos/internet</string>
<string name="only_attempts_direct_connection">Si está marcada, la aplicación solo intentará una conexión directa a SilentDragon, y no enrutará el tráfico a través de Internet a través del servicio WormHole en wormhole.myhush.org. Consulte https://myhush.org/silentdragon para obtener más detalles</string>
<string name="currency">Moneda</string>
<string name="silentdragon_version">Versión de SilentDragon</string>
<!-- activity_about.xml -->
<string name="website">Visite nuestra pàgina web</string>
<string name="discord">Únete a nuestro discord</string>
<string name="twitter">Twitter</string>
<string name="github">GitHub</string>
<string name="credits">Créditos</string>
<string name="license">Licencia</string>
<string name="sda_version">Versión de SilentDragonAndroid</string>
<string name="copyright">Derechos de autor</string>
<!-- SettingActivity.kt -->
<string name="not_connected">No conectado</string>
<!-- QrReaderActivity.kt -->
<string name="paste_the_code_here_manually">Pegue el código aquí manualmente</string>
<string name="ok">OK</string>
<string name="is_not_a_valid_hush_address">%1$s no es una dirección HUSH válida!</string>
<!-- ReceiveActivity.kt.kt -->
<string name="receive">Recibir</string>
<string name="no_address">¡Sin dirección!</string>
<string name="hush_address">Dirección de Hush</string>
<string name="copied_address_to_clipboard">Dirección copiada al portapapeles</string>
<string name="your_hush_transparent_address">Su dirección transparente Hush</string>
<string name="your_hush_shielded_address">Su dirección blindada Hush</string>
<!-- SendActivity.kt -->
<string name="send_transaction">Enviar transacción</string>
<string name="not_a_valid_hush_address">¡No es una dirección Hush válida!</string>
<string name="no_memo_for_taddresses">(Sin memorando para las direcciones t)</string>
<string name="memo_optional">Memo (Opcional)</string>
<string name="send_anyway">Enviar de todos modos</string>
<string name="invalid_amount">Cantidad no válida!</string>
<string name="invalid_destination_Hush_address">¡Dirección de Hush de destino no válida !</string>
<string name="send_from_taddr">¿Enviar desde t-addr?</string>
<string name="cant_send_a_memo_to_a_taddr">No se puede enviar una nota a una dirección transparente</string>
<string name="error_sending_transaction">¡Error al enviar la transacción!</string>
<string name="memo_field_over_512">¡El campo Memo es demasiado largo! Debe tener como máximo 512 bytes.</string>
<string name="more_than_shielded_address">%1$s %2$s es más que el saldo en su dirección protegida. Este Tx deberá enviarse desde una dirección transparente y no será privado. \N\n ¿Estás absolutamente seguro?</string>
<string name="max_spend_in_a_single_tx"> No se puede gastar más de %1$d %2$s en un solo Tx"</string>
<string name="reply_to">Responder a</string>
<!-- content_send -->
<string name="to">A</string>
<string name="fee">Tarifa:</string>
<string name="include_reply_to_address">Incluir dirección de respuesta a</string>
<string name="action_settings">Configuración</string>
<string name="action_about">Acerca de</string>
<string name="transaction_details">Detalles de la transacción</string>
<string name="title_activity_settings">Configuración</string>
<string name="title_activity_about">Acerca de</string>
</resources>

137
app/src/main/res/values-hr/strings.xml

@ -0,0 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- general -->
<string name="is_not_a_valid_connection_string">%1$s nije ispravan podatak</string>
<string name="valid_address">Ispravna Adresa</string>
<string name="balance">Stanje</string>
<string name="scan_qr_code">Skeniraj QR kod</string>
<string name="send">Pošalji</string>
<string name="address">Adresa</string>
<string name="cancel">Odustani</string>
<string name="amount">Iznos</string>
<!-- TxDetailsActivity.kt -->
<string name="reply">Odgovor</string>
<string name="shielded_address">(Zaštićena Adresa)</string>
<string name="unconfirmed_tx"> (Nepotvrđena Tx)</string>
<string name="confirm_transaction">Potvrdi transakciju</string>
<string name="confirm_and_send">Potvrdi i pošalji</string>
<!-- content_main.xml -->
<string name="past_transactions">Povijest transakcija</string>
<string name="or">ILI</string>
<string name="reconnect">Ponovno spoji</string>
<string name="help">Pomoć</string>
<string name="help_text">Ovom aplikacijom udaljeno upravljate vašim čvorom.&lt;br>&lt;br>Kako bi se vaš Android telefon spojio na stolno računalo, morate pokrenuti SilentDragon desktop i pustiti ga da se u poptunosti sinkronizira.&lt;br>&lt;br>Nakon sinkronizacije, pogledajte na &lt;b>Apps -> Connect Mobile App&lt;/b> kako bi vidjeli QR kod koji možete skenirati s ovom aplikacijom i spojiti se na SilentDragon.</string>
<!-- MainActivity.kt -->
<string name="app_name">SilentDragon</string>
<string name="no_connection">Nema veze</string>
<string name="connecting">Spajanje&#8230;</string>
<string name="loading">Učitavanje&#8230;</string>
<!-- content_tx_details -->
<string name="memo">Memo</string>
<string name="memo_contents">Memo sadržaj</string>
<string name="view_on_block_explorer">Pogledaj na Block Exploreru</string>
<string name="date_time">Datum Vrijeme</string>
<!-- fragment_transaction_item -->
<string name="date">Datum</string>
<string name="amt">Amt</string>
<!-- fragment_unconfirmed_tx_item -->
<string name="unconfirmed_transaction">Nepotvrđena transakcija</string>
<!-- UnconfirmedTxItemFragment.kt -->
<string name="sending">Slanje </string>
<string name="receiving">Primanje </string>
<!-- menu_qrcodereader.xml -->
<string name="manual_input">Ručni unos</string>
<!-- menu_recieve -->
<string name="share">Podijeli</string>
<!-- menu_txdetails -->
<string name="view">Pregled</string>
<!-- TxDetailsActivity.kt -->
<string name="sent">Poslano</string>
<string name="received">Primljeno</string>
<!-- menu_main -->
<string name="refresh">Osvježi</string>
<!-- connectionManager.kt -->
<string name="Connecting_over_internet_not_enabled_in_desktop_node">Desktop čvor nije omogućio spajanje preko interneta.</string>
<string name="Connecting_over_internet_is_disabled_in_settings">Spajanje preko interneta je onemogućeno u postavkama.</string>
<!-- activity_qr_reader -->
<string name="how_to_connect_sd2sda">Otvorite \"Apps\" -> \"Connect mobile app\" na vašem stolnom računalu i ako se želite spojiti skenirajte QR kod</string>
<!-- activity_settings -->
<string name="disconnect">Prekini vezu</string>
<string name="silentDragon_connection_address">SilentDragon adresa za spajanje</string>
<string name="disallow_routing_over_external_service">Odbij preusmjeravanje preko vanjske usluge/interneta</string>
<string name="only_attempts_direct_connection">Ako je označeno, aplikacija će se pokušati direktno spojiti na SilentDragon i neće preusmjeravati promet preko interneta pomoću WormHole usluge wormhole.myhush.org . Molimo vas, za više detalja pogledajte https://myhush.org/silentdragon</string>
<string name="currency">Valuta</string>
<string name="silentdragon_version">SilentDragon verzija</string>
<!-- activity_about.xml -->
<string name="website">Posjetite našu web stranicu</string>
<string name="discord">Pridružite se našem Discordu</string>
<string name="twitter">Twitter</string>
<string name="github">GitHub</string>
<string name="credits">Zasluge</string>
<string name="license">Licenca</string>
<string name="sda_version">SilentDragonAndroid verzija</string>
<string name="copyright">Autorsko pravo</string>
<!-- SettingActivity.kt -->
<string name="not_connected">Nije spojeno</string>
<!-- QrReaderActivity.kt -->
<string name="paste_the_code_here_manually">Ručno zalijepite kod ovdje</string>
<string name="ok">OK</string>
<string name="is_not_a_valid_hush_address">%1$s nije ispravna HUSH adresa!</string>
<!-- ReceiveActivity.kt.kt -->
<string name="receive">Primi</string>
<string name="no_address">Nema adrese</string>
<string name="hush_address">Hush adresa</string>
<string name="copied_address_to_clipboard">Adresa kopirana u međuspremnik</string>
<string name="your_hush_transparent_address">Vaša Hush transparentna adresa</string>
<string name="your_hush_shielded_address">Vaša Hush zaštićena adresa</string>
<!-- SendActivity.kt -->
<string name="send_transaction">Pošalji transakciju</string>
<string name="not_a_valid_hush_address">Nije ispravna Hush adresa!</string>
<string name="no_memo_for_taddresses">(Nema Memo za t-Adrese)</string>
<string name="memo_optional">Memo (Opcionalno)</string>
<string name="send_anyway">Pošalji svejedno</string>
<string name="invalid_amount">Neispravna količina!</string>
<string name="invalid_destination_Hush_address">Neispravna odredišna Hush adresa!</string>
<string name="send_from_taddr">Pošalji sa t-adrese?</string>
<string name="cant_send_a_memo_to_a_taddr">Ne može se poslati memo na transparentnu adresu</string>
<string name="error_sending_transaction">Greška prilikom slanja transakcije!</string>
<string name="memo_field_over_512">Memo polje je preveliko! Dopušteno je najviše 512 bajta.</string>
<string name="more_than_shielded_address">%1$s %2$s je više nego što imate na stanju na zaštićenoj adresi. Ova Tx će se morati poslati sa transparentne adrese i neće biti privatna.\n\nDa li ste potpuno sigurni?</string>
<string name="max_spend_in_a_single_tx">Ne može se potrošiti više od %1$d %2$s u jednom Tx"</string>
<string name="reply_to">Odgovori</string>
<!-- content_send -->
<string name="to">Za</string>
<string name="fee">Naknada:</string>
<string name="include_reply_to_address">Uključi adresu za Odgovor</string>
<string name="action_settings">Postavke</string>
<string name="action_about">Više O</string>
<string name="transaction_details">Detalji transakcije</string>
<string name="title_activity_settings">Postavke</string>
<string name="title_activity_about">Više O</string>
</resources>

4
app/src/main/res/values-it/strings.xml

@ -23,8 +23,8 @@
<string name="past_transactions">Transazioni Recenti</string>
<string name="or">OPPURE</string>
<string name="reconnect">Riconnetti</string>
<string name="help">Help</string>
<string name="help_text">This application does remote control for your full node.&lt;br>&lt;br>In order to let your Android phone connect to your desktop, you need to run the desktop SilentDragon and sync fully.&lt;br>&lt;br>After your node is synced, go to &lt;b>Apps -> Connect Mobile App&lt;/b> to view the connection QR Code, which you can scan from this app for connect SilentDragon.</string>
<string name="help">Aiuto</string>
<string name="help_text">Questa applicazione controlla in remoto l\'intero nodo.&lt;br>&lt;br>Per consentire all\'utente di utilizzare questa applicazione, è necessario eseguire l\'applicazione SilentDragon su un computer e sincronizzarsi completamente. &lt;br>&lt;br>Quindi vai su &lt;b>Applicazione -> Connessione all applicazione mobile&lt;/b> per visualizzare un codice QR, che puoi scansionare da questa applicazione per collegarti ad esso.</string>
<!-- MainActivity.kt -->
<string name="app_name">SilentDragon</string>

4
app/src/main/res/values-ja/strings.xml

@ -2,7 +2,7 @@
<resources>
<!-- Japanese -->
<!-- general -->
<string name="is_not_a_valid_connection_string">%1$は有効な接続文字列ではありません!</string>
<string name="is_not_a_valid_connection_string">%1$sは有効な接続文字列ではありません!</string>
<string name="valid_address">有効なアドレス</string>
<string name="balance">残高</string>
<string name="scan_qr_code">QRコードをスキャン</string>
@ -95,7 +95,7 @@
<!-- QrReaderActivity.kt -->
<string name="paste_the_code_here_manually">ここにコードを手動で貼り付けます。</string>
<string name="ok">OK</string>
<string name="is_not_a_valid_hush_address">%1$sは有効なハッシュアドレスではありません!</string>
<string name="is_not_a_valid_hush_address">%1$s は有効なハッシュアドレスではありません!</string>
<!-- ReceiveActivity.kt.kt -->
<string name="receive">受信</string>

137
app/src/main/res/values-sr/strings.xml

@ -0,0 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- general -->
<string name="is_not_a_valid_connection_string">%1$s nije ispravan podatak</string>
<string name="valid_address">Ispravna Adresa</string>
<string name="balance">Stanje</string>
<string name="scan_qr_code">Skeniraj QR kod</string>
<string name="send">Pošalji</string>
<string name="address">Adresa</string>
<string name="cancel">Odustani</string>
<string name="amount">Iznos</string>
<!-- TxDetailsActivity.kt -->
<string name="reply">Odgovor</string>
<string name="shielded_address">(Zaštićena Adresa)</string>
<string name="unconfirmed_tx"> (Nepotvrđena Tx)</string>
<string name="confirm_transaction">Potvrdi transakciju</string>
<string name="confirm_and_send">Potvrdi i pošalji</string>
<!-- content_main.xml -->
<string name="past_transactions">Istorija transakcija</string>
<string name="or">ILI</string>
<string name="reconnect">Ponovo spoji</string>
<string name="help">Pomoć</string>
<string name="help_text">Ovom aplikacijom udaljeno upravljate vašim čvorom.&lt;br>&lt;br>Kako bi se vaš Android telefon spojio na stolni računar, morate pokrenuti SilentDragon desktop i pustiti ga da se u poptunosti sinkronizira.&lt;br>&lt;br>Nakon sinkronizacije, pogledajte na &lt;b>Apps -> Connect Mobile App&lt;/b> kako bi videli QR kod koji možete skenirati s ovom aplikacijom i spojiti se na SilentDragon.</string>
<!-- MainActivity.kt -->
<string name="app_name">SilentDragon</string>
<string name="no_connection">Nema veze</string>
<string name="connecting">Spajanje&#8230;</string>
<string name="loading">Učitavanje&#8230;</string>
<!-- content_tx_details -->
<string name="memo">Memo</string>
<string name="memo_contents">Memo sadržaj</string>
<string name="view_on_block_explorer">Pogledaj na Block Exploreru</string>
<string name="date_time">Datum Vreme</string>
<!-- fragment_transaction_item -->
<string name="date">Datum</string>
<string name="amt">Amt</string>
<!-- fragment_unconfirmed_tx_item -->
<string name="unconfirmed_transaction">Nepotvrđena transakcija</string>
<!-- UnconfirmedTxItemFragment.kt -->
<string name="sending">Slanje </string>
<string name="receiving">Primanje </string>
<!-- menu_qrcodereader.xml -->
<string name="manual_input">Ručni unos</string>
<!-- menu_recieve -->
<string name="share">Podeli</string>
<!-- menu_txdetails -->
<string name="view">Pregled</string>
<!-- TxDetailsActivity.kt -->
<string name="sent">Poslano</string>
<string name="received">Primljeno</string>
<!-- menu_main -->
<string name="refresh">Osveži</string>
<!-- connectionManager.kt -->
<string name="Connecting_over_internet_not_enabled_in_desktop_node">Desktop čvor nije omogućio spajanje preko interneta.</string>
<string name="Connecting_over_internet_is_disabled_in_settings">Spajanje preko interneta je onemogućeno u postavkama.</string>
<!-- activity_qr_reader -->
<string name="how_to_connect_sd2sda">Otvorite \"Apps\" -> \"Connect mobile app\" na vašem stolnom računaru i ako se želite spojiti skenirajte QR kod</string>
<!-- activity_settings -->
<string name="disconnect">Prekini vezu</string>
<string name="silentDragon_connection_address">SilentDragon adresa za spajanje</string>
<string name="disallow_routing_over_external_service">Odbij preusmeravanje preko vanjske usluge/interneta</string>
<string name="only_attempts_direct_connection">Ako je označeno, aplikacija će se pokušati direktno spojiti na SilentDragon i neće preusmeravati promet preko interneta pomoću WormHole usluge wormhole.myhush.org . Molimo vas, za više detalja pogledajte https://myhush.org/silentdragon</string>
<string name="currency">Valuta</string>
<string name="silentdragon_version">SilentDragon verzija</string>
<!-- activity_about.xml -->
<string name="website">Posetite našu web stranicu</string>
<string name="discord">Pridružite se našem Discordu</string>
<string name="twitter">Twitter</string>
<string name="github">GitHub</string>
<string name="credits">Zasluge</string>
<string name="license">Licenca</string>
<string name="sda_version">SilentDragonAndroid verzija</string>
<string name="copyright">Autorsko pravo</string>
<!-- SettingActivity.kt -->
<string name="not_connected">Nije spojeno</string>
<!-- QrReaderActivity.kt -->
<string name="paste_the_code_here_manually">Ručno zalepite kod ovde</string>
<string name="ok">OK</string>
<string name="is_not_a_valid_hush_address">%1$s nije ispravna HUSH adresa!</string>
<!-- ReceiveActivity.kt.kt -->
<string name="receive">Primi</string>
<string name="no_address">Nema adrese</string>
<string name="hush_address">Hush adresa</string>
<string name="copied_address_to_clipboard">Adresa kopirana u međuspremnik</string>
<string name="your_hush_transparent_address">Vaša Hush transparentna adresa</string>
<string name="your_hush_shielded_address">Vaša Hush zaštićena adresa</string>
<!-- SendActivity.kt -->
<string name="send_transaction">Pošalji transakciju</string>
<string name="not_a_valid_hush_address">Nije ispravna Hush adresa!</string>
<string name="no_memo_for_taddresses">(Nema Memo za t-Adrese)</string>
<string name="memo_optional">Memo (Opciono)</string>
<string name="send_anyway">Pošalji svejedno</string>
<string name="invalid_amount">Neispravna količina!</string>
<string name="invalid_destination_Hush_address">Neispravna odredišna Hush adresa!</string>
<string name="send_from_taddr">Pošalji sa t-adrese?</string>
<string name="cant_send_a_memo_to_a_taddr">Ne može se poslati memo na transparentnu adresu</string>
<string name="error_sending_transaction">Greška prilikom slanja transakcije!</string>
<string name="memo_field_over_512">Memo polje je preveliko! Dopušteno je najviše 512 bajta.</string>
<string name="more_than_shielded_address">%1$s %2$s je više nego što imate na stanju na zaštićenoj adresi. Ova Tx će se morati poslati sa transparentne adrese i neće biti privatna.\n\nDa li ste potpuno sigurni?</string>
<string name="max_spend_in_a_single_tx">Ne može se potrošiti više od %1$d %2$s u jednom Tx"</string>
<string name="reply_to">Odgovori</string>
<!-- content_send -->
<string name="to">Za</string>
<string name="fee">Naknada:</string>
<string name="include_reply_to_address">Uključi adresu za Odgovor</string>
<string name="action_settings">Postavke</string>
<string name="action_about">Više O</string>
<string name="transaction_details">Detalji transakcije</string>
<string name="title_activity_settings">Postavke</string>
<string name="title_activity_about">Više O</string>
</resources>

2
build.gradle

@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.6.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong

2
gradle.properties

@ -13,3 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
# org.gradle.parallel=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true

4
gradle/wrapper/gradle-wrapper.properties

@ -1,6 +1,6 @@
#Wed Aug 28 16:05:17 MDT 2019
#Sat Feb 29 17:16:24 EET 2020
distributionBase=PROJECT
distributionPath=.gradle/wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

Loading…
Cancel
Save