diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 3d37978..23a3eb9 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -44,6 +44,7 @@ import butterknife.OnClick;
import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.fragments.BalanceFragment;
import cy.agorise.crystalwallet.fragments.ContactsFragment;
+import cy.agorise.crystalwallet.fragments.MerchantsFragment;
import cy.agorise.crystalwallet.fragments.ReceiveTransactionFragment;
import cy.agorise.crystalwallet.fragments.SendTransactionFragment;
import cy.agorise.crystalwallet.fragments.TransactionsFragment;
@@ -356,7 +357,7 @@ public class BoardActivity extends CustomActivity {
}
// Titles of the tabs
- int[] tabTitles = {R.string.balances, R.string.transactions, R.string.contacts};
+ int[] tabTitles = {R.string.balances, R.string.transactions, R.string.contacts,R.string.Merchants};
@Override
public Fragment getItem(int position) {
@@ -367,6 +368,8 @@ public class BoardActivity extends CustomActivity {
return new TransactionsFragment();
case 2:
return new ContactsFragment();
+ case 3:
+ return new MerchantsFragment();
}
@@ -380,7 +383,7 @@ public class BoardActivity extends CustomActivity {
@Override
public int getCount() {
- return 3;
+ return 4;
}
}
}
diff --git a/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalLoading.kt b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalLoading.kt
new file mode 100644
index 0000000..de8e4f9
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalLoading.kt
@@ -0,0 +1,27 @@
+package cy.agorise.crystalwallet.dialogs.material
+
+import android.app.Activity
+import cy.agorise.crystalwallet.R
+
+
+/*
+*
+* Class to just call simple loading dialog
+*
+* Sumple Use:
+*
+* final CrystalLoading crystalLoading = new CrystalLoading(activity);
+* crystalLoading.show();
+*
+* */
+open class CrystalLoading : CrystalDialog {
+
+ constructor(activity:Activity) : super(activity) {
+
+ /*
+ * Set loading properties only
+ * */
+ this.progress()
+ this.setText(activity.getString(R.string.loading))
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
index 259e0ad..4b1e38c 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
@@ -27,9 +27,7 @@ import butterknife.OnClick;
import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.activities.BoardActivity;
import cy.agorise.crystalwallet.activities.ImportSeedActivity;
-import cy.agorise.crystalwallet.activities.IntroActivity;
import cy.agorise.crystalwallet.dialogs.material.CrystalDialog;
-import cy.agorise.crystalwallet.dialogs.material.DialogMaterial;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequestListener;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests;
import cy.agorise.crystalwallet.requestmanagers.ImportBackupRequest;
@@ -200,7 +198,7 @@ public class ImportAccountOptionsFragment extends DialogFragment {
* Show loading dialog
* */
crystalDialog = new CrystalDialog((Activity) getContext());
- crystalDialog.setText(getContext().getString(R.string.Creating_backup_from_file));
+ crystalDialog.setText(getContext().getString(R.string.Restoring_backup_from_file));
crystalDialog.progress();
crystalDialog.show();
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/MerchantsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/MerchantsFragment.java
new file mode 100644
index 0000000..91b6d6e
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/MerchantsFragment.java
@@ -0,0 +1,40 @@
+package cy.agorise.crystalwallet.fragments;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import butterknife.ButterKnife;
+import cy.agorise.crystalwallet.R;
+
+public class MerchantsFragment extends Fragment {
+
+ public MerchantsFragment() {
+ // Required empty public constructor
+ }
+
+ public static MerchantsFragment newInstance() {
+ MerchantsFragment fragment = new MerchantsFragment();
+ Bundle args = new Bundle();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ }
+
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.fragment_merchants, container, false);
+ ButterKnife.bind(this, view);
+
+ return view;
+ }
+}
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 01e2db2..d6b6a5d 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -106,6 +106,7 @@
app:tabSelectedTextColor="@color/white"
app:layout_collapseMode="pin"
app:tabIndicatorHeight="0dp"
+ app:tabMode="scrollable"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
app:tabTextColor="@color/lightGrayClear"
android:animateLayoutChanges="true" />
diff --git a/app/src/main/res/layout/fragment_merchants.xml b/app/src/main/res/layout/fragment_merchants.xml
new file mode 100644
index 0000000..4ac2d5b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_merchants.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e2aabac..caa4ab5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -279,7 +279,7 @@
head_block_number
e_receipt
- Creating backup from file
+ Restoring backup from file
SmartcoinsWallet
{\"id\":1,\"method\":\"call\",\"params\":[1,\"login\",[\"\",\"\"]]}
@@ -445,6 +445,8 @@
Please import the correct file
Merchant email has been imported successfully
+ Merchants
+
Error: %s
An error prevented this operation to succeed
@@ -516,7 +518,7 @@
Import Account
Select one option to import your existing account
Import Account Seed
- Import Account Backup
+ Import .bin File
Disagree
Agree
Add