From 33d525f5c7448b90dd1aed2417e5c7ee999d665e Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 15 Aug 2019 19:17:17 +0100
Subject: [PATCH] Revert "Floating balance icon (#23)"
This reverts commit 84fe0f69d5617990826b03400f9c88e35e63eacc.
---
src/component/floatingWalletBalance/view.js | 5 ++--
src/styles/floatingButton.js | 28 ++++++++-------------
2 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/component/floatingWalletBalance/view.js b/src/component/floatingWalletBalance/view.js
index e87ee4d..db65790 100644
--- a/src/component/floatingWalletBalance/view.js
+++ b/src/component/floatingWalletBalance/view.js
@@ -23,7 +23,7 @@ class FloatingWalletBalance extends React.PureComponent<Props> {
style={floatingButtonStyle.pendingContainer}
onPress={() => navigation && navigation.navigate({ routeName: 'Rewards' })}
>
- <Icon name="award" size={14} style={floatingButtonStyle.rewardIcon} />
+ <Icon name="award" size={18} style={floatingButtonStyle.rewardIcon} />
<Text style={floatingButtonStyle.text}>{unclaimedRewardAmount}</Text>
</TouchableOpacity>
)}
@@ -31,10 +31,9 @@ class FloatingWalletBalance extends React.PureComponent<Props> {
style={floatingButtonStyle.container}
onPress={() => navigation && navigation.navigate({ routeName: 'WalletStack' })}
>
- <Icon name="coins" size={12} style={floatingButtonStyle.balanceIcon} />
{isNaN(balance) && <ActivityIndicator size="small" color={Colors.White} />}
{(!isNaN(balance) || balance === 0) && (
- <Text style={floatingButtonStyle.text}>{formatCredits(parseFloat(balance), 0)}</Text>
+ <Text style={floatingButtonStyle.text}>{formatCredits(parseFloat(balance), 2) + ' LBC'}</Text>
)}
</TouchableOpacity>
</View>
diff --git a/src/styles/floatingButton.js b/src/styles/floatingButton.js
index c4e6a4b..b092b17 100644
--- a/src/styles/floatingButton.js
+++ b/src/styles/floatingButton.js
@@ -13,14 +13,13 @@ const floatingButtonStyle = StyleSheet.create({
container: {
zIndex: 100,
borderRadius: 24,
- padding: 10,
- paddingLeft: 16,
- paddingRight: 16,
+ padding: 14,
+ paddingLeft: 20,
+ paddingRight: 20,
alignItems: 'center',
justifyContent: 'center',
- flexDirection: 'row',
backgroundColor: Colors.LbryGreen,
- shadowColor: Colors.Black,
+ shadowColor: 'black',
shadowOpacity: 0.1,
shadowRadius: StyleSheet.hairlineWidth,
shadowOffset: {
@@ -30,10 +29,10 @@ const floatingButtonStyle = StyleSheet.create({
},
pendingContainer: {
borderRadius: 24,
- padding: 10,
- paddingLeft: 12,
- paddingRight: 58,
- marginRight: -52,
+ padding: 14,
+ paddingLeft: 20,
+ paddingRight: 70,
+ marginRight: -60,
alignItems: 'center',
justifyContent: 'center',
backgroundColor: Colors.BrighterLbryGreen,
@@ -42,8 +41,8 @@ const floatingButtonStyle = StyleSheet.create({
},
text: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
- fontSize: 16,
+ fontFamily: 'Inter-UI-Bold',
+ fontSize: 18,
},
bottomRight: {
right: 10,
@@ -51,12 +50,7 @@ const floatingButtonStyle = StyleSheet.create({
},
rewardIcon: {
color: Colors.White,
- marginRight: 3,
- },
- balanceIcon: {
- color: Colors.White,
- marginRight: 3,
- marginTop: -1,
+ marginRight: 4,
},
});
--
2.47.2