agorise
/
crystal-wallet-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

master
Henry Varona 2018-09-18 15:51:32 -04:00
parent c818eaf472 8a86816c76
commit cea9efc07d
7 changed files with 92 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
View File

@ -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;
}
}
}

27
app/src/main/java/cy/agorise/crystalwallet/dialogs/material/CrystalLoading.kt Normal file
View File

@ -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))
}
}

4
app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
View File

@ -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();

40
app/src/main/java/cy/agorise/crystalwallet/fragments/MerchantsFragment.java Normal file
View File

@ -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;
}
}

1
app/src/main/res/layout/board.xml
View File

@ -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" />

14
app/src/main/res/layout/fragment_merchants.xml Normal file
View File

@ -0,0 +1,14 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="cy.agorise.crystalwallet.fragments.ContactsFragment">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Comming soon"
android:layout_centerInParent="true"
android:textSize="20dp" />
</RelativeLayout>

6
app/src/main/res/values/strings.xml
View File

@ -279,7 +279,7 @@
<string name="head_block_number">head_block_number</string>
<string name="e_receipt">e_receipt</string>
<string name="Creating_backup_from_file">Creating backup from file</string>
<string name="Restoring_backup_from_file">Restoring backup from file</string>
<string name="folder_name">SmartcoinsWallet</string>
<string name="login_api">{\"id\":1,\"method\":\"call\",\"params\":[1,\"login\",[\"\",\"\"]]}</string>
@ -445,6 +445,8 @@
<string name="please_import_the_correct_file">Please import the correct file</string>
<string name="merchant_email_has_been_imported_successfully">Merchant email has been imported successfully</string>
<string name="Merchants">Merchants</string>
<!-- Errors -->
<string name="error_with_message">Error: %s</string>
<string name="error_no_message">An error prevented this operation to succeed</string>
@ -516,7 +518,7 @@
<string name="import_account">Import Account</string>
<string name="import_account_options_description">Select one option to import your existing account</string>
<string name="import_account_seed">Import Account Seed</string>
<string name="import_account_backup">Import Account Backup</string>
<string name="import_account_backup">Import .bin File</string>
<string name="disagree">Disagree</string>
<string name="agree">Agree</string>
<string name="add">Add</string>