Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Type safety: implement enums #1425

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 188 additions & 0 deletions android/gradlew.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
#!/usr/bin/env sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we remove this file @Ovifer13?


#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
17 changes: 9 additions & 8 deletions components/Amount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import { Spacer } from './layout/Spacer';
import { Row } from './layout/Row';
import { Body } from './text/Body';
import LoadingIndicator from './LoadingIndicator';
import { Units } from '../enums';

type Units = 'sats' | 'BTC' | 'fiat';
type UnitType = 'sats' | 'BTC' | 'fiat';

interface AmountDisplayProps {
amount: string;
unit: Units;
unit: UnitType;
symbol?: string;
negative?: boolean;
plural?: boolean;
Expand All @@ -38,11 +39,11 @@ function AmountDisplay({
color = undefined,
pending = false
}: AmountDisplayProps) {
if (unit === 'fiat' && !symbol) {
if (unit === Units.fiat && !symbol) {
console.error('Must include a symbol when rendering fiat');
}

const actualSymbol = unit === 'BTC' ? '₿' : symbol;
const actualSymbol = unit === Units.BTC ? '₿' : symbol;

const Pending = () => (
<View
Expand Down Expand Up @@ -73,7 +74,7 @@ function AmountDisplay({

// TODO this could probably be made more readable by componentizing the repeat bits
switch (unit) {
case 'sats':
case Units.sats:
return (
<Row align="flex-end">
{pending ? <Pending /> : null}
Expand All @@ -88,8 +89,8 @@ function AmountDisplay({
</View>
</Row>
);
case 'BTC':
case 'fiat':
case Units.BTC:
case Units.fiat:
if (rtl) {
return (
<Row align="flex-end">
Expand Down Expand Up @@ -173,7 +174,7 @@ export default class Amount extends React.Component<AmountProps, {}> {
// display fiat amounts when rate fetch fails as $N/A
if (unformattedAmount.error) {
const amount = 'N/A';
const unit = 'fiat';
const unit = Units.fiat;
const symbol = '$';

if (toggleable) {
Expand Down
3 changes: 2 additions & 1 deletion components/BlueWalletWarning.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import { View } from 'react-native';
import { ErrorMessage } from './SuccessErrorMessage';
import stores from '../stores/Stores';
import { localeString } from '../utils/LocaleUtils';
import { Implementation } from '../enums';

export default function BlueWalletWarning() {
const SettingsStore = stores.settingsStore;
const node: any =
SettingsStore.settings.nodes &&
SettingsStore.settings.nodes[SettingsStore.settings.selectedNode || 0];
const isLndHubIo =
node.implementation === 'lndhub' &&
node.implementation === Implementation.lndhub &&
(node.lndhubUrl.includes('https://lndhub.io') ||
node.lndhubUrl.includes('https://lndhub.herokuapp.com'));

Expand Down
2 changes: 1 addition & 1 deletion components/Channels/ChannelItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { View } from 'react-native';
import { Body } from '../../components/text/Body';
import { BalanceBar } from '../../components/Channels/BalanceBar';
import { Row } from '../../components/layout/Row';
import { Status } from '../../views/Channels/ChannelsPane';
import { Status } from '../../enums/index';
import Amount from '../Amount';
import { Tag } from './Tag';

Expand Down
23 changes: 12 additions & 11 deletions components/Conversion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import SettingsStore, { DEFAULT_FIAT } from '../stores/SettingsStore';
import { themeColor } from '../utils/ThemeUtils';

import ClockIcon from '../assets/images/SVG/Clock.svg';
import { Units } from '../enums';

interface ConversionProps {
amount: string | number;
Expand Down Expand Up @@ -63,7 +64,7 @@ export default class Conversion extends React.Component<
const { getRate }: any = FiatStore;

let satAmount: string | number;
if (sats) {
if (Units.sats) {
satAmount = sats;
} else {
satAmount = getSatAmount(amount);
Expand All @@ -72,7 +73,7 @@ export default class Conversion extends React.Component<
if (!fiat || fiat === DEFAULT_FIAT || (!amount && !sats)) return;

const ConversionDisplay = ({
units = 'sats',
units = Units.sats,
showRate
}: {
units: string;
Expand All @@ -89,7 +90,7 @@ export default class Conversion extends React.Component<
<>
<Text style={{ color: themeColor('secondaryText') }}>
{` | ${getRate(
this.props.UnitsStore.units === 'sats'
this.props.UnitsStore.units === Units.sats
)}`}
</Text>
</>
Expand All @@ -98,7 +99,7 @@ export default class Conversion extends React.Component<
);

const ConversionPendingDisplay = ({
units = 'sats',
units = Units.sats,
showRate
}: {
units: string;
Expand Down Expand Up @@ -129,7 +130,7 @@ export default class Conversion extends React.Component<
<>
<Text style={{ color: themeColor('secondaryText') }}>
{` | ${getRate(
this.props.UnitsStore.units === 'sats'
this.props.UnitsStore.units === Units.sats
)}`}
</Text>
</>
Expand All @@ -141,31 +142,31 @@ export default class Conversion extends React.Component<
// an on-chain debit is a negative number, but a lightning debit isn't
return (
<>
{units === 'fiat' && (
{units === Units.fiat && (
<TouchableOpacity onPress={() => this.toggleShowRate()}>
{satsPending ? (
<ConversionPendingDisplay
units="sats"
units={Units.sats}
showRate={showRate}
/>
) : (
<ConversionDisplay
units="sats"
units={Units.sats}
showRate={showRate}
/>
)}
</TouchableOpacity>
)}
{units !== 'fiat' && (
{units !== Units.fiat && (
<TouchableOpacity onPress={() => this.toggleShowRate()}>
{satsPending ? (
<ConversionPendingDisplay
units="fiat"
units={Units.fiat}
showRate={showRate}
/>
) : (
<ConversionDisplay
units="fiat"
units={Units.fiat}
showRate={showRate}
/>
)}
Expand Down
4 changes: 3 additions & 1 deletion components/HopPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ import { ChannelItem } from './Channels/ChannelItem';
import Channel from '../models/Channel';

import stores from '../stores/Stores';
import ChannelsStore, { ChannelsType } from '../stores/ChannelsStore';
import ChannelsStore from '../stores/ChannelsStore';
import UnitsStore from '../stores/UnitsStore';

import { ChannelsType } from '../enums';

interface ChannelPickerProps {
title?: string;
displayValue?: string;
Expand Down
3 changes: 2 additions & 1 deletion components/LayerBalances/OnchainSwipeableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { themeColor } from './../../utils/ThemeUtils';
import Coins from './../../assets/images/SVG/Coins.svg';
import Receive from './../../assets/images/SVG/Receive.svg';
import Send from './../../assets/images/SVG/Send.svg';
import { TransactionType } from '../../enums';

interface OnchainSwipeableRowProps {
navigation: any;
Expand Down Expand Up @@ -138,7 +139,7 @@ export default class OnchainSwipeableRow extends Component<
navigation.navigate('Send', {
destination: value,
amount,
transactionType: 'On-chain'
transactionType: TransactionType.OnChain
});
};

Expand Down
Loading