fade-in images; changing locale across the app

dokk66 · Sep 10, 2018 · 44cd10c · 44cd10c
1 parent 12bd041
commit 44cd10c
Show file tree

Hide file tree

Showing 31 changed files with 368 additions and 404 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -1,13 +1,10 @@
+A Flutter tourism app that is backed-by Redux, shows animations (with 3D rotation), internationalization (i18n, English <=> Arabic), ClipPath, and fonts.
 
-A Flutter tourism demo app that shows animations (with 3D rotation), internationalization (i18n, English <=> Arabic), ClipPath, and fonts.
-
-[YouTube demo](https://youtu.be/31WL1ep1Ce8)
 
 ### Screenshots
-![](art/sc1.png)
-![](art/sc2.png)
-![](art/sc3.png)
-![](art/sc4.png)
+![](art/screenshots/flutter-tourism-demo-400x300.gif)
+
+[YouTube demo](https://youtu.be/31WL1ep1Ce8)
 
 
 <!-- ### Credits

diff --git a/images/Armenia1.jpg b/images/Armenia1.jpg
diff --git a/images/Bodrum.jpg b/images/Bodrum.jpg
diff --git a/images/Mare_marmaris_beach.jpg b/images/Mare_marmaris_beach.jpg
diff --git a/images/Ordu.jpg b/images/Ordu.jpg
diff --git a/images/TURKEY-COUNTRY-IMAGE.jpg b/images/TURKEY-COUNTRY-IMAGE.jpg
diff --git a/images/Trabzon.jpg b/images/Trabzon.jpg
diff --git a/images/Tunisia tourisim.jpg b/images/Tunisia tourisim.jpg
diff --git a/images/bursa-02.jpg b/images/bursa-02.jpg
diff --git a/images/egypt-pyramids.jpg b/images/egypt-pyramids.jpg
diff --git a/images/gamze-bozkaya-561150-unsplash.jpg b/images/gamze-bozkaya-561150-unsplash.jpg
diff --git a/images/giresun_turkey__by_bigzoso-dc0xmin.jpg b/images/giresun_turkey__by_bigzoso-dc0xmin.jpg
diff --git a/images/indonesia.jpg b/images/indonesia.jpg
diff --git a/images/istanbul-2.jpg b/images/istanbul-2.jpg
diff --git a/images/istanbul.jpg b/images/istanbul.jpg
diff --git a/images/kuala-lumpur.jpg b/images/kuala-lumpur.jpg
diff --git a/images/lebanon travel.jpg b/images/lebanon travel.jpg
diff --git a/images/placeholder.png b/images/placeholder.png
diff --git a/images/tourist-boat-trip.jpg b/images/tourist-boat-trip.jpg
diff --git a/images/ukraine.jpg b/images/ukraine.jpg
diff --git a/images/viceroy-bali.jpg b/images/viceroy-bali.jpg
diff --git a/lib/app_styles.dart b/lib/app_styles.dart
diff --git a/lib/clippers.dart b/lib/clippers.dart
@@ -61,31 +61,3 @@ class NotchedClipper extends CustomClipper<Path> {
   @override
   bool shouldReclip(CustomClipper<Path> oldClipper) => false;
 }
-
-class BottomWaveClipper extends CustomClipper<Path> {
-  @override
-  Path getClip(Size size) {
-    Path path = new Path();
-    path.lineTo(0.0, size.height - 20);
-
-    var bottomControlPoint = new Offset(size.width / 3.25, size.height);
-    var bottomEndPoint = new Offset(size.width, size.height - 30.0);
-    path.quadraticBezierTo(bottomControlPoint.dx, bottomControlPoint.dy,
-        bottomEndPoint.dx, bottomEndPoint.dy);
-
-    path.lineTo(size.width, size.height - 30);
-    path.lineTo(size.width, 20.0);
-
-    var bottomControlPoint2 = new Offset(size.width / 3.25, 0.0);
-    var bottomEndPoint2 = new Offset(0.0, 40.0);
-    path.quadraticBezierTo(bottomControlPoint2.dx, bottomControlPoint2.dy,
-        bottomEndPoint2.dx, bottomEndPoint2.dy);
-
-    path.lineTo(0.0, 40.0);
-
-    return path;
-  }
-
-  @override
-  bool shouldReclip(CustomClipper<Path> oldClipper) => false;
-}
diff --git a/lib/i18n/translations.dart b/lib/i18n/translations.dart
@@ -12,31 +12,13 @@ class Translations {
   static Map<String, Map<String, String>> _localizedValues = {
     'en': {
       'title': 'Tourism App',
-      'username': 'Username',
-      'password': 'Password',
       'loading': 'Loading...',
-      'checks': 'Checks',
-      'empty': 'No Information!',
-      'msg_empty_content': 'Empty Content!',
-      'summary': 'Summary',
-      'leaves': 'Leaves',
-      'msg_error_fetching_checks': 'Error fetching checks!',
-      'msg_error_fetching_summary': 'Error fetching summary!',
-      'msg_error_fetching_leaves': 'Error fetching leaves!',
-      'msg_error_fetching_profile': 'Error fetching Profile!',
-      'msg_error_posting_new_leave': 'Error posting new leave request!',
-      'msg_check_login_data': 'Please check your login data!',
       'msg_error_loading_destinatinos': 'Error loading destinations list!',
       'msg_check_internet_connection': 'Make sure you\'re connected to the Internet',
       'msg_loading_leave_types': 'Getting leaves types...',
       'msg_error_loading_type_types':
           'There is a problem fetching leave types!',
-      'leave_request_reason': 'Leave message',
-      'date_from': 'From date',
-      'dateTo': 'to date',
-      'logged_in': 'Logged In...',
       'language': 'عربي',
-      'profile': 'Profile',
       'login': 'Login',
       'retry': 'Retry',
       'apply': 'Apply',
@@ -56,31 +38,13 @@ class Translations {
     },
     'ar': {
       'title': 'تطبيق سياحة',
-      'username': 'المستخدم',
-      'password': 'الرمز السري',
       'loading': 'الرجاء الإنتظار...',
       'empty': 'معلومات فارغة',
-      'checks': 'البصمات',
-      'msg_error_fetching_summary': 'مشكلة في إحضار البصمات',
-      'msg_empty_content': 'لا توجد معلومات!',
       'summary': 'التقرير',
-      'leaves': 'الإجازات',
       'login': 'دخول',
-      'apply': 'تقديم',
       'profile': 'الملف الشخصي',
-      'msg_error_fetching_checks': 'مشكلة في عرض البصمات!',
-      'msg_error_fetching_leaves': 'مشكلة في عرض الإجازات!',
-      'msg_error_fetching_profile': 'مشكلة في عرض معلومات الموظف!',
-      'msg_error_posting_new_leave': 'مشكلة في إنشاء إجازة جديدة!',
       'msg_error_loading_destinatinos': 'مشكلة في إحضار قائمة السفرات!',
-      'msg_check_login_data': 'الرجاء التأكد من المعلومات المدخلة!',
-      'msg_loading_leave_types': 'جاري إحضار أنواع الإجازات...',
-      'msg_error_loading_type_types': 'مشكلة في إحضار أنواع الإجازات!',
       'msg_check_internet_connection': 'الرجاء التأكد من إتصالك بالإنترنت',
-      'leave_request_reason': 'سبب التقديم',
-      'date_from': 'من تاريخ',
-      'date_to': 'إلى',
-      'logged_in': 'تم تسجيل الدخول...',
       'retry': 'محاولة أخرى',
       'language': 'English',
       'home': 'الرئيسية',

diff --git a/lib/networking/server_api.dart b/lib/networking/server_api.dart
@@ -6,18 +6,21 @@ import 'package:tourism_demo/models/destination.dart';
 import 'package:tourism_demo/utils/http_utils.dart';
 
 class ServerAPI {
+  static String host = 'https://api.jsonbin.io/b/5b96db5eab9a186eafe86a97/1';
 
-
-  static String host = 'http://192.168.0.103:3000';
   // DESTINATIONS
   Future<List<Destination>> fetchDestinations() async {
     print('fetching destinations...');
-    var url = '$host/destinations';
+    var url = '$host';
 
-    Response response = await getRequest(url, {});
+    Response response = await getRequest(url, {
+      'Content-type': 'application/json; charset=utf-8',
+      'Accept': 'application/json'
+    });
     List responseJSON = json.decode(response.body);
-    List<Destination> destinations =
-        responseJSON.map((destination) => Destination.fromJson(destination)).toList();
+    List<Destination> destinations = responseJSON
+        .map((destination) => Destination.fromJson(destination))
+        .toList();
 
     print('${destinations.length} destinations fetched...');
 

diff --git a/lib/styles/app_colors.dart b/lib/styles/app_colors.dart
@@ -3,6 +3,36 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
+
+import 'package:flutter/widgets.dart';
+
+BoxDecoration gradientBackDecoration() {
+  return const BoxDecoration(
+    gradient: const LinearGradient(
+      begin: Alignment.topLeft,
+      end: Alignment.bottomRight,
+      colors: const <Color>[
+        Color(0xffF55B9A), // <color name="violet_red">#F55B9A</color>
+        Color(0xffF9B16E), // <color name="rajah">#F9B16E</color>
+      ],
+    ),
+  );
+}
+
+BoxDecoration cardGradientBackground() {
+  return const BoxDecoration(
+    gradient: const LinearGradient(
+      begin: Alignment.topLeft,
+      end: Alignment.bottomCenter,
+      colors: const <Color>[
+        Color(0xffF1EEE7), // <color name="alabaster">#F1EEE7</color>
+        Color(0xffF8FAF9), // <color name="hint_of_red">#F8FAF9</color>
+      ],
+    ),
+  );
+}
+
+
 class AppColors {
   static var primaryBackgroundColor = Colors.white;    // <color name="blue_lagoon">#005F79</color>
   static var secondaryBackgroundColor = new Color(0xFF458BA3);  //<color name="boston_blue">#458BA3</color>