LBRYCommunity/lbry-react-native
1
0
Fork 0
Code Issues Pull requests 12 Projects Releases Packages Wiki Activity

Merge pull request #24 from lbryio/revert-23-coins

Browse source 
Revert "Floating balance icon"
This commit is contained in:
Akinwale Ariwodola 2019-08-15 19:17:32 +01:00 committed by GitHub
commit 0d06ce5844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/component/floatingWalletBalance/view.js
View file

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

28
src/styles/floatingButton.js
View file

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