diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/CreateAccountFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/CreateAccountFragment.kt new file mode 100644 index 0000000..f5b226e --- /dev/null +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/CreateAccountFragment.kt @@ -0,0 +1,26 @@ +package cy.agorise.bitsybitshareswallet.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import cy.agorise.bitsybitshareswallet.R +import cy.agorise.graphenej.api.ConnectionStatusUpdate +import cy.agorise.graphenej.models.JsonRpcResponse + +class CreateAccountFragment : ConnectedFragment() { + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + setHasOptionsMenu(true) + + return inflater.inflate(R.layout.fragment_create_account, container, false) + } + + override fun handleJsonRpcResponse(response: JsonRpcResponse<*>) { + // TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + + override fun handleConnectionStatusUpdate(connectionStatusUpdate: ConnectionStatusUpdate) { + // TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } +} \ No newline at end of file diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt index 67a05dd..7af7150 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt @@ -7,6 +7,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar +import androidx.navigation.Navigation import androidx.navigation.fragment.findNavController import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.list.listItemsSingleChoice @@ -97,6 +98,10 @@ class ImportBrainkeyFragment : ConnectedFragment() { btnImport.isEnabled = false btnImport.setOnClickListener { verifyBrainKey(false) } + + btnCreate.setOnClickListener ( + Navigation.createNavigateOnClickListener(R.id.create_account_action) + ) } private fun validatePIN() { diff --git a/app/src/main/res/drawable/outline_rounded_corners.xml b/app/src/main/res/drawable/outline_rounded_corners.xml new file mode 100644 index 0000000..38a5c24 --- /dev/null +++ b/app/src/main/res/drawable/outline_rounded_corners.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_account.xml b/app/src/main/res/layout/fragment_create_account.xml new file mode 100644 index 0000000..a8adca7 --- /dev/null +++ b/app/src/main/res/layout/fragment_create_account.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_import_brainkey.xml b/app/src/main/res/layout/fragment_import_brainkey.xml index dfa914e..7ea75c3 100644 --- a/app/src/main/res/layout/fragment_import_brainkey.xml +++ b/app/src/main/res/layout/fragment_import_brainkey.xml @@ -95,7 +95,6 @@ android:layout_marginTop="@dimen/spacing_different_topic" android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/button__create" - android:enabled="false"/> + android:text="@string/button__create"/> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 905d393..3f90287 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/spacing_same_topic" - android:text="@string/btn__view_and_copy"/> + android:text="@string/button__view_and_copy"/> diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 66ddf45..bded66c 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -100,7 +100,23 @@ android:id="@+id/import_brainkey_dest" android:name="cy.agorise.bitsybitshareswallet.fragments.ImportBrainkeyFragment" android:label="@string/app_name" - tools:layout="@layout/fragment_import_brainkey"/> + tools:layout="@layout/fragment_import_brainkey"> + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index efbb6e1..714e354 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ Agree Disagree - + 6+ digits PIN PIN too short Confirm PIN @@ -25,6 +25,9 @@ more than one account, please select which account you wish to import + + BitShares account name + Transactions Merchants @@ -93,10 +96,10 @@ BrainKey. Account recovery words that can be captured or copied, but not edited. - Print this out, or write it down. Anyone with access to your recovery key will - have access to funds within this wallet. + Write this down! Be sure you have 2 copies of this BrainKey in 2 secure locations + in case of fire or loss. Security First! Anyone with access to your BrainKey can access the funds in your account! - + Bugs or Ideas? Telegram chat: http://t.me/Agorise\nEmail: Agorise@protonmail.ch\nOpen Source: https://github.com/Agorise