From f0b2ef7557dfcb9d2761a958efa159e653a64272 Mon Sep 17 00:00:00 2001 From: Garry Lachman Date: Thu, 8 Jul 2021 19:03:41 +0300 Subject: [PATCH] help, icons, bump version --- android/app/build.gradle | 4 +- package.json | 2 +- .../miner/components/miner/xmrig-view.tsx | 4 +- src/components/miner/miner-navigator.tsx | 35 +++++++++--- .../settings/screens/help.screen.tsx | 54 +++++++++++++++++++ .../settings/settings-navigator.tsx | 21 ++++++-- 6 files changed, 104 insertions(+), 16 deletions(-) create mode 100644 src/components/settings/screens/help.screen.tsx diff --git a/android/app/build.gradle b/android/app/build.gradle index c810615b..6cc02132 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -167,8 +167,8 @@ android { applicationId "com.reactnativexmrig" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 14 - versionName "1.0.14" + versionCode 15 + versionName "1.0.15" externalNativeBuild { cmake { arguments "-DUV_INCLUDE_DIR=app/src/cpp/include" diff --git a/package.json b/package.json index 22e68606..715bc4a1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reactnativexmrig", - "version": "1.0.14", + "version": "1.0.15", "private": true, "scripts": { "android": "react-native run-android", diff --git a/src/components/miner/components/miner/xmrig-view.tsx b/src/components/miner/components/miner/xmrig-view.tsx index 25316a22..b1931a8b 100644 --- a/src/components/miner/components/miner/xmrig-view.tsx +++ b/src/components/miner/components/miner/xmrig-view.tsx @@ -15,13 +15,13 @@ type PoolViewProps = ViewProps & { export const XMRigView = (props: PoolViewProps):React.ReactElement => { - const RenderHashrateChartVictory = () => ( + const RenderHashrateChartVictory = React.useCallback(() => ( - ) + ), [props.fullWidth, props.hashrateHistory]); return ( diff --git a/src/components/miner/miner-navigator.tsx b/src/components/miner/miner-navigator.tsx index 84fec842..66ed2525 100644 --- a/src/components/miner/miner-navigator.tsx +++ b/src/components/miner/miner-navigator.tsx @@ -1,8 +1,8 @@ -import React from 'react'; +import React, { Component } from 'react'; import { LazyLoader } from '../core/lazy-loader'; import { BottomTabBarProps, createBottomTabNavigator } from '@react-navigation/bottom-tabs'; -import { BottomNavigation, BottomNavigationTab } from '@ui-kitten/components'; +import { BottomNavigation, BottomNavigationTab, Icon, IconProps } from '@ui-kitten/components'; import { SettingsContext, ThemeModes } from '../../core/settings'; const { Navigator, Screen } = createBottomTabNavigator(); @@ -22,21 +22,40 @@ const LazyOtherScreen = () => () const SimpleMinerScreen = React.lazy(() => import('./screens/simple-young/simple-miner.screen')); const LazySimpleMinerScreen = () => () +const MinerIcon = (props:IconProps) => ( + +); + +const PoolIcon = (props:IconProps) => ( + +); +const LogIcon = (props:IconProps) => ( + +); + +const OtherIcon = (props:IconProps) => ( + +); -const BottomTabBar:React.FC = ({ navigation, state, tabs }) => ( +const BottomTabBar:React.FC = ({ navigation, state, tabs }) => ( navigation.navigate(state.routeNames[index])}> - {tabs.map((tabTitle:string, tabIndex:number) => ( - + {tabs.map((tab:{name: string, icon: any}, tabIndex:number) => ( + ))} ); const AdvancedTabNavigator = () => ( - }> - + }> + @@ -44,7 +63,7 @@ const AdvancedTabNavigator = () => ( ); const SimpleYoungTabNavigator = () => ( - }> + }> ); diff --git a/src/components/settings/screens/help.screen.tsx b/src/components/settings/screens/help.screen.tsx new file mode 100644 index 00000000..63afc0e3 --- /dev/null +++ b/src/components/settings/screens/help.screen.tsx @@ -0,0 +1,54 @@ +import React from 'react'; +import { StyleSheet, Linking, View } from 'react-native'; +import { Layout, Text } from '@ui-kitten/components'; + +const HelpScreen = () => { + + + return ( + + + Help + How to create a wallet? + + Before you start mining you must have a Monero wallet. You can create a wallet for free using one of the wallet website/applications. + + Create wallet using Application + + You can use one of these application from Google Play: + + * MyMonero: Send money privately + * Monero Wallet. Buy & Exchange XMR coins + * Cake Wallet + * Exodus: Crypto Bitcoin Wallet + * Edge - Bitcoin, Ethereum, Monero, Ripple Wallet + Create wallet using Website + Linking.openURL('https://wallet.mymonero.com/')}>* https://wallet.mymonero.com/ + Linking.openURL('https://www.xmrwallet.com/')}>* https://www.xmrwallet.com/ + Linking.openURL('https://guarda.co/app/')}>* https://guarda.co/app/ + Linking.openURL('https://app.freewallet.org/')}>* https://app.freewallet.org/ + Linking.openURL('https://www.cryptonator.com/about/xmr')}>* https://www.cryptonator.com/about/xmr + + + ) +} + +const styles = StyleSheet.create({ + layout: { + flex: 1, + padding: 15 + }, + title: { + paddingVertical: 5, + }, + link: { + color: 'blue' + }, + cards: { + flex: 1, + flexDirection: 'column', + justifyContent: 'flex-start', + } +}); + +export default HelpScreen; \ No newline at end of file diff --git a/src/components/settings/settings-navigator.tsx b/src/components/settings/settings-navigator.tsx index f06093ad..5cf5222f 100644 --- a/src/components/settings/settings-navigator.tsx +++ b/src/components/settings/settings-navigator.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { LazyLoader } from '../core/lazy-loader'; import { BottomTabBarProps, createBottomTabNavigator } from '@react-navigation/bottom-tabs'; -import { BottomNavigation, BottomNavigationTab } from '@ui-kitten/components'; +import { BottomNavigation, BottomNavigationTab, Icon, IconProps } from '@ui-kitten/components'; const { Navigator, Screen } = createBottomTabNavigator(); @@ -10,23 +10,38 @@ const { Navigator, Screen } = createBottomTabNavigator(); const WalletScreen = React.lazy(() => import('./screens/wallet.screen')); const AppearanceScreen = React.lazy(() => import('./screens/appearance.screen')); +const HelpScreen = React.lazy(() => import('./screens/help.screen')); const LazyWalletScreen = () => () const LazyAppearanceScreen = () => () +const LazyHelpScreen = () => () +const WalletIcon = (props:IconProps) => ( + +); + +const AppearanceIcon = (props:IconProps) => ( + +); + +const HelpIcon = (props:IconProps) => ( + +); const BottomTabBar:React.FC = ({ navigation, state }) => ( navigation.navigate(state.routeNames[index])}> - - + + + ); export const TabNavigator = () => ( }> + );