Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a705c3d
style: 필요없는 주석 제거
mi-fasol Jan 31, 2023
76f8d59
fix: 명소 리스트 json 수정
poi1649 Jan 31, 2023
c75722a
fix: 회원탈퇴 재인증로직 삭제
poi1649 Jan 31, 2023
2acaa64
refactor: 필요없는 로그출력 삭제
poi1649 Jan 31, 2023
8d732aa
fix: 월곶역 허락 후 사진 등록
SeoYeonn05 Feb 1, 2023
f54ef14
fix: 갯골상태공원 벚꽃터널 추가
SeoYeonn05 Feb 1, 2023
1be8545
fix: 정왕 체육 공원 사진 수정
SeoYeonn05 Feb 3, 2023
4d12163
feat: 안드로이드 런쳐 아이콘 입력
SeoYeonn05 Feb 3, 2023
5ba4e98
feat: iOS 런쳐 아이콘 등록
SeoYeonn05 Feb 3, 2023
35befea
fix: place json 월곶역 수정
mi-fasol Feb 6, 2023
0ba76a7
fix: DayRecordPage 이미지 오류 수정
mi-fasol Feb 6, 2023
fb58efc
feat: google map -> naver map 변경
hyejinxx Feb 6, 2023
a7730ad
fix: multi hero 오류 수정
hyejinxx Feb 6, 2023
57bc7cf
fix: 오류(오타) 수정
hyejinxx Feb 6, 2023
d7410c4
design: 라이딩 라인 색, 아이콘 크기 변경
hyejinxx Feb 7, 2023
55fff36
fix: 주행 기록 속도 표시 수정
mi-fasol Feb 7, 2023
83af7da
fix: 주행 기록 속도 timestamp 0일 때 오류 수정
mi-fasol Feb 7, 2023
df858f1
fix: 계산 타임 오류 수정
hyejinxx Feb 7, 2023
a030dec
fix: 거리 단위 오류, 소숫점 수정
hyejinxx Feb 7, 2023
5b166aa
fix: 주행중 트래킹 모드 활성화
hyejinxx Feb 11, 2023
9c6589b
design: 그래프 circle 포인트 디자인 변경
hyejinxx Feb 11, 2023
b314b2c
feat: 이미지 여러장 나올 수 있도록 변경
hyejinxx Feb 11, 2023
a4a5900
fix: 코드 구조 수정
hyejinxx Feb 11, 2023
e40dcec
fix: 그래프 기록 7개까지만 나오도록 변경
hyejinxx Feb 11, 2023
7a79477
feat: 앱 출시 준비
hyejinxx Feb 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ GeneratedPluginRegistrant.java
key.properties
**/*.keystore
**/*.jks
/keystore
36 changes: 27 additions & 9 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ if (flutterRoot == null) {

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
flutterVersionCode = '2'
}

def flutterVersionName = localProperties.getProperty('flutter.versionName')
if (flutterVersionName == null) {
flutterVersionName = '1.0'
flutterVersionName = '1.1'
}

apply plugin: 'com.android.application'
Expand Down Expand Up @@ -56,12 +56,26 @@ android {
versionName flutterVersionName
multiDexEnabled true
}
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

android {
signingConfigs {
release {
storeFile file('../keystore/key.jks')
storePassword file('../keystore/keystore.password').text.trim()
keyPassword file('../keystore/keystore.password').text.trim()
keyAlias 'key'
}
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
buildTypes {
release {
signingConfig signingConfigs.release
}
}
}
}
Expand All @@ -72,7 +86,11 @@ flutter {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.google.firebase:firebase-analytics'
implementation platform('com.google.firebase:firebase-bom:26.2.0')
implementation ('com.google.firebase:firebase-analytics'){
exclude group: 'com.google.android.gms', module: 'play-services-safetynet'
}
implementation platform('com.google.firebase:firebase-bom:26.2.0'){
exclude group: 'com.google.android.gms', module: 'play-services-safetynet'
}
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
}
13 changes: 7 additions & 6 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application
android:label="ridingpartner_flutter"
android:label="@string/applicationName"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">

<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_geo_api_key"
/>
android:name="com.naver.maps.map.CLIENT_ID"
android:value="@string/naver_client_id" />
<activity

android:name="com.kakao.sdk.flutter.AuthCodeCustomTabsActivity"
android:exported="true">
<intent-filter android:label="flutter_web_auth">
Expand Down Expand Up @@ -58,15 +59,15 @@
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<meta-data
<!-- <meta-data
android:name="com.naver.sdk.clientId"
android:value="@string/client_id" />
<meta-data
android:name="com.naver.sdk.clientSecret"
android:value="@string/client_secret" />
<meta-data
android:name="com.naver.sdk.clientName"
android:value="@string/client_name" />
android:value="@string/client_name" /> -->

</application>
</manifest>
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.
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.
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.
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.
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.
7 changes: 5 additions & 2 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<resources>
<string name= "client_id">BPenPrJFNA58FMnODujH</string>
<string name= "client_secret">Dh1BA99PHE</string>
<!-- <string name= "client_id">BPenPrJFNA58FMnODujH</string> -->
<string name= "naver_client_id">8e3d26kxv8</string>
<string name= "applicationName">라이딩 파트너 in 시흥</string>
<!-- <string name= "client_secret">Dh1BA99PHE</string> -->
<string name= "naver_client_secret">6k41yNPjeQ4fHEKRVS75hZlcJRFdK8Y2hAOW3ut1</string>
<string name= "client_name">a</string>
<string name= "google_geo_api_key">AIzaSyCj32TmD4nqA_LjVQh2ePvGMT3jFkBjJBE</string>
</resources>
1 change: 0 additions & 1 deletion assets/config/.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiKey = 'WPe9pXWK0UdfrLNeUEzGzyNVmzOkMV5652NCfgvYT2bT38EipPBRjygmGQJuPUSmx4R7U3
endPointUrl = 'apis.data.go.kr'
path = '/1360000/VilageFcstInfoService_2.0/getUltraSrtFcst'
KAKAO_NATIVE_APP_KEY = 'b50ae09d3f49b62c4fba3b875e1b3458'
googleApiKey = 'AIzaSyC3Fs8c3EgsidmnrpsKecNgZKFkjcNdWmM'
KAKAO_REST_API_KEY = '3e9ec562133e4e4512f3b58671e15680'
openWeatherApiKey = 'aad4827650d553baf66f95d688d9688b'
openWeatherApiBaseUrl = 'https://api.openweathermap.org/data/2.5/weather'
Binary file removed assets/images/places/baegot_park.jpeg
Binary file not shown.
Binary file removed assets/images/places/daebu_island.jpeg
Binary file not shown.
Binary file removed assets/images/places/gojan_station.png
Binary file not shown.
Binary file removed assets/images/places/greenway.jpeg
Binary file not shown.
Binary file removed assets/images/places/hwajeong_river.jpeg
Binary file not shown.
Binary file removed assets/images/places/oido_station.jpeg
Binary file not shown.
Binary file removed assets/images/places/oido_station.png
Binary file not shown.
Binary file removed assets/images/places/okgu_park.jpeg
Binary file not shown.
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 added assets/images/places/picture_wolgot_station.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/places/wolgot_port.jpeg
Binary file not shown.
36 changes: 18 additions & 18 deletions assets/json/place.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": "한국관광공사 정왕체육공원"
}
]
Loading