From 1d4324bec2fd61989147c23bf88bde3e4ba41c88 Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Sat, 18 Aug 2018 02:34:02 +0200 Subject: [PATCH] Update transfert tab in RecordTransactionActivity - Prepare 'from' and 'to' fields - Setup date field - Update tab text colors --- .../DetailsActivityFragments/Charts.java | 2 +- .../Informations.java | 2 +- .../Transactions.java | 2 +- .../MarketCapitalization.java | 2 +- .../HomeActivityFragments/Overview.java | 3 +- .../HomeActivityFragments/Summary.java | 3 +- .../Activities/RecordTransactionActivity.java | 17 +++- .../BuyFragment.java | 2 +- .../SellFragment.java | 3 +- .../TransferFragment.java | 93 +++++++++++++++++- .../moodl/CustomLayouts/CustomTabLayout.java | 1 + ...ml => homeactivity_fragment_marketcap.xml} | 0 ...xml => homeactivity_fragment_overview.xml} | 0 ....xml => homeactivity_fragment_summary.xml} | 0 ...ml => detailsactivity_fragment_charts.xml} | 0 ...detailsactivity_fragment_informations.xml} | 0 ...detailsactivity_fragment_transactions.xml} | 0 app/src/main/res/layout/fragment_transfer.xml | 15 --- ...ml => homeactivity_fragment_marketcap.xml} | 0 ...xml => homeactivity_fragment_overview.xml} | 0 ....xml => homeactivity_fragment_summary.xml} | 0 ...ml => record_transaction_fragment_buy.xml} | 2 +- ...l => record_transaction_fragment_sell.xml} | 2 +- .../record_transaction_fragment_transfer.xml | 97 +++++++++++++++++++ app/src/main/res/values-fr/strings.xml | 20 +++- app/src/main/res/values/strings.xml | 20 +++- 26 files changed, 250 insertions(+), 36 deletions(-) rename app/src/main/res/layout-v21/{fragment_marketcap_homeactivity.xml => homeactivity_fragment_marketcap.xml} (100%) rename app/src/main/res/layout-v21/{fragment_overview_homeactivity.xml => homeactivity_fragment_overview.xml} (100%) rename app/src/main/res/layout-v21/{fragment_summary_homeactivity.xml => homeactivity_fragment_summary.xml} (100%) rename app/src/main/res/layout/{fragment_charts_detailsactivity.xml => detailsactivity_fragment_charts.xml} (100%) rename app/src/main/res/layout/{fragment_informations_detailsactivity.xml => detailsactivity_fragment_informations.xml} (100%) rename app/src/main/res/layout/{fragment_transactions_detailsactivity.xml => detailsactivity_fragment_transactions.xml} (100%) delete mode 100644 app/src/main/res/layout/fragment_transfer.xml rename app/src/main/res/layout/{fragment_marketcap_homeactivity.xml => homeactivity_fragment_marketcap.xml} (100%) rename app/src/main/res/layout/{fragment_overview_homeactivity.xml => homeactivity_fragment_overview.xml} (100%) rename app/src/main/res/layout/{fragment_summary_homeactivity.xml => homeactivity_fragment_summary.xml} (100%) rename app/src/main/res/layout/{fragment_buy.xml => record_transaction_fragment_buy.xml} (98%) rename app/src/main/res/layout/{fragment_sell.xml => record_transaction_fragment_sell.xml} (98%) create mode 100644 app/src/main/res/layout/record_transaction_fragment_transfer.xml diff --git a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Charts.java b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Charts.java index 10d0bbd..5758398 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Charts.java +++ b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Charts.java @@ -76,7 +76,7 @@ public class Charts extends Fragment implements CurrencyInfoUpdateNotifierInterf @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_charts_detailsactivity, container, false); + view = inflater.inflate(R.layout.detailsactivity_fragment_charts, container, false); currency = getActivity().getIntent().getParcelableExtra("currency"); diff --git a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Informations.java b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Informations.java index d56dc1d..5653191 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Informations.java +++ b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Informations.java @@ -38,7 +38,7 @@ public class Informations extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_informations_detailsactivity, container, false); + view = inflater.inflate(R.layout.detailsactivity_fragment_informations, container, false); isSnapshotUpdated = false; isTickerUpdated = false; diff --git a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Transactions.java b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Transactions.java index 944681e..007e136 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Transactions.java +++ b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/Transactions.java @@ -49,7 +49,7 @@ public class Transactions extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_transactions_detailsactivity, container, false); + view = inflater.inflate(R.layout.detailsactivity_fragment_transactions, container, false); PreferencesManager preferencesManager = new PreferencesManager(getActivity().getBaseContext()); diff --git a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java index e92bdec..4305c16 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java +++ b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java @@ -67,7 +67,7 @@ public class MarketCapitalization extends Fragment implements CryptocompareNotif @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_marketcap_homeactivity, container, false); + view = inflater.inflate(R.layout.homeactivity_fragment_marketcap, container, false); preferencesManager = new PreferencesManager(getActivity().getBaseContext()); coinmarketCapAPIManager = CoinmarketCapAPIManager.getInstance(getActivity().getBaseContext()); diff --git a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java index f5d659c..c142429 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java +++ b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java @@ -10,7 +10,6 @@ import android.support.annotation.NonNull; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.graphics.Palette; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -53,7 +52,7 @@ public class Overview extends Fragment implements CoinmarketcapNotifierInterface @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View fragmentView = inflater.inflate(R.layout.fragment_overview_homeactivity, container, false); + View fragmentView = inflater.inflate(R.layout.homeactivity_fragment_overview, container, false); coinmarketCapAPIManager = CoinmarketCapAPIManager.getInstance(getActivity().getBaseContext()); cryptocompareApiManager = CryptocompareApiManager.getInstance(getActivity().getBaseContext()); diff --git a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java index 69fca07..16dffde 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java +++ b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java @@ -22,7 +22,6 @@ import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.AppCompatDelegate; import android.support.v7.graphics.Palette; import android.util.Log; import android.view.Gravity; @@ -101,7 +100,7 @@ public class Summary extends Fragment implements BalanceSwitchManagerInterface, @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View fragmentView = inflater.inflate(R.layout.fragment_summary_homeactivity, container, false); + View fragmentView = inflater.inflate(R.layout.homeactivity_fragment_summary, container, false); preferencesManager = new PreferencesManager(getActivity()); balanceManager = new BalanceManager(getActivity()); diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java index f5d17d2..5234e0f 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java +++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java @@ -100,6 +100,7 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr exchange_autoCompleteTextView.setText(""); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(2).setEnabled(false); + ((TextView) tabLayout.getTabAt(2).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); if(isGlobalLayoutVisible && globalTabLayouts.getAnimation().hasEnded()) { @@ -308,9 +309,9 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr globalTabLayouts = findViewById(R.id.globalTabLayouts); tabLayout = findViewById(R.id.transactionsTabLayout); - tabLayout.addTab(0, "Buy"); - tabLayout.addTab(1, "Sell"); - tabLayout.addTab(2, "Transfer"); + tabLayout.addTab(0, getResources().getString(R.string.buyText)); + tabLayout.addTab(1, getResources().getString(R.string.sellText)); + tabLayout.addTab(2, getResources().getString(R.string.transferText)); tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); viewPager = findViewById(R.id.transactionsViewPager); @@ -339,6 +340,7 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr for(int i = 0; i < tabLayoutChildren.getChildCount(); i++) { tabLayoutChildren.getChildAt(i).setEnabled(false); + ((TextView) tabLayout.getTabAt(i).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); } revealAnimation = AnimationUtils.loadAnimation(this, R.anim.reveal); @@ -377,7 +379,9 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr public void onTextChanged(CharSequence s, int start, int before, int count) { ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(0).setEnabled(false); + ((TextView) tabLayout.getTabAt(0).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(1).setEnabled(false); + ((TextView) tabLayout.getTabAt(1).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); tabLayout.getTabAt(2).select(); } @@ -421,7 +425,9 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr updatePairData(); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(0).setEnabled(true); + ((TextView) tabLayout.getTabAt(0).getCustomView()).setTextColor(getResources().getColor(R.color.white)); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(1).setEnabled(true); + ((TextView) tabLayout.getTabAt(1).getCustomView()).setTextColor(getResources().getColor(R.color.white)); tabLayout.getTabAt(0).select(); } }); @@ -444,7 +450,9 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr pair_autoCompleteTextView.setText(""); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(0).setEnabled(false); + ((TextView) tabLayout.getTabAt(0).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(1).setEnabled(false); + ((TextView) tabLayout.getTabAt(1).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); tabLayout.getTabAt(2).select(); } @@ -554,8 +562,11 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr iconDownloaderTask.execute(); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(0).setEnabled(false); + ((TextView) tabLayout.getTabAt(0).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(1).setEnabled(false); + ((TextView) tabLayout.getTabAt(1).getCustomView()).setTextColor(getResources().getColor(R.color.separationColor)); ((LinearLayout) tabLayout.getChildAt(0)).getChildAt(2).setEnabled(true); + ((TextView) tabLayout.getTabAt(2).getCustomView()).setTextColor(getResources().getColor(R.color.white)); tabLayout.getTabAt(2).select(); updateCurrencyData(); diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java index ad94a15..0f51a94 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java +++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java @@ -134,7 +134,7 @@ public class BuyFragment extends CustomRecordFragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_buy, container, false); + view = inflater.inflate(R.layout.record_transaction_fragment_buy, container, false); context = getActivity().getApplicationContext(); diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java index 8efdd43..3700112 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java +++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java @@ -10,7 +10,6 @@ import android.support.design.widget.TextInputEditText; import android.support.v7.widget.AppCompatButton; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -135,7 +134,7 @@ public class SellFragment extends CustomRecordFragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_sell, container, false); + view = inflater.inflate(R.layout.record_transaction_fragment_sell, container, false); context = getActivity().getApplicationContext(); diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java index 42121ee..62ee88c 100644 --- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java +++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java @@ -1,28 +1,115 @@ package com.herbron.moodl.Activities.RecordTransactionFragments; +import android.app.DatePickerDialog; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import android.support.design.widget.TextInputEditText; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.DatePicker; +import android.widget.Spinner; +import android.widget.TimePicker; import com.herbron.moodl.CustomLayouts.CustomRecordFragment; +import com.herbron.moodl.DataManagers.CurrencyData.Currency; import com.herbron.moodl.R; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; + public class TransferFragment extends CustomRecordFragment { + private static Currency fragmentCurrency; + + private Spinner fromSpinner; + private Spinner toSpinner; + + private TextInputEditText transferDateEditText; + private SimpleDateFormat sdf; + private Calendar calendar; + + private View view; + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_transfer, container, false); + view = inflater.inflate(R.layout.record_transaction_fragment_transfer, container, false); + + calendar = Calendar.getInstance(); + sdf = new SimpleDateFormat(" HH:mm dd/MM/yyyy", Locale.UK); + + fromSpinner = view.findViewById(R.id.from_transfer_spinner); + toSpinner = view.findViewById(R.id.to_transfer_spinner); + + ArrayAdapter fromAdapter = new ArrayAdapter(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.from_transfer_options_string_array)); + fromAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + ArrayAdapter toAdapter = new ArrayAdapter(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.to_transfer_options_string_array)); + toAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + + fromSpinner.setAdapter(fromAdapter); + toSpinner.setAdapter(toAdapter); + + transferDateEditText = view.findViewById(R.id.transfertDate_editText); + transferDateEditText.setText(sdf.format(calendar.getTime())); + + transferDateEditText.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + createDatePicker(); + } + }); + return view; } + private void createDatePicker() + { + DatePickerDialog datePickerDialog = new DatePickerDialog( + getContext(), + new DatePickerDialog.OnDateSetListener() { + @Override + public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) { + calendar.set(Calendar.YEAR, year); + calendar.set(Calendar.MONTH, month); + calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth); + transferDateEditText.setText(sdf.format(calendar.getTime())); + createTimePicker(); + } + }, + calendar.get(Calendar.YEAR), + calendar.get(Calendar.MONTH), + calendar.get(Calendar.DAY_OF_MONTH) + ); + + datePickerDialog.getDatePicker().setMaxDate(Calendar.getInstance().getTimeInMillis()); + datePickerDialog.show(); + } + + private void createTimePicker() + { + new android.app.TimePickerDialog( + getContext(), + new android.app.TimePickerDialog.OnTimeSetListener() { + @Override + public void onTimeSet(TimePicker view, int hour, int minute) { + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + transferDateEditText.setText(sdf.format(calendar.getTime())); + } + }, + calendar.get(Calendar.HOUR_OF_DAY), + calendar.get(Calendar.MINUTE), + true + ).show(); + } + @Override public void onCurrencyUpdated() { - + fragmentCurrency = currency; } @Override diff --git a/app/src/main/java/com/herbron/moodl/CustomLayouts/CustomTabLayout.java b/app/src/main/java/com/herbron/moodl/CustomLayouts/CustomTabLayout.java index df32836..092092d 100644 --- a/app/src/main/java/com/herbron/moodl/CustomLayouts/CustomTabLayout.java +++ b/app/src/main/java/com/herbron/moodl/CustomLayouts/CustomTabLayout.java @@ -68,6 +68,7 @@ public class CustomTabLayout extends TabLayout { textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14); textView.setText(label); textView.setGravity(GRAVITY_CENTER); + textView.setTextColor(getResources().getColor(R.color.separationColor)); addTab(newTab().setCustomView(textView)); View tabView = linearLayout.getChildAt(linearLayout.getChildCount() - 1); diff --git a/app/src/main/res/layout-v21/fragment_marketcap_homeactivity.xml b/app/src/main/res/layout-v21/homeactivity_fragment_marketcap.xml similarity index 100% rename from app/src/main/res/layout-v21/fragment_marketcap_homeactivity.xml rename to app/src/main/res/layout-v21/homeactivity_fragment_marketcap.xml diff --git a/app/src/main/res/layout-v21/fragment_overview_homeactivity.xml b/app/src/main/res/layout-v21/homeactivity_fragment_overview.xml similarity index 100% rename from app/src/main/res/layout-v21/fragment_overview_homeactivity.xml rename to app/src/main/res/layout-v21/homeactivity_fragment_overview.xml diff --git a/app/src/main/res/layout-v21/fragment_summary_homeactivity.xml b/app/src/main/res/layout-v21/homeactivity_fragment_summary.xml similarity index 100% rename from app/src/main/res/layout-v21/fragment_summary_homeactivity.xml rename to app/src/main/res/layout-v21/homeactivity_fragment_summary.xml diff --git a/app/src/main/res/layout/fragment_charts_detailsactivity.xml b/app/src/main/res/layout/detailsactivity_fragment_charts.xml similarity index 100% rename from app/src/main/res/layout/fragment_charts_detailsactivity.xml rename to app/src/main/res/layout/detailsactivity_fragment_charts.xml diff --git a/app/src/main/res/layout/fragment_informations_detailsactivity.xml b/app/src/main/res/layout/detailsactivity_fragment_informations.xml similarity index 100% rename from app/src/main/res/layout/fragment_informations_detailsactivity.xml rename to app/src/main/res/layout/detailsactivity_fragment_informations.xml diff --git a/app/src/main/res/layout/fragment_transactions_detailsactivity.xml b/app/src/main/res/layout/detailsactivity_fragment_transactions.xml similarity index 100% rename from app/src/main/res/layout/fragment_transactions_detailsactivity.xml rename to app/src/main/res/layout/detailsactivity_fragment_transactions.xml diff --git a/app/src/main/res/layout/fragment_transfer.xml b/app/src/main/res/layout/fragment_transfer.xml deleted file mode 100644 index 8c13214..0000000 --- a/app/src/main/res/layout/fragment_transfer.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_marketcap_homeactivity.xml b/app/src/main/res/layout/homeactivity_fragment_marketcap.xml similarity index 100% rename from app/src/main/res/layout/fragment_marketcap_homeactivity.xml rename to app/src/main/res/layout/homeactivity_fragment_marketcap.xml diff --git a/app/src/main/res/layout/fragment_overview_homeactivity.xml b/app/src/main/res/layout/homeactivity_fragment_overview.xml similarity index 100% rename from app/src/main/res/layout/fragment_overview_homeactivity.xml rename to app/src/main/res/layout/homeactivity_fragment_overview.xml diff --git a/app/src/main/res/layout/fragment_summary_homeactivity.xml b/app/src/main/res/layout/homeactivity_fragment_summary.xml similarity index 100% rename from app/src/main/res/layout/fragment_summary_homeactivity.xml rename to app/src/main/res/layout/homeactivity_fragment_summary.xml diff --git a/app/src/main/res/layout/fragment_buy.xml b/app/src/main/res/layout/record_transaction_fragment_buy.xml similarity index 98% rename from app/src/main/res/layout/fragment_buy.xml rename to app/src/main/res/layout/record_transaction_fragment_buy.xml index 123707f..26f8d38 100644 --- a/app/src/main/res/layout/fragment_buy.xml +++ b/app/src/main/res/layout/record_transaction_fragment_buy.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" - android:hint="@string/activity_add_amount"/> + android:hint="@string/activity_amount"/> diff --git a/app/src/main/res/layout/fragment_sell.xml b/app/src/main/res/layout/record_transaction_fragment_sell.xml similarity index 98% rename from app/src/main/res/layout/fragment_sell.xml rename to app/src/main/res/layout/record_transaction_fragment_sell.xml index 6b60a69..fc43e10 100644 --- a/app/src/main/res/layout/fragment_sell.xml +++ b/app/src/main/res/layout/record_transaction_fragment_sell.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" - android:hint="@string/activity_add_amount"/> + android:hint="@string/activity_amount"/> diff --git a/app/src/main/res/layout/record_transaction_fragment_transfer.xml b/app/src/main/res/layout/record_transaction_fragment_transfer.xml new file mode 100644 index 0000000..45721c2 --- /dev/null +++ b/app/src/main/res/layout/record_transaction_fragment_transfer.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1cb703e..35046e9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -15,7 +15,7 @@ Activer la synchronisation Clé public Clé privée - Montant + Montant Prix d\'achat Date d\'achat Frais @@ -116,6 +116,24 @@ 6 mois 1 année + + + Site d'échange + Mon portefeuille + Minage + Le portefeuille de quelqu'un d'autre + Airdrop + Autre / Inconnu + Fork + + + + Site d'échange + Mon portefeuille + Le portefeuille de quelqu'un d'autre + Autre / Inconnu + + Pourcentage de coin émis : %1$s%% Edition d\'une transaction de %1$s Nouvelle transaction diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 41c377c..f9ca46b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -126,7 +126,7 @@ Kraken - Amount + Amount Purchase price Purchase date Fees @@ -157,6 +157,23 @@ API keys + + Exchange + My wallet + Mining + Someone else\'s wallet + Airdrop + Other / Unknown + Fork + + + + Exchange + My wallet + Someone else\'s wallet + Other / Unknown + + (%1$s) %1$s%2$s @@ -273,5 +290,6 @@ %1$s fixed Sell price Sell date + Date of transfert