Skip to content

Commit

Permalink
style: added app icons
Browse files Browse the repository at this point in the history
Improvements
  • Loading branch information
pizidavi committed Feb 15, 2024
1 parent 11f5f4b commit 45aa6d7
Show file tree
Hide file tree
Showing 45 changed files with 304 additions and 89 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FIDAS Verona – Federazione Italiana Associazioni Donatori di Sangue

## Setup

### Install dependencies
### Project setup

Clone the project

Expand All @@ -24,7 +24,7 @@ Install dependencies
yarn install
```

### Setup environment
### Environment setup

The `.env` and `.env.dev` file is needed to run this application.
An example `.env.sample` file can be found inside the repository
Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
197 changes: 174 additions & 23 deletions ios/fidasverona/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,204 @@
{
"images": [
{
"size": "60x60",
"expected-size": "180",
"filename": "180.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x",
"size": "20x20"
"scale": "3x"
},
{
"size": "40x40",
"expected-size": "80",
"filename": "80.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x",
"size": "20x20"
"scale": "2x"
},
{
"size": "40x40",
"expected-size": "120",
"filename": "120.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x",
"size": "29x29"
"scale": "3x"
},
{
"size": "60x60",
"expected-size": "120",
"filename": "120.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x",
"size": "29x29"
"scale": "2x"
},
{
"size": "57x57",
"expected-size": "57",
"filename": "57.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x",
"size": "40x40"
"scale": "1x"
},
{
"size": "29x29",
"expected-size": "58",
"filename": "58.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x",
"size": "40x40"
"scale": "2x"
},
{
"size": "29x29",
"expected-size": "29",
"filename": "29.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x",
"size": "60x60"
"scale": "1x"
},
{
"size": "29x29",
"expected-size": "87",
"filename": "87.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x",
"size": "60x60"
"scale": "3x"
},
{
"size": "57x57",
"expected-size": "114",
"filename": "114.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x"
},
{
"size": "20x20",
"expected-size": "40",
"filename": "40.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x"
},
{
"size": "20x20",
"expected-size": "60",
"filename": "60.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x"
},
{
"size": "1024x1024",
"filename": "1024.png",
"expected-size": "1024",
"idiom": "ios-marketing",
"scale": "1x",
"size": "1024x1024"
"folder": "Images.xcassets/AppIcon.appiconset/",
"scale": "1x"
},
{
"size": "40x40",
"expected-size": "80",
"filename": "80.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "72x72",
"expected-size": "72",
"filename": "72.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "76x76",
"expected-size": "152",
"filename": "152.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "50x50",
"expected-size": "100",
"filename": "100.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "29x29",
"expected-size": "58",
"filename": "58.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "76x76",
"expected-size": "76",
"filename": "76.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "29x29",
"expected-size": "29",
"filename": "29.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "50x50",
"expected-size": "50",
"filename": "50.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "72x72",
"expected-size": "144",
"filename": "144.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "40x40",
"expected-size": "40",
"filename": "40.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "83.5x83.5",
"expected-size": "167",
"filename": "167.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "20x20",
"expected-size": "20",
"filename": "20.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "20x20",
"expected-size": "40",
"filename": "40.png",
"folder": "Images.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
}
],
"info": {
"author": "xcode",
"version": 1
}
]
}
4 changes: 2 additions & 2 deletions src/components/commons/DonationsCenterCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function DonationsCenterCard({ donationsCenter, onBookmarkPress }: DonationsCent

// Render
return (
<View className='flex-row gap-4'>
<View className='flex-row gap-2'>
<View className='flex-1'>
<LocaleText className='text-lg font-bold text-secondary-500' text={donationsCenter.name} />
<LocaleText text={donationsCenter.address} />
Expand Down Expand Up @@ -72,7 +72,7 @@ function DonationsCenterCard({ donationsCenter, onBookmarkPress }: DonationsCent

const styles = StyleSheet.create({
contactContainer: {
columnGap: 12,
columnGap: 8,
},
});

Expand Down
9 changes: 1 addition & 8 deletions src/components/commons/NextDonationCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { formateDate } from '../../utils/formatters';
import { Donation } from '../../types/entities';

type NextDonationCardProps = {
lastDonation?: Donation;
lastDonation: Donation;
};

/**
Expand All @@ -32,29 +32,22 @@ type NextDonationCardProps = {
function NextDonationCard({ lastDonation }: NextDonationCardProps) {
// Memos
const lastDonationDate = useMemo(() => {
if (!lastDonation) return undefined;
return new Date(lastDonation.date);
}, [lastDonation]);

const nextSADonationDate = useMemo(() => {
if (!lastDonationDate) return new Date();

const date = new Date(lastDonationDate);
date.setDate(date.getDate() + SA_DONATION_INTERVAL);
return date;
}, [lastDonationDate]);

const nextPLDonationDate = useMemo(() => {
if (!lastDonationDate) return new Date();

const date = new Date(lastDonationDate);
date.setDate(date.getDate() + PL_DONATION_INTERVAL);
return date;
}, [lastDonationDate]);

const nextPIDonationDate = useMemo(() => {
if (!lastDonationDate) return new Date();

const date = new Date(lastDonationDate);
date.setDate(date.getDate() + PI_DONATION_INTERVAL);
return date;
Expand Down
4 changes: 3 additions & 1 deletion src/components/commons/TotalDonationsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ function TotalDonationsCard({ donationsNumber, gender }: TotalDonationsCardProps
return (
<Card className='items-center'>
<View className='items-center'>
<LocaleText text='messages:congratulations' className='text-lg font-bold' />
{donationsNumber > 0 && (
<LocaleText text='messages:congratulations' className='text-lg font-bold' />
)}
<LocaleText text='messages:youPerformed' />
<LocaleText text={donationsNumber} className='text-5xl font-extrabold text-primary-500' />
<LocaleText text='messages:totalDonations' className='lowercase text-dark-300' />
Expand Down
81 changes: 67 additions & 14 deletions src/components/icons/Logo.tsx

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@
"confirmOperation": "Do you confirm the operation?",
"congratulations": "Congratulations!",
"hello": "Hello,",
"logoutMessage": "Are you sure you want to logout?",
"nextAchievement": "Next achievement:",
"nextDonation": "Next donation:",
"noDonationsToShow": "No donation to show",
"totalDonations": "Total donations",
"whereDonate": "Where you can donate",
"youPerformed": "You performed:"
Expand Down
2 changes: 2 additions & 0 deletions src/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@
"confirmOperation": "Confermi l'operazione?",
"congratulations": "Complimenti!",
"hello": "Ciao,",
"logoutMessage": "Sei sicuro di voler fare il logout?",
"nextAchievement": "Prossimo traguardo:",
"nextDonation": "Potrai donare tra:",
"noDonationsToShow": "Nessuna donaziona da mostrare",
"totalDonations": "Donazioni totali",
"whereDonate": "Dove puoi donare",
"youPerformed": "Hai effettuato:"
Expand Down
Loading

0 comments on commit 45aa6d7

Please sign in to comment.