minor code layout change

4 years ago · 940d9c84d9
9 changed files with 34 additions and 30 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -86,9 +86,8 @@ dependencies {
    implementation 'com.google.android.gms:play-services-vision:17.0.2'
    implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.1'
    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
-    implementation Deps.AndroidX.CameraX.CAMERA2
-    implementation Deps.AndroidX.CameraX.CORE
-
+    //implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    implementation 'com.google.zxing:core:3.4.0'
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -22,7 +22,7 @@
        tools:replace="android:allowBackup">

        <activity
-            android:name="org.myhush.silentdragon.SplashActivity"
+            android:name="org.myhush.silentdragon.ui.SplashActivity"
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@ -31,7 +31,7 @@
        </activity>

        <activity
-            android:name="org.myhush.silentdragon.SettingsActivity"
+            android:name="org.myhush.silentdragon.ui.SettingsActivity"
            android:label="@string/title_activity_settings"
            android:parentActivityName="org.myhush.silentdragon.SendActivity"
            android:screenOrientation="portrait">
@ -41,7 +41,7 @@
        </activity>

        <activity
-            android:name="org.myhush.silentdragon.AboutActivity"
+            android:name="org.myhush.silentdragon.ui.AboutActivity"
            android:label="@string/title_activity_about"
            android:parentActivityName="org.myhush.silentdragon.SendActivity"
            android:screenOrientation="portrait">
--- a/app/src/main/java/org/myhush/silentdragon/MainActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/MainActivity.kt
@ -10,7 +10,6 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.os.StrictMode
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.google.android.material.snackbar.Snackbar
 import androidx.core.text.HtmlCompat
@ -28,9 +27,10 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.content_main.*
 import org.myhush.silentdragon.DataModel.ConnectionStatus
 import org.myhush.silentdragon.DataModel.connStatus
+import org.myhush.silentdragon.ui.AboutActivity
+import org.myhush.silentdragon.ui.SettingsActivity
 import java.text.DecimalFormat

-
 class MainActivity : AppCompatActivity(),
    TransactionItemFragment.OnFragmentInteractionListener,
    UnconfirmedTxItemFragment.OnFragmentInteractionListener {
@ -51,7 +51,6 @@ class MainActivity : AppCompatActivity(),
        // When creating, clear all the data first
        setMainStatus("")

-
        DataModel.init()

        btnConnect.setOnClickListener {
@ -87,7 +86,6 @@ class MainActivity : AppCompatActivity(),

        txtMainBalanceUSD.setOnClickListener {

-
            if(DataModel.selectedCurrency == "BTC")
                Toast.makeText(applicationContext, "1 HUSH = ${DataModel.currencySymbols[DataModel.selectedCurrency]}${DecimalFormat(" #,##0.00000000")
                    .format(DataModel.currencyValues[DataModel.selectedCurrency])}", Toast.LENGTH_LONG).show()
@ -130,7 +128,6 @@ class MainActivity : AppCompatActivity(),
        lblBalance.text = ""
        txtMainBalanceUSD.text = ""
        txtMainBalance.text = status
-
    }

    @SuppressLint("SetTextI18n")
@ -304,7 +301,6 @@ class MainActivity : AppCompatActivity(),
        }
    }

-
    var mReceiver: BroadcastReceiver = object : BroadcastReceiver() {
        override fun onReceive(context: Context, intent: Intent) {
            // We've received a signal
@ -395,7 +391,5 @@ class MainActivity : AppCompatActivity(),
        updateUI(true)
    }

-
    private val TAG = "MainActivity"
-
 }
--- a/app/src/main/java/org/myhush/silentdragon/ui/AboutActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/ui/AboutActivity.kt
@ -1,9 +1,11 @@
 // Copyright 2019-2020 The Hush developers
-package org.myhush.silentdragon
+package org.myhush.silentdragon.ui

 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_about.lblVersionName
+import org.myhush.silentdragon.BuildConfig
+import org.myhush.silentdragon.R

 class AboutActivity : AppCompatActivity() {

--- a/app/src/main/java/org/myhush/silentdragon/ui/SettingsActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/ui/SettingsActivity.kt
@ -1,5 +1,5 @@
 // Copyright 2019-2020 The Hush developers
-package org.myhush.silentdragon
+package org.myhush.silentdragon.ui

 import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
@ -9,6 +9,10 @@ import android.widget.Adapter
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import kotlinx.android.synthetic.main.activity_settings.*
+import org.myhush.silentdragon.ConnectionManager
+import org.myhush.silentdragon.DataModel
+import org.myhush.silentdragon.R
+import org.myhush.silentdragon.SilentDragonApp

 class SettingsActivity : AppCompatActivity() {

@ -19,7 +23,10 @@ class SettingsActivity : AppCompatActivity() {
        updateUI()

        btnDisconnect.setOnClickListener {
-            DataModel.setConnString(null, applicationContext)
+            DataModel.setConnString(
+                null,
+                applicationContext
+            )
            DataModel.clear()
            ConnectionManager.closeConnection()

@ -47,7 +54,9 @@ class SettingsActivity : AppCompatActivity() {
                var pref: SharedPreferences = getSharedPreferences("MainFile",0)

                var editor: SharedPreferences.Editor = pref.edit()
-                editor.putString("currency", DataModel.selectedCurrency)
+                editor.putString("currency",
+                    DataModel.selectedCurrency
+                )

                editor.commit()
            }
@ -79,11 +88,15 @@ class SettingsActivity : AppCompatActivity() {

    fun updateUI() {
        fillSpinner()
-        txtSettingsConnString.text = DataModel.getConnString(SilentDragonApp.appContext!!)
+        txtSettingsConnString.text = DataModel.getConnString(
+            SilentDragonApp.appContext!!
+        )
            ?: getString(R.string.not_connected)

        chkDisallowInternet.isChecked = !DataModel.getGlobalAllowInternet()

-        lblServerVersion.text = DataModel.mainResponseData?.serverversion ?: getString(R.string.not_connected)
+        lblServerVersion.text = DataModel.mainResponseData?.serverversion ?: getString(
+            R.string.not_connected
+        )
    }
 }
--- a/app/src/main/java/org/myhush/silentdragon/ui/SplashActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/ui/SplashActivity.kt
@ -1,11 +1,13 @@
 // Copyright 2019-2020 The Hush developers
 // Released under the GPLv3
-package org.myhush.silentdragon
+package org.myhush.silentdragon.ui

 import androidx.appcompat.app.AppCompatActivity
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
+import org.myhush.silentdragon.MainActivity
+import org.myhush.silentdragon.R

 class SplashActivity : AppCompatActivity() {

@ -18,7 +20,7 @@ class SplashActivity : AppCompatActivity() {

        Handler().postDelayed({
            // This method will be executed once the timer is over
-            startActivity(Intent(this,MainActivity::class.java))
+            startActivity(Intent(this, MainActivity::class.java))

            // close this activity
            finish()
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@ -5,7 +5,7 @@
        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">
+        tools:context="org.myhush.silentdragon.ui.AboutActivity">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/scrollView2"
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@ -5,7 +5,7 @@
        xmlns:app="http://schemas.android.com/apk/res-auto"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        tools:context="org.myhush.silentdragon.SettingsActivity">
+        tools:context="org.myhush.silentdragon.ui.SettingsActivity">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/scrollView2"
--- a/buildSrc/src/main/java/org/myhush/silentdragon/Dependencies.kt
+++ b/buildSrc/src/main/java/org/myhush/silentdragon/Dependencies.kt
@ -26,12 +26,6 @@ object Deps {
        const val PAGING = "androidx.paging:paging-runtime-ktx:2.1.2"
        const val VECTOR_DRAWABLE = "androidx.vectordrawable:vectordrawable:1.0.0"

-        // for camera function
-        object CameraX : Version("1.0.0-beta04") {
-            val CAMERA2 = "androidx.camera:camera-camera2:1.0.0-beta04"
-            val CORE = "androidx.camera:camera-core:1.0.0-beta04"
-        }
-
        object Navigation : Version("2.1.0") {
            val FRAGMENT_KTX = "androidx.navigation:navigation-fragment-ktx:$version"
            val UI_KTX = "androidx.navigation:navigation-ui-ktx:$version"