Rollback

assets/json/place.json

@@ -12,16 +12,16 @@
         "description": "한국관광공사 사진 갤러리, 촬영자 박윤준"
     },
     {
-        "id": "1199341197",
-        "title": "갯골생태공원\n벚꽃터널",
+        "id": "FOhqoDZZ",
+        "title": "갯골생태공원 벚꽃터널",
         "image": "assets/images/places/picture_gaetgol_ecological_park.jpg",
         "marker": "",
-        "type": "",
-        "latitude": "37.3889771",
-        "longitude": "126.7804387",
-        "jibunAddress": "경기도 시흥시 장곡동 724-10",
-        "roadAddress": "경기도 시흥시 동서로 287",
-        "description": ""
+        "type": "park",
+        "latitude": "37.390592483462605",
+        "longitude": "126.78099832254267",
+        "jibunAddress": "경기 시흥시 장곡동 724-32",
+        "roadAddress": "",
+        "description": "한국관광공사 사진 갤러리, 촬영자 박윤준"
     },
     {
         "id": "1903881322",
@@ -74,14 +74,14 @@
     {
         "id": "",
         "title": "미생의 다리",
-        "image": "assets/images/places/picture_misaeng's_bridge.jpg",
+        "image": "assets/images/places/picture_misaeng's_bridge_2.jpg",
         "marker": "assets/icons/place_park.png",
         "type": "park",
         "latitude": "37.399584399999995",
         "longitude": "126.75299469999999",
         "jibunAddress": "경기도 시흥시 방산동 서해안로 779-43 미생의 다리",
         "roadAddress": "",
-        "description": "경기관광공사에 허락맡기"
+        "description": "한국관광공사 미생의 다리"
     },
     {
         "id": "35795149",
@@ -180,14 +180,14 @@
     {
         "id": "21805866",
         "title": "월곶역 자전거 대여소",
-        "image": "assets/images/places/gojan_station.png",
+        "image": "assets/images/places/picture_wolgot_station.JPG",
         "marker": "assets/icons/place_rental.png",
         "type": "rental",
-        "latitude": "37.3168245",
-        "longitude": "126.8234083",
-        "jibunAddress": "경기도 안산시 단원구 고잔동 453-53",
-        "roadAddress": "경기도 안산시 단원구 중앙대로 784 고잔역",
-        "description": ""
+        "latitude": "37.391705626349",
+        "longitude": "126.74264340883",
+        "jibunAddress": "경기도 시흥시 월곶동 992-8",
+        "roadAddress": "경기도 시흥시 월곶중앙로14번길 56",
+        "description": "교통평론가 한우진 - 출처 표기 요청"
     },
     {
         "id": "13491554",
@@ -215,13 +215,13 @@
     {
         "id": "18254017",
         "title": "정왕동 체육공원",
-        "image": "assets/images/places/tukorea.jpeg",
+        "image": "assets/images/places/picture_jeongwang_sports_park.jpeg",
         "marker": "assets/icons/place_park.png",
         "type": "park",
         "latitude": "37.3395459",
         "longitude": "126.7579547",
         "jibunAddress": "경기도 시흥시 정왕동 2158",
         "roadAddress": "경기도 시흥시 역전로 50 시흥시 배드민턴장",
-        "description": ""
+        "description": "한국관광공사 정왕체육공원"
     }
 ]

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"idiom":"watch","filename":"172.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"86x86","expected-size":"172","role":"quickLook"},{"idiom":"watch","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"40x40","expected-size":"80","role":"appLauncher"},{"idiom":"watch","filename":"88.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"40mm","scale":"2x","size":"44x44","expected-size":"88","role":"appLauncher"},{"idiom":"watch","filename":"102.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"45x45","expected-size":"102","role":"appLauncher"},{"idiom":"watch","filename":"92.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"46x46","expected-size":"92","role":"appLauncher"},{"idiom":"watch","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"50x50","expected-size":"100","role":"appLauncher"},{"idiom":"watch","filename":"196.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"98x98","expected-size":"196","role":"quickLook"},{"idiom":"watch","filename":"216.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"108x108","expected-size":"216","role":"quickLook"},{"idiom":"watch","filename":"48.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"24x24","expected-size":"48","role":"notificationCenter"},{"idiom":"watch","filename":"55.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"27.5x27.5","expected-size":"55","role":"notificationCenter"},{"idiom":"watch","filename":"66.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"33x33","expected-size":"66","role":"notificationCenter"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"3x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"2x"},{"size":"1024x1024","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch-marketing","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]}

lib/src/models/place.dart

@@ -84,13 +84,6 @@ class NaverPlaceData {
         address!.add(Address.fromJson(v));
       });
     }
-    // if (json['all'] != null) {
-    //   all = <All>[];
-    //   json['all'].forEach((v) {
-    //     all!.add(All.fromJson(v));
-    //   });
-    //   developer.log("address 2 called");
-    // }
   }
 
   Map<String, dynamic> toJson() {

lib/src/pages/day_record_page.dart

@@ -27,6 +27,7 @@ class _DayRecordPageState extends State<DayRecordPage> {
   Widget build(BuildContext context) {
     _recordProvider = Provider.of<RidingResultProvider>(context);
     num speed = 0;
+    late List<String>? image = _record.images;
 
     const textStyle = TextStyle(
         fontSize: 18.5,
@@ -47,7 +48,7 @@ class _DayRecordPageState extends State<DayRecordPage> {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Stack(alignment: Alignment.bottomCenter, children: <Widget>[
-               if(_record.images != null && _record.images!.length > 1)...[
+               if(image != null && image.length > 1)...[
               CarouselSlider.builder(
                 options: CarouselOptions(
                   initialPage: 0,
@@ -57,16 +58,16 @@ class _DayRecordPageState extends State<DayRecordPage> {
                     activeIndex = index;
                   }),
                 ),
-                itemCount: _record.images!.length,
+                itemCount: image.length,
                 itemBuilder: (context, index, realIndex) {
                   final path = _record.images![index];
                   return buildImage(path, index);
                 },
-              )] else if(_record.images != null && _record.images!.length == 1)...[
+              )] else if(image != null && image.length == 1)...[
                   SizedBox(
                   width: double.infinity,
                   height: 240,
-                  child: Image.network(_record.images![0], fit: BoxFit.cover))
+                  child: Image.network(image[0], fit: BoxFit.cover))
               ] else...[
                 SizedBox(
                   width: double.infinity,
@@ -117,8 +118,15 @@ class _DayRecordPageState extends State<DayRecordPage> {
                             style: recordStyle),
                         Text(timestampToText(_record.timestamp),
                             style: recordStyle),
-                        Text("${_record.distance / _record.timestamp} km/h",
-                            style: recordStyle),
+                        if(_record.timestamp != 0)...[
+                          Text(
+                              "${(_record.distance / _record.timestamp).toStringAsFixed(1)} km/h",
+                              style: recordStyle)]
+                        else...[
+                          const Text(
+                              "0.0 km/h",
+                              style: recordStyle)
+                        ],
                         Text("${_record.distance / 1000} km",
                             style: recordStyle),
                         Text(

lib/src/pages/home_page.dart

@@ -1,5 +1,3 @@
-import 'dart:developer' as developer;
-
 import 'package:flutter/material.dart';
 import 'package:line_chart/charts/line-chart.widget.dart';
 import 'package:line_chart/model/line-chart.model.dart';
@@ -548,12 +546,6 @@ class _HomePageState extends State<HomePage>
                       fontFamily: 'Pretendard',
                       fontWeight: FontWeight.w700,
                       color: Color.fromRGBO(51, 51, 51, 1))),
-              // Text('km',
-              //     style: TextStyle(
-              //         fontSize: 12,
-              //         fontFamily: 'Pretendard',
-              //         fontWeight: FontWeight.w300,
-              //         color: Color.fromRGBO(51, 51, 51, 1))),
             ],
           ),
           Container(
@@ -586,7 +578,7 @@ class _HomePageState extends State<HomePage>
                               color: Color.fromRGBO(51, 51, 51, 1))),
                 ),
                 Container(
-                  padding: EdgeInsets.only(bottom: 10),
+                  padding: const EdgeInsets.only(bottom: 10),
                   child: const VerticalDivider(
                       width: 1,
                       color: Color.fromRGBO(234, 234, 234, 1),
@@ -643,12 +635,8 @@ class _HomePageState extends State<HomePage>
         color: Colors.deepOrange,
       ),
       insideCirclePaint: insideCirclePaint,
-      onValuePointer: (LineChartModelCallback value) {
-        print('${value.chart} ${value.percentage}');
-      },
-      onDropPointer: () {
-        print('onDropPointer');
-      },
+      onValuePointer: (LineChartModelCallback value) {},
+      onDropPointer: () {},
     );
   }
 
@@ -868,57 +856,10 @@ class _HomePageState extends State<HomePage>
         )));
   }
 
-  // Widget? floatingButtons() {
-  //   return SpeedDial(
-  //     animatedIcon: AnimatedIcons.menu_close,
-  //     visible: true,
-  //     curve: Curves.bounceIn,
-  //     backgroundColor: const Color.fromARGB(0xFF, 0xFB, 0x95, 0x32),
-  //     children: [
-  //       SpeedDialChild(
-  //           child: const Icon(Icons.settings_sharp, color: Colors.white),
-  //           label: "설정",
-  //           labelStyle: const TextStyle(
-  //               fontWeight: FontWeight.w500,
-  //               color: Colors.white,
-  //               fontSize: 13.0),
-  //           backgroundColor: const Color.fromARGB(0xFF, 0xFB, 0x95, 0x32),
-  //           labelBackgroundColor: const Color.fromARGB(0xFF, 0xFB, 0x95, 0x32),
-  //           onTap: () {
-  //             Navigator.of(context).push(MaterialPageRoute(
-  //                 builder: (context) => ChangeNotifierProvider(
-  //                       create: (context) => SettingProvider(),
-  //                       child: const SettingPage(),
-  //                     )));
-  //           }),
-  //       SpeedDialChild(
-  //         child: const Icon(
-  //           Icons.add_chart_rounded,
-  //           color: Colors.white,
-  //         ),
-  //         label: "내 기록",
-  //         backgroundColor: const Color.fromARGB(0xFF, 0xFB, 0x95, 0x32),
-  //         labelBackgroundColor: const Color.fromARGB(0xFF, 0xFB, 0x95, 0x32),
-  //         labelStyle: const TextStyle(
-  //             fontWeight: FontWeight.w500, color: Colors.white, fontSize: 13.0),
-  //         onTap: () {
-  //           Navigator.of(context).push(MaterialPageRoute(
-  //               builder: (context) => ChangeNotifierProvider(
-  //                     create: (context) => RecordListProvider(),
-  //                     child: const RecordListPage(),
-  //                   )));
-  //         },
-  //       )
-  //     ],
-  //   );
-  // }
-
   int _getMaxDistance(List<Record> records) {
     double maxDistance = 0;
     int recoredCount = 0;
     for (var element in records) {
-      developer.log('반복 횟수${recoredCount++}');
-      developer.log(element.distance.toString());
       if (element.distance > maxDistance) {
         maxDistance = element.distance;
       }