search

csi-vitpune / FlutterMagazine

Developing Magazine Application using Flutter.
7 stars 5 forks source link

Font Family changed #15

Closed suhas-kadu closed 4 years ago

suhas-kadu commented 4 years ago

Description:

Used GoogleFonts package Fonts Family changed for Appbar, Title, Dates. Used letterspacing, word spacing .

Fixes: #1

nyx-code commented 4 years ago

Hello @suhas-kadu There seem to be various conflicts regarding your solution with the current state of the repository please git pull the latest version and then add changes and submit PR :)

Conflicts occurred: 

Conflicting files
android/app/src/main/AndroidManifest.xml
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
ios/Runner/Info.plist
lib/main.dart
pubspec.lock

looking forward to your PR. Thank You :)