therbron/Moodl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multiple fixs

Browse Source 
[DetailsActivity]
- Fix crash when finishing the activity before all transactions and trades are updated

[MarketCapitalizationActivity]
- Fix some views not visible for little screens

[RecordTransactionActivity]
- Fix crash when editing a sell transaction
This commit is contained in:
Tanguy Herbron 2018-08-21 02:00:09 +02:00
parent ac7fb545ec
commit 518df666f4
11 changed files with 334 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/TransactionsFragment.java
View File

@ -161,15 +161,18 @@ public class TransactionsFragment extends Fragment {
} }
}); });
TransactionListAdapter transactionListAdapter = new TransactionListAdapter(getActivity(), transactions); if(getActivity() != null)
{
TransactionListAdapter transactionListAdapter = new TransactionListAdapter(getActivity(), transactions);
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
transactionLayout.setAdapter(transactionListAdapter); transactionLayout.setAdapter(transactionListAdapter);
transactionLayout.setTextFilterEnabled(false); transactionLayout.setTextFilterEnabled(false);
} }
}); });
}
} }
} }

8
app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java
View File

@ -9,6 +9,7 @@ import android.support.v4.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.view.GravityCompat; import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.support.v4.widget.NestedScrollView;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.graphics.Palette; import android.support.v7.graphics.Palette;
import android.text.SpannableString; import android.text.SpannableString;
@ -54,6 +55,7 @@ public class MarketCapitalization extends Fragment implements CryptocompareNotif
private PreferencesManager preferencesManager; private PreferencesManager preferencesManager;
private CoinmarketCapAPIManager coinmarketCapAPIManager; private CoinmarketCapAPIManager coinmarketCapAPIManager;
private SwipeRefreshLayout refreshLayout; private SwipeRefreshLayout refreshLayout;
private NestedScrollView nestedScrollView;
private long lastTimestamp; private long lastTimestamp;
private String defaultCurrency; private String defaultCurrency;
private CryptocompareApiManager cryptocompareApiManager; private CryptocompareApiManager cryptocompareApiManager;
@ -89,6 +91,8 @@ public class MarketCapitalization extends Fragment implements CryptocompareNotif
defaultCurrency = preferencesManager.getDefaultCurrency(); defaultCurrency = preferencesManager.getDefaultCurrency();
lastTimestamp = 0; lastTimestamp = 0;
nestedScrollView = view.findViewById(R.id.nestedMarketCap);
setupRefreshLayout(); setupRefreshLayout();
setupDrawerButton(); setupDrawerButton();
@ -304,12 +308,12 @@ public class MarketCapitalization extends Fragment implements CryptocompareNotif
switch (motionEvent.getAction()) switch (motionEvent.getAction())
{ {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
refreshLayout.setEnabled(false); nestedScrollView.setEnabled(false);
break; break;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
break; break;
default: default:
refreshLayout.setEnabled(true); nestedScrollView.setEnabled(true);
break; break;
} }

4
app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java
View File

@ -296,8 +296,8 @@ public class BuyFragment extends CustomRecordFragment {
}); });
feesCurrencySpinner = view.findViewById(R.id.feesCurrency_editText_buy); feesCurrencySpinner = view.findViewById(R.id.feesCurrency_editText_buy);
currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>()); currencyFeeAdapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_spinner_item, new ArrayList<>());
currencyFeeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); currencyFeeAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
feesCurrencySpinner.setAdapter(currencyFeeAdapter); feesCurrencySpinner.setAdapter(currencyFeeAdapter);
deductHoldingsSwitch = view.findViewById(R.id.deductHoldingsBuy); deductHoldingsSwitch = view.findViewById(R.id.deductHoldingsBuy);

4
app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java
View File

