Merge pull request #20 from nb312/dev

Dev
FlutterOpen · Feb 17, 2019 · 14b4097 · 14b4097
2 parents abe1a67 + e8d02de
commit 14b4097
Show file tree

Hide file tree

Showing 11 changed files with 390 additions and 0 deletions.
diff --git a/assets/images/feed/feed_pic3_01.jpg b/assets/images/feed/feed_pic3_01.jpg
diff --git a/assets/images/feed/feed_pic3_02.jpg b/assets/images/feed/feed_pic3_02.jpg
diff --git a/assets/images/feed/feed_pic3_03.jpg b/assets/images/feed/feed_pic3_03.jpg
diff --git a/assets/images/feed/feed_pic3_header_01.jpg b/assets/images/feed/feed_pic3_header_01.jpg
diff --git a/assets/images/feed/feed_pic3_header_02.jpg b/assets/images/feed/feed_pic3_header_02.jpg
diff --git a/assets/images/feed/feed_pic3_header_03.jpg b/assets/images/feed/feed_pic3_header_03.jpg
diff --git a/assets/images/feed/feed_pic3_left.jpg b/assets/images/feed/feed_pic3_left.jpg
diff --git a/lib/main.dart b/lib/main.dart
@@ -44,6 +44,7 @@ class MyApp extends StatelessWidget {
         ///FEED group page
         FEED_PAGES[0]: (context) => FeedPageOne(),
         FEED_PAGES[1]: (context) => FeedPageTwo(),
+        FEED_PAGES[2]: (context) => FeedThreePage(),
         FEED_PAGES[3]: (context) => FeedPageFour(),
         FEED_PAGES[4]: (context) => FeedFivePage(),
         FEED_PAGES[9]: (context) => FeedPageTen(),

diff --git a/lib/page/feed/feed_const.dart b/lib/page/feed/feed_const.dart
@@ -48,6 +48,15 @@ class FeedImage {
   static const feed2_image2 = "$IMAGE_PATH/feed2_image2.png";
   static const heart = "$IMAGE_PATH/heart.png";
 
+//feed 3
+  static const FEED_3_PIC_01 = "$IMAGE_PATH/feed_pic3_01.jpg";
+  static const FEED_3_PIC_02 = "$IMAGE_PATH/feed_pic3_02.jpg";
+  static const FEED_3_PIC_03 = "$IMAGE_PATH/feed_pic3_03.jpg";
+  static const FEED_3_PIC_HEADER_01 = "$IMAGE_PATH/feed_pic3_header_01.jpg";
+  static const FEED_3_PIC_HEADER_02 = "$IMAGE_PATH/feed_pic3_header_02.jpg";
+  static const FEED_3_PIC_HEADER_03 = "$IMAGE_PATH/feed_pic3_header_03.jpg";
+  static const FEED_3_PIC_LEFT = "$IMAGE_PATH/feed_pic3_left.jpg";
+
   //Image for feed 5;
   static const feed5_pic_01 = "$IMAGE_PATH/feed_pic5_01.jpg";