diff --git a/public/favicon.ico b/public/favicon.ico index ef0d06c..ca75b14 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo192.png b/public/logo192.png index af8ffe0..904abd6 100644 Binary files a/public/logo192.png and b/public/logo192.png differ diff --git a/public/logo512.png b/public/logo512.png index 241482f..ad9c011 100644 Binary files a/public/logo512.png and b/public/logo512.png differ diff --git a/src/Components/Dialogs/Dialog.tsx b/src/Components/Dialogs/Dialog.tsx index 2afa116..0a88ce7 100644 --- a/src/Components/Dialogs/Dialog.tsx +++ b/src/Components/Dialogs/Dialog.tsx @@ -48,10 +48,12 @@ export const Dialog: React.FC<{
-
-

{title}

- -
+ {title && ( +
+

{title}

+ +
+ )}
{children} diff --git a/src/Components/Dialogs/InfoDialog.tsx b/src/Components/Dialogs/InfoDialog.tsx index 99fefb3..5834180 100644 --- a/src/Components/Dialogs/InfoDialog.tsx +++ b/src/Components/Dialogs/InfoDialog.tsx @@ -1,5 +1,6 @@ import { useAnalytics } from '../../Hooks/useAnalytics'; import { BuyMeCoffee } from '../../Icons/generated/Support'; +import { Separator } from '../Misc/Separator'; import { Paragraph } from '../Misc/TextComponents'; import { Dialog } from './Dialog'; @@ -10,57 +11,72 @@ export const InfoDialog = ({ }) => { const analytics = useAnalytics(); return ( - -
- - There are some controls that you might not know about, so here's a - short list of them. - -

Life counter

-
    -
  • - Tap on a player's + or - button to add or subtract{' '} - 1 life. -
    • -
  • - Long press on a player's + or - button to add or - subtract 10 life. -
    • -
- -

- Commander damage and other counters -

-
    -
  • - Tap on the counter to add{' '} - 1 counter. -
    • -
  • - Long press on the counter to subtract{' '} - 1 counter. -
    • -
- -

Other functionality

-
    -
  • - - When a player is at or below 0 life, has taken{' '} - 21 or more Commander Damage or has{' '} - 10 or more poison counters, a button with a skull - will appear on that player's card. Tapping it will dim the - player's card. - -
    • -
  • - - Swiping down on a player's card will show that - player's settings menu. - -
    • -
+ +
+

Contributors

+
+ {/* */} + Elin: Icon and colors +
+
+
+
+

📋 Usage Guide

+ +
+
+ + There are some controls that you might not know about, so here's a + short list of them. + +

Life counter

+
    +
  • + Tap on a player's + or - button to add or + subtract 1 life. +
    • +
  • + Long press on a player's + or - button to add or + subtract 10 life. +
    • +
+ +

+ Commander damage and other counters +

+
    +
  • + Tap on the counter to add{' '} + 1 counter. +
    • +
  • + Long press on the counter to subtract{' '} + 1 counter. +
    • +
+ +

Other functionality

+
    +
  • + + When a player is at or below 0 life, has taken{' '} + 21 or more Commander Damage or has{' '} + 10 or more poison counters, a button with a + skull will appear on that player's card. Tapping it will dim the + player's card. + +
    • +
  • + + Swiping down on a player's card will show that + player's settings menu. + +
    • +
+
+
+ -
{
{ openInfo(); }} /> +

- Life Trinket +
Life Trinket
v{version.installedVersion} diff --git a/src/Icons/generated/Trinket.tsx b/src/Icons/generated/Trinket.tsx new file mode 100644 index 0000000..8fd9c47 --- /dev/null +++ b/src/Icons/generated/Trinket.tsx @@ -0,0 +1,51 @@ +import PropTypes from 'prop-types'; +import { SVGProps } from 'react'; +interface SVGRProps { + title?: string; + titleId?: string; + size?: string; +} +const Trinket = ({ + title, + titleId, + ...props +}: SVGProps & SVGRProps) => { + return ( + + {title ? {title} : null} + + + + + + + + + + ); +}; +Trinket.propTypes = { + title: PropTypes.string, +}; +export default Trinket; diff --git a/src/Icons/generated/index.ts b/src/Icons/generated/index.ts index 2e76819..7bdaae0 100644 --- a/src/Icons/generated/index.ts +++ b/src/Icons/generated/index.ts @@ -13,3 +13,4 @@ export { default as PartnerTax } from './PartnerTax'; export { default as Poison } from './Poison'; export { default as ResetGame } from './ResetGame'; export { default as Skull } from './Skull'; +export { default as Trinket } from './Trinket'; diff --git a/src/Icons/svgs/Trinket.svg b/src/Icons/svgs/Trinket.svg new file mode 100644 index 0000000..c57b82e --- /dev/null +++ b/src/Icons/svgs/Trinket.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +