Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test용 PR #240

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7593eec
Merge pull request #144 from sparcs-kaist/hotfix/add-block-anonymous
skykhs3 Feb 29, 2024
3d290ef
Merge pull request #191 from sparcs-kaist/dev
thomaskim1130 May 20, 2024
0ee90b8
Fix(post_write_page.dart): Request URL 수정
sangohkim Aug 19, 2024
dd1f237
Feat(slide_routing.dart): 안드로이드 back swipe 복구
sangohkim Aug 19, 2024
3072bfd
Chore(build.gradle): targetSdkVersion, compileSdkVersion 수정
sangohkim Aug 19, 2024
491de78
Chore(pubspec.yaml): Update version to 1.1.1, Remove flutter_local_no…
sangohkim Aug 19, 2024
d5a7c0b
Merge pull request #215 from sparcs-kaist/hotfix/uploading-attachments
thomaskim1130 Aug 29, 2024
d72820f
Merge branch 'dev' into feat/caching-for-post-write-page
sparcscasio Sep 13, 2024
44f25f3
Feat: caching attachments
sparcscasio Sep 14, 2024
1ab1734
Merge branch 'dev' into feat/cache-attachments
sparcscasio Sep 14, 2024
d401784
fix: delete cache after submit
sparcscasio Sep 14, 2024
32c6706
Merge branch 'feat/cache-attachments' of https://github.com/sparcs-ka…
sparcscasio Sep 14, 2024
89f971f
chore: fix git issue
sparcscasio Sep 14, 2024
8394b20
feat: anonymous
sparcscasio Sep 22, 2024
5247496
fix: double attachment
sparcscasio Sep 22, 2024
a3a1e1a
fix: double attachment error
sparcscasio Sep 22, 2024
5c18f33
Feat(post_write_page.dart): 임시저장 관련 스낵바 구현
sangohkim Sep 24, 2024
bcc596f
Feat: 임시 저장 기능 스낵바 영어 추가
sangohkim Sep 25, 2024
1e4dd15
Fix(Fastfile): build_app 파라미터 원상복구 + 프로비져닝프로필 추가
sangohkim Sep 25, 2024
a58a731
Merge pull request #230 from sparcs-kaist/feat/cache-attachments
sangohkim Sep 25, 2024
21a8cee
Update Fastfile
sangohkim Sep 25, 2024
0ee1e8a
Update Fastfile
sangohkim Sep 25, 2024
6de77ff
Feat: deploy android
sangohkim Sep 27, 2024
e447d8d
Chore(pubspec.yaml): version update
sangohkim Sep 30, 2024
c2ceb2a
Merge pull request #233 from sparcs-kaist/chore/deploy-1.2.0
sangohkim Sep 30, 2024
b1cca4a
Merge branch 'main' into dev
sangohkim Oct 1, 2024
ea9eb97
Refactor(post_write_page.dart): flutter_quill 코드 업데이트
sangohkim Oct 1, 2024
1fa4257
Refactor: unused var, import 제거
sangohkim Oct 1, 2024
ceeac73
Refactor: deprecated textScalerFactor, MaterialStateProperty 수정
sangohkim Oct 1, 2024
66beda0
Refactor: const 키워드 추가
sangohkim Oct 1, 2024
a6b6d74
Refactor(post_write_page.dart): WillPopScope -> PopScope
sangohkim Oct 1, 2024
fa1348c
Refactor: minSdkVersion 수정
sangohkim Oct 1, 2024
19dd0c2
Refactor: Change to Declarative Gradle
sangohkim Oct 1, 2024
79efaeb
Refactor: iOS 빌드 성공
sangohkim Oct 1, 2024
e4e82e9
Refactor: Android 빌드 성공
sangohkim Oct 1, 2024
237cc89
Feat(deploy.yml): Disable deploy workflow
sangohkim Oct 1, 2024
f129091
Feat(build.yml): Build workflow flutter, java 버전 변경
sangohkim Oct 1, 2024
8a5641c
Chore(pubspec.yaml): flutter_lints 패키지 버전 업데이트
sangohkim Oct 1, 2024
83e3a8d
Feat(post_write_page.dart): 옵션 조정
sangohkim Oct 1, 2024
e956350
Refactor(post_write_page.dart): context mounted 확인 코드 수정
sangohkim Oct 2, 2024
7530fcf
Feat(user_provider.dart): debugPrint 수정
sangohkim Oct 2, 2024
a6f8a5f
Merge pull request #235 from sparcs-kaist/chore/migrate-to-3.24
sangohkim Oct 31, 2024
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
3 changes: 0 additions & 3 deletions .fvm/fvm_config.json

This file was deleted.

4 changes: 0 additions & 4 deletions .fvmrc

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
branches: [dev, main]

env:
FLUTTER_VERSION: "3.13"
JAVA_VERSION: "11"
FLUTTER_VERSION: "3.24"
JAVA_VERSION: "17"

jobs:
build-android:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Deploy to Play Store, App Store

on:
# main 브랜치에 push 연산이 일어나는 경우
push:
branches:
- main
# push:
# branches:
# - main
# 수동으로 배포를 진행해야하는 경우에 실행
workflow_dispatch:
inputs:
Expand Down
101 changes: 50 additions & 51 deletions android/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
CFPropertyList (3.0.7)
base64
nkf
rexml
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.877.0)
aws-sdk-core (3.190.1)
aws-partitions (1.980.0)
aws-sdk-core (3.209.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.142.0)
aws-sdk-core (~> 3, >= 3.189.0)
aws-sdk-kms (1.94.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.166.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.10.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
Expand All @@ -32,12 +35,11 @@ GEM
declarative (0.0.20)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.109.0)
faraday (1.10.3)
excon (0.111.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -58,22 +60,22 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.3.0)
fastlane (2.219.0)
fastimage (2.3.1)
fastlane (2.223.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
Expand All @@ -94,10 +96,10 @@ GEM
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (>= 0.1.1)
optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
Expand All @@ -106,36 +108,35 @@ GEM
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.2)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.29.0)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.6.1)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-cloud-storage (1.45.0)
google-cloud-errors (1.4.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.29.0)
google-apis-storage_v1 (~> 0.31.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
Expand All @@ -146,34 +147,36 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
http-cookie (1.0.7)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.1)
jwt (2.7.1)
mini_magick (4.12.0)
json (2.7.2)
jwt (2.9.1)
base64
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.3.0)
multipart-post (2.4.1)
nanaimo (0.3.0)
naturally (2.2.1)
optparse (0.4.0)
nkf (0.2.0)
optparse (0.5.0)
os (1.1.4)
plist (3.7.1)
public_suffix (5.0.4)
rake (13.1.0)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.6)
rexml (3.3.7)
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.3)
signet (0.18.0)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
Expand All @@ -190,19 +193,15 @@ GEM
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
webrick (1.8.1)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.23.0)
xcodeproj (1.25.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
rexml (>= 3.3.2, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand Down
21 changes: 9 additions & 12 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -27,10 +28,6 @@ if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
/* compileSdkVersion
- 앱을 컴파일할 때 사용하는 SDK의 버전
Expand Down Expand Up @@ -59,8 +56,8 @@ android {

/* minSdkVersion
- 앱이 설치될 수 있는 최소한의 API 버전 (이 버전보다 낮은 것만 지원하는 기기에는 설치 불가)
- multiDex에서 요구하는 최소 버전인 21로 설정 */
minSdkVersion 21
- super_native_extensions에서 요구하는 최소 버전인 23으로 설정 */
minSdkVersion 23

/* targetSdkVersion
- 앱이 테스트되고 최적화된 Android SDK 버전을 의미
Expand Down Expand Up @@ -92,5 +89,5 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.4.0'
}
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,5 @@
android:value="2" />
</application>
<uses-permission android:name="android.permission.INTERNET"/>

</manifest>
13 changes: 0 additions & 13 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
buildscript {
ext.kotlin_version = '1.8.21'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
Expand Down
30 changes: 22 additions & 8 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
include ':app'
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()

def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.1.2" apply false
id "org.jetbrains.kotlin.android" version "1.8.21" apply false
}

include ":app"
4 changes: 3 additions & 1 deletion assets/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@
"contentPlaceholder": "Type content here",
"conditionSnackBar": "Please select a board and enter the title and content.",
"noCategory": "No Topics",
"selectCategory": "Select Topic"
"selectCategory": "Select Topic",
"savedAtCache": "The post has been saved on your device.",
"restoreFromCache": "Stored draft has been restored."
},
"termsAndConditionsPage": {
"termsAndConditions": "Terms and Conditions",
Expand Down
4 changes: 3 additions & 1 deletion assets/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@
"contentPlaceholder": "내용을 입력해주세요.",
"conditionSnackBar": "게시판을 선택해주시고 제목, 내용을 입력해주세요.",
"noCategory": "말머리 없음",
"selectCategory": "말머리를 선택하세요"
"selectCategory": "말머리를 선택하세요",
"savedAtCache": "작성 중이신 게시글을 디바이스에 저장하였습니다.",
"restoreFromCache": "임시 저장되었던 게시글을 다시 불러왔습니다."
},
"termsAndConditionsPage": {
"termsAndConditions": "이용약관",
Expand Down
Loading
Loading