From e2df388aa8b083c540ae61e1cd80e3c8a924b6e9 Mon Sep 17 00:00:00 2001 From: dtvv Date: Mon, 27 Aug 2018 15:04:35 -0500 Subject: [PATCH] Corrections of innecesaries spaces in methods and classes --- .../crystalwallet/activities/CreateSeedActivity.kt | 2 -- .../cy/agorise/crystalwallet/activities/CustomActivity.kt | 4 ---- .../agorise/crystalwallet/activities/LoadingActivity.kt | 7 ------- .../crystalwallet/dialogs/material/CrystalDialog.kt | 1 - .../crystalwallet/dialogs/material/DialogMaterial.kt | 4 ---- .../cy/agorise/crystalwallet/dialogs/material/ToastIt.kt | 1 - .../activities/dialogs/Test_DialogMaterialActivity.kt | 5 ----- .../tests/activities/dialogs/Test_GIFActivity.kt | 2 -- .../tests/activities/dialogs/Test_LoadingActivity.kt | 5 ----- .../tests/activities/dialogs/Test_NetworkActivity.kt | 4 ---- .../tests/activities/dialogs/Test_ToastActivity.kt | 2 -- .../tests/activities/dialogs/Test_VideoActivity.kt | 4 ---- .../crystalwallet/viewmodels/AccountSeedViewModel.kt | 7 ------- .../validators/customImpl/interfaces/UIValidator.kt | 1 - .../customImpl/interfaces/UIValidatorListener.kt | 2 -- .../validationFields/BitsharesAccountNameValidation.kt | 5 ----- .../customImpl/validationFields/CustomValidationField.kt | 3 --- .../PinDoubleConfirmationValidationField.kt | 4 ---- .../views/natives/CustomTextInputEditText.java | 8 -------- .../cy/agorise/crystalwallet/views/natives/GIFView.kt | 3 --- .../cy/agorise/crystalwallet/views/natives/VideoExView.kt | 2 -- 21 files changed, 76 deletions(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt index e62f0b0..a3d4757 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt @@ -68,7 +68,6 @@ class CreateSeedActivity : CustomActivity() { e.printStackTrace() } - /* * Validate if can continue * */ @@ -122,7 +121,6 @@ class CreateSeedActivity : CustomActivity() { imm.showSoftInput(tilPin, InputMethodManager.SHOW_IMPLICIT) } - @OnTextChanged(value = R.id.tietPin, callback = OnTextChanged.Callback.AFTER_TEXT_CHANGED) internal fun afterPinChanged(editable: Editable) { this.fieldsValidator.validate() diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/CustomActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/activities/CustomActivity.kt index 71d9d99..5d9a8ae 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/CustomActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/CustomActivity.kt @@ -5,7 +5,6 @@ import android.os.Bundle import android.support.v7.app.AppCompatActivity import cy.agorise.crystalwallet.util.FieldsValidator - /* * Custom implementaion of the activity * */ @@ -21,9 +20,6 @@ open class CustomActivity : AppCompatActivity() { * */ protected lateinit var globalActivity: Activity - - - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/LoadingActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/activities/LoadingActivity.kt index beb58ba..9b7c2d7 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/LoadingActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/LoadingActivity.kt @@ -20,9 +20,6 @@ class LoadingActivity : CustomActivity() { @BindView(R.id.imageviewLoading) lateinit var imageviewLoading:ImageView - - - override fun onCreate(savedInstanceState: Bundle?) { /* @@ -154,9 +151,6 @@ class LoadingActivity : CustomActivity() { private var loadingIconHeigt:Int = -1 private var loadinIconChangeSize:Boolean = false - - - /* * Show the loading activity * */ @@ -250,7 +244,6 @@ class LoadingActivity : CustomActivity() { } } - /* * Interface for all the events * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalDialog.kt b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalDialog.kt index 415beb5..e21e0d2 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalDialog.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalDialog.kt @@ -4,7 +4,6 @@ import android.app.Activity import cy.agorise.crystalwallet.R import kotlinx.android.synthetic.main.account_seed_list.view.* - /* * Dialog material that shows loading gif and and explicit message * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/DialogMaterial.kt b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/DialogMaterial.kt index 7082a12..973081c 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/DialogMaterial.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/DialogMaterial.kt @@ -32,8 +32,6 @@ open abstract class DialogMaterial{ var negativeResponse:NegativeResponse? = null - - constructor(activity: Activity) { /* @@ -47,7 +45,6 @@ open abstract class DialogMaterial{ builder = MaterialDialog.Builder(activity) } - /* * Show the dialog * */ @@ -129,7 +126,6 @@ open abstract class DialogMaterial{ this.materialDialog = this.builder.build() } - /* * Set indeterminate progress * diff --git a/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/ToastIt.kt b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/ToastIt.kt index 1c9fc9a..00e1ea5 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/ToastIt.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/ToastIt.kt @@ -3,7 +3,6 @@ package cy.agorise.crystalwallet.dialogs.material import android.app.Activity import android.widget.Toast - /* * This class is an implementation of toast * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_DialogMaterialActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_DialogMaterialActivity.kt index 89af0bc..b8068bf 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_DialogMaterialActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_DialogMaterialActivity.kt @@ -5,7 +5,6 @@ import cy.agorise.crystalwallet.R import cy.agorise.crystalwallet.activities.CustomActivity import cy.agorise.crystalwallet.dialogs.material.DialogMaterial - /* * Class to test DialogMaterial.kt * */ @@ -16,16 +15,12 @@ class Test_DialogMaterialActivity : CustomActivity() { * */ lateinit var dialogMaterial: DialogMaterial; - - - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.empty_activity) } - /* * This class can not be instantiate, * this methos is commented to prevent compilation error, if uncommented it should diff --git a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_GIFActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_GIFActivity.kt index 81c732c..a0019db 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_GIFActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_GIFActivity.kt @@ -6,7 +6,6 @@ import cy.agorise.crystalwallet.R import cy.agorise.crystalwallet.activities.CustomActivity import kotlinx.android.synthetic.main.empty_activity.* - /* * Unit test for class GIFView * */ @@ -26,7 +25,6 @@ class Test_GIFActivity : CustomActivity() { //loadWithContainer() } - /* * Load normaly the gif * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_LoadingActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_LoadingActivity.kt index e3d95c0..3c04a94 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_LoadingActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_LoadingActivity.kt @@ -5,7 +5,6 @@ import android.widget.Toast import cy.agorise.crystalwallet.activities.CustomActivity import cy.agorise.crystalwallet.activities.LoadingActivity - /* * Class to test LoadingActivity * */ @@ -21,7 +20,6 @@ class Test_LoadingActivity : CustomActivity(){ //sizeInLoadingIcon() } - /* * Show the simple loading graphic * */ @@ -30,7 +28,6 @@ class Test_LoadingActivity : CustomActivity(){ //LoadingActivity.dismiss() //For testing porpouse } - /* * Loading with timer * */ @@ -39,7 +36,6 @@ class Test_LoadingActivity : CustomActivity(){ LoadingActivity.show(globalActivity) } - /* * Listener when the loading window is closed * */ @@ -54,7 +50,6 @@ class Test_LoadingActivity : CustomActivity(){ LoadingActivity.show(globalActivity) } - /* * Listener when the loading window is resume * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_NetworkActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_NetworkActivity.kt index 43d7d42..b623129 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_NetworkActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_NetworkActivity.kt @@ -3,9 +3,6 @@ package cy.agorise.crystalwallet.tests.activities.dialogs import android.os.Bundle import cy.agorise.crystalwallet.activities.CustomActivity - - - /* * Class to test all network implementation * */ @@ -17,7 +14,6 @@ class Test_NetworkActivity:CustomActivity(){ } - fun testServerConnection(){ diff --git a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_ToastActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_ToastActivity.kt index b8566e5..c4e5a28 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_ToastActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_ToastActivity.kt @@ -16,7 +16,6 @@ class Test_ToastActivity : CustomActivity() { showLongShort() } - /* * Show simple short toast * */ @@ -24,7 +23,6 @@ class Test_ToastActivity : CustomActivity() { ToastIt.showShortToast(this,"showShortToast") } - /* * Show simple short toast * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_VideoActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_VideoActivity.kt index 45d7a59..51ebc55 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_VideoActivity.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/tests/activities/dialogs/Test_VideoActivity.kt @@ -17,8 +17,6 @@ class Test_VideoActivity : CustomActivity() { * cy.agorise.crystalwallet.views.natives.VideoViewEx * should be used as view to get the new implementations * */ - - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -33,7 +31,6 @@ class Test_VideoActivity : CustomActivity() { playIndeterminate() } - /* * Just one time play * */ @@ -42,7 +39,6 @@ class Test_VideoActivity : CustomActivity() { video.start() } - /* * Just one time play * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/AccountSeedViewModel.kt b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/AccountSeedViewModel.kt index 5118b71..f887ae8 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/AccountSeedViewModel.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/AccountSeedViewModel.kt @@ -6,24 +6,17 @@ import android.arch.lifecycle.LiveData import cy.agorise.crystalwallet.dao.CrystalDatabase import cy.agorise.crystalwallet.models.AccountSeed - - - class AccountSeedViewModel : AndroidViewModel { private var accountSeed: LiveData? = null private val db: CrystalDatabase private val app: Application - - - constructor(application: Application,db:CrystalDatabase): super(application) { this.app = application; this.db = db; } - fun loadSeed(seedId: Long) { this.accountSeed = this.db.accountSeedDao().findByIdLiveData(seedId) } diff --git a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidator.kt b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidator.kt index 2fc915e..68b99cb 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidator.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidator.kt @@ -1,6 +1,5 @@ package cy.agorise.crystalwallet.viewmodels.validators.customImpl.interfaces - /* * Interface that all the views that need validation can use * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidatorListener.kt b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidatorListener.kt index bd638fe..13c33f4 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidatorListener.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/interfaces/UIValidatorListener.kt @@ -2,13 +2,11 @@ package cy.agorise.crystalwallet.viewmodels.validators.customImpl.interfaces import cy.agorise.crystalwallet.viewmodels.validators.customImpl.validationFields.CustomValidationField - /* * Listener to deliver response to controls from inner validations * */ interface UIValidatorListener { - fun onValidationFailed(customValidationField: CustomValidationField) fun onValidationSucceeded(customValidationField: CustomValidationField) } \ No newline at end of file diff --git a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/BitsharesAccountNameValidation.kt b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/BitsharesAccountNameValidation.kt index c482f87..30044fb 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/BitsharesAccountNameValidation.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/BitsharesAccountNameValidation.kt @@ -10,7 +10,6 @@ import cy.agorise.crystalwallet.viewmodels.validators.customImpl.interfaces.UIVa import cy.agorise.crystalwallet.viewmodels.validators.customImpl.interfaces.UIValidatorListener import cy.agorise.crystalwallet.views.natives.CustomTextInputEditText - /* * * Validation layer for Account Name @@ -28,9 +27,6 @@ class BitsharesAccountNameValidation : CustomValidationField, UIValidator { private var onAccountExist: OnAccountExist? = null - - - constructor ( activity: Activity, accountNameField: CustomTextInputEditText, uiValidatorListener: UIValidatorListener) : super(activity) { @@ -245,7 +241,6 @@ class BitsharesAccountNameValidation : CustomValidationField, UIValidator { * */ } - /* * Setters and getters * */ diff --git a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/CustomValidationField.kt b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/CustomValidationField.kt index e45393c..3cb55b0 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/CustomValidationField.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/CustomValidationField.kt @@ -28,9 +28,6 @@ open class CustomValidationField { @JvmField protected var activity: Activity - - - constructor(activity:Activity){ /* diff --git a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/PinDoubleConfirmationValidationField.kt b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/PinDoubleConfirmationValidationField.kt index 9fa7493..c2c70b9 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/PinDoubleConfirmationValidationField.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/customImpl/validationFields/PinDoubleConfirmationValidationField.kt @@ -6,7 +6,6 @@ import cy.agorise.crystalwallet.viewmodels.validators.customImpl.interfaces.UIVa import cy.agorise.crystalwallet.viewmodels.validators.customImpl.interfaces.UIValidatorListener import cy.agorise.crystalwallet.views.natives.CustomTextInputEditText - /* * Validate PIN and PIN confirmation * */ @@ -19,8 +18,6 @@ class PinDoubleConfirmationValidationField : CustomValidationField, UIValidator private val pinConfirmationField: CustomTextInputEditText - - constructor(activity: Activity, pinField: CustomTextInputEditText, pinConfirmationField: CustomTextInputEditText, @@ -31,7 +28,6 @@ class PinDoubleConfirmationValidationField : CustomValidationField, UIValidator this.uiValidatorListener = pinDoubleConfirmationInterface } - override fun validate() { val pin = pinField.text.toString().trim { it <= ' ' } diff --git a/app/src/main/java/cy/agorise/crystalwallet/views/natives/CustomTextInputEditText.java b/app/src/main/java/cy/agorise/crystalwallet/views/natives/CustomTextInputEditText.java index 950b4fb..219444b 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/views/natives/CustomTextInputEditText.java +++ b/app/src/main/java/cy/agorise/crystalwallet/views/natives/CustomTextInputEditText.java @@ -8,7 +8,6 @@ import android.view.View; import cy.agorise.crystalwallet.models.FieldValidatorModel; import cy.agorise.crystalwallet.viewmodels.validators.customImpl.interfaces.UIValidator; - /* * Custom implementation of the native control to get more over control it * */ @@ -30,8 +29,6 @@ public class CustomTextInputEditText extends TextInputEditText implements UIVali private String lastValue; - - public CustomTextInputEditText(Context context, AttributeSet attrs) { super(context, attrs); @@ -49,8 +46,6 @@ public class CustomTextInputEditText extends TextInputEditText implements UIVali }); } - - public void setFieldValidatorModel(FieldValidatorModel fieldValidatorModel) { this.fieldValidatorModel = fieldValidatorModel; } @@ -72,7 +67,4 @@ public class CustomTextInputEditText extends TextInputEditText implements UIVali public void validate() { uiValidator.validate(); } - - - } diff --git a/app/src/main/java/cy/agorise/crystalwallet/views/natives/GIFView.kt b/app/src/main/java/cy/agorise/crystalwallet/views/natives/GIFView.kt index d98c7f9..338e36f 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/views/natives/GIFView.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/views/natives/GIFView.kt @@ -7,7 +7,6 @@ import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import cy.agorise.crystalwallet.R - /* * GIF implementation based on existing imageview class * */ @@ -19,8 +18,6 @@ class GIFView : ImageView { private var options: RequestOptions? = RequestOptions() - - constructor(context:Context,attrs: AttributeSet?) : super(context,attrs) { } diff --git a/app/src/main/java/cy/agorise/crystalwallet/views/natives/VideoExView.kt b/app/src/main/java/cy/agorise/crystalwallet/views/natives/VideoExView.kt index c018d33..b8fb54a 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/views/natives/VideoExView.kt +++ b/app/src/main/java/cy/agorise/crystalwallet/views/natives/VideoExView.kt @@ -7,7 +7,6 @@ import android.widget.VideoView import cy.agorise.crystalwallet.R import kotlinx.android.synthetic.main.empty_activity.* - /* * Extensión for videoview * */ @@ -22,7 +21,6 @@ class VideoExView(context: Context?, attrs: AttributeSet?) : VideoView(context, this.setVideoURI(uri) } - /* * With this method the video play continues * */