@ -268,7 +268,7 @@ public class SellFragment extends CustomRecordFragment {
feesCurrencySpinner = view.findViewById(R.id.feesCurrency_editText_sell); feesCurrencySpinner = view.findViewById(R.id.feesCurrency_editText_sell);
currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>()); currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>());
currencyFeeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); currencyFeeAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
feesCurrencySpinner.setAdapter(currencyFeeAdapter); feesCurrencySpinner.setAdapter(currencyFeeAdapter);
if(fragmentPair != null) if(fragmentPair != null)
@ -522,6 +522,8 @@ public class SellFragment extends CustomRecordFragment {
public void updatePair(Pair pair) public void updatePair(Pair pair)
{ {
fragmentPair = pair;
currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>()); currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>());
currencyFeeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); currencyFeeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
feesCurrencySpinner.setAdapter(currencyFeeAdapter); feesCurrencySpinner.setAdapter(currencyFeeAdapter);

6
app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java
View File

@ -262,15 +262,15 @@ public class TransferFragment extends CustomRecordFragment {
private void setupSpinnesr() private void setupSpinnesr()
{ {
ArrayAdapter<String> fromAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.from_transfer_options_string_array)); ArrayAdapter<String> fromAdapter = new ArrayAdapter<String>(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); fromAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
fromSpinner.setAdapter(fromAdapter); fromSpinner.setAdapter(fromAdapter);
ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.to_transfer_options_string_array)); ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(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); toAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
toSpinner.setAdapter(toAdapter); toSpinner.setAdapter(toAdapter);
ArrayAdapter<String> feeAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.fees_options)); ArrayAdapter<String> feeAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.fees_options));
feeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); feeAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
feeSpinner.setAdapter(feeAdapter); feeSpinner.setAdapter(feeAdapter);
fromSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { fromSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

46
app/src/main/res/drawable-v21/spinner_background_header.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" ?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/hardWhite"/>
<corners
android:topLeftRadius="5dp"
android:topRightRadius="5dp"/>
<padding
android:left="3dp"
android:right="3dp"
android:top="3dp"
android:bottom="3dp"/>
</shape>
</item>
<item
android:gravity="center_vertical|right"
android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
</layer-list>
</item>
<item android:state_enabled="false">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/softWhite"/>
<corners
android:topLeftRadius="5dp"
android:topRightRadius="5dp"/>
<padding
android:left="3dp"
android:right="3dp"
android:top="3dp"
android:bottom="3dp"/>
</shape>
</item>
<item
android:gravity="center_vertical|right"
android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
</layer-list>
</item>
</selector>

6
app/src/main/res/drawable/spinner_background_header.xml
View File

@ -16,9 +16,6 @@
android:bottom="3dp"/> android:bottom="3dp"/>
</shape> </shape>
</item> </item>
<item
android:gravity="center_vertical|right"
android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
</layer-list> </layer-list>
</item> </item>
@ -38,9 +35,6 @@
android:bottom="3dp"/> android:bottom="3dp"/>
</shape> </shape>
</item> </item>
<item
android:gravity="center_vertical|right"
android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
</layer-list> </layer-list>
</item> </item>
</selector> </selector>

246
app/src/main/res/layout-v21/homeactivity_fragment_marketcap.xml
View File

@ -50,173 +50,181 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@drawable/gradient_background"> android:background="@drawable/gradient_background">
<LinearLayout android:id="@+id/layoutMarketCap" <android.support.v4.widget.NestedScrollView
android:id="@+id/nestedMarketCap"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="20dp"
android:background="@drawable/list_background"> android:background="@drawable/list_background">
<ProgressBar <LinearLayout android:id="@+id/layoutMarketCap"
android:id="@+id/progressBarMarketCap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleLarge"
android:layout_gravity="center"
android:background="@drawable/circular_progress_bar" />
<LinearLayout
android:id="@+id/layoutProgressMarketCap"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:orientation="vertical"
android:orientation="vertical"> android:paddingTop="20dp"
android:background="@drawable/list_background">
<FrameLayout <ProgressBar
android:layout_width="match_parent" android:id="@+id/progressBarMarketCap"
android:layout_height="350dp"
android:layout_marginTop="5dp">
<com.herbron.moodl.CustomLayouts.CustomPieChart
android:id="@+id/marketCapPieChart"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/currencyIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
android:layout_gravity="center"
android:visibility="gone"
android:maxHeight="110dp"
android:maxWidth="110dp"
android:adjustViewBounds="true"/>
</FrameLayout>
<LinearLayout
android:id="@+id/layoutMarketDetails"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" style="?android:attr/progressBarStyleLarge"
android:layout_margin="10dp"> android:layout_gravity="center"
android:background="@drawable/circular_progress_bar" />
<TextView <LinearLayout
android:layout_width="wrap_content" android:id="@+id/layoutProgressMarketCap"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:id="@+id/textViewTitle" android:layout_height="match_parent"
android:textStyle="bold" android:visibility="gone"
android:textSize="20sp"/> android:orientation="vertical">
<View <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/separationLineSize" android:layout_height="350dp"
android:layout_gravity="center_vertical" android:layout_marginTop="5dp">
android:layout_margin="10dp"
android:background="@color/separationColor" /> <com.herbron.moodl.CustomLayouts.CustomPieChart
android:id="@+id/marketCapPieChart"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/currencyIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
android:layout_gravity="center"
android:visibility="gone"
android:maxHeight="110dp"
android:maxWidth="110dp"
android:adjustViewBounds="true"/>
</FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/layoutMarketDetails"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="vertical"
android:baselineAligned="false"> android:layout_margin="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textViewTitle"
android:textStyle="bold"
android:textSize="20sp"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/separationLineSize"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:background="@color/separationColor" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:orientation="horizontal"
android:orientation="vertical"> android:baselineAligned="false">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/market_capitalization"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewMarketCap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
android:id="@+id/layoutPercentageDominance" android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="0.5"
android:visibility="gone" android:orientation="vertical">
android:layout_marginTop="5dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dominance_percentage" android:text="@string/market_capitalization"
android:textStyle="bold"/> android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/textViewDominancePercentage" android:id="@+id/textViewMarketCap"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/layoutPercentageDominance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
android:layout_marginTop="5dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dominance_percentage"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewDominancePercentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:id="@+id/layoutActiveCrypto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="5dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/active_cryptocurrencies"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewActiveCrypto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/layoutActiveCrypto" android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="0.5"
android:layout_marginTop="5dp"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/active_cryptocurrencies" android:text="@string/volume_24h"
android:textStyle="bold"/> android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/textViewActiveCrypto" android:id="@+id/textViewVolume"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> <LinearLayout
android:id="@+id/layoutActiveMarkets"
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/volume_24h"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewVolume"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/layoutActiveMarkets"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="5dp">
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/active_marketes" android:orientation="vertical"
android:textStyle="bold"/> android:layout_marginTop="5dp">
<TextView <TextView
android:id="@+id/textViewActiveMarkets" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content"/> android:text="@string/active_marketes"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewActiveMarkets"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
@ -228,6 +236,6 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.v4.widget.NestedScrollView>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

245
app/src/main/res/layout/homeactivity_fragment_marketcap.xml
View File

@ -51,173 +51,180 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@drawable/gradient_background"> android:background="@drawable/gradient_background">
<LinearLayout android:id="@+id/layoutMarketCap" <android.support.v4.widget.NestedScrollView
android:id="@+id/nestedMarketCap"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="20dp"
android:background="@drawable/list_background"> android:background="@drawable/list_background">
<ProgressBar <LinearLayout android:id="@+id/layoutMarketCap"
android:id="@+id/progressBarMarketCap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleLarge"
android:layout_gravity="center"
android:background="@drawable/circular_progress_bar" />
<LinearLayout
android:id="@+id/layoutProgressMarketCap"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:orientation="vertical"
android:orientation="vertical"> android:paddingTop="20dp">
<FrameLayout <ProgressBar
android:layout_width="match_parent" android:id="@+id/progressBarMarketCap"
android:layout_height="350dp"
android:layout_marginTop="5dp">
<com.herbron.moodl.CustomLayouts.CustomPieChart
android:id="@+id/marketCapPieChart"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/currencyIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
android:layout_gravity="center"
android:visibility="gone"
android:maxHeight="110dp"
android:maxWidth="110dp"
android:adjustViewBounds="true"/>
</FrameLayout>
<LinearLayout
android:id="@+id/layoutMarketDetails"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" style="?android:attr/progressBarStyleLarge"
android:layout_margin="10dp"> android:layout_gravity="center"
android:background="@drawable/circular_progress_bar" />
<TextView <LinearLayout
android:layout_width="wrap_content" android:id="@+id/layoutProgressMarketCap"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:id="@+id/textViewTitle" android:layout_height="match_parent"
android:textStyle="bold" android:visibility="gone"
android:textSize="20sp"/> android:orientation="vertical">
<View <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/separationLineSize" android:layout_height="350dp"
android:layout_gravity="center_vertical" android:layout_marginTop="5dp">
android:layout_margin="10dp"
android:background="@color/separationColor" /> <com.herbron.moodl.CustomLayouts.CustomPieChart
android:id="@+id/marketCapPieChart"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/currencyIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
android:layout_gravity="center"
android:visibility="gone"
android:maxHeight="110dp"
android:maxWidth="110dp"
android:adjustViewBounds="true"/>
</FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/layoutMarketDetails"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="vertical"
android:baselineAligned="false"> android:layout_margin="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textViewTitle"
android:textStyle="bold"
android:textSize="20sp"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/separationLineSize"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:background="@color/separationColor" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:orientation="horizontal"
android:orientation="vertical"> android:baselineAligned="false">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/market_capitalization"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewMarketCap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
android:id="@+id/layoutPercentageDominance" android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="0.5"
android:visibility="gone" android:orientation="vertical">
android:layout_marginTop="5dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dominance_percentage" android:text="@string/market_capitalization"
android:textStyle="bold"/> android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/textViewDominancePercentage" android:id="@+id/textViewMarketCap"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/layoutPercentageDominance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
android:layout_marginTop="5dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dominance_percentage"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewDominancePercentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:id="@+id/layoutActiveCrypto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="5dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/active_cryptocurrencies"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewActiveCrypto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/layoutActiveCrypto" android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="0.5"
android:layout_marginTop="5dp"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/active_cryptocurrencies" android:text="@string/volume_24h"
android:textStyle="bold"/> android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/textViewActiveCrypto" android:id="@+id/textViewVolume"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> <LinearLayout
android:id="@+id/layoutActiveMarkets"
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/volume_24h"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewVolume"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/layoutActiveMarkets"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="5dp">
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/active_marketes" android:orientation="vertical"
android:textStyle="bold"/> android:layout_marginTop="5dp">
<TextView <TextView
android:id="@+id/textViewActiveMarkets" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content"/> android:text="@string/active_marketes"
android:textStyle="bold"/>
<TextView
android:id="@+id/textViewActiveMarkets"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
@ -229,6 +236,6 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.v4.widget.NestedScrollView>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

2
app/src/main/res/layout/record_transaction_fragment_buy.xml
View File

@ -100,7 +100,7 @@
android:id="@+id/feesCurrency_editText_buy" android:id="@+id/feesCurrency_editText_buy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1" />
</LinearLayout> </LinearLayout>

9
app/src/main/res/layout/spinner_dropdown_black.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?android:attr/spinnerDropDownItemStyle"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="?attr/dropdownListPreferredItemHeight"
android:ellipsize="marquee"
android:textColor="#000000"/>