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

Update v4.0.5 #453

Merged
merged 193 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
3a798fb
Modify imageUrls nullable
skdud0629 Jul 19, 2024
6250a20
Add ShowToastMessage SideEffect
skdud0629 Jul 19, 2024
764cfad
Add Store image upload logic
skdud0629 Jul 19, 2024
87356de
Add string resource
skdud0629 Jul 19, 2024
14cc308
Delete unnecessary code
skdud0629 Jul 19, 2024
77e7fbd
Add multiple image upload logic
skdud0629 Jul 19, 2024
774729b
Change store image logic to support multiple images
skdud0629 Jul 19, 2024
6cc34ca
Fix image alignment to center in HorizontalPager
skdud0629 Jul 19, 2024
751eaf1
Add launchImagePicker
skdud0629 Jul 22, 2024
1039323
Modify imagePickerHandler to use background queries
skdud0629 Jul 22, 2024
c81e005
Modify imagePickerHandler to use withContext
skdud0629 Jul 22, 2024
7664f44
[add] 시간표 feature 모듈 생성 후 패키지 구성
Jokwanhee Oct 23, 2024
bbcc771
[add] 시간표 네트워크 api, 데이터소스, 레포지토리 구현
Jokwanhee Oct 23, 2024
4851d1c
[add] 예제 템플릿
Jokwanhee Oct 25, 2024
f421d52
[add] 요청 쿼리 data class
Jokwanhee Oct 25, 2024
09f42fb
[del] 필요없는 코드
Jokwanhee Oct 25, 2024
062801f
[del] 임포트 제거
Jokwanhee Oct 25, 2024
41c6237
[#433] 디자인 시스템 모듈 추가
nodobi Oct 25, 2024
a22690f
[#433] 색상 팔레트 적용
nodobi Oct 25, 2024
618b857
[add] DTO nullable 타입 추가
Jokwanhee Oct 25, 2024
c460b30
Merge pull request #430 from BCSDLab/feature/timetable-setting
Jokwanhee Oct 25, 2024
cb98cda
[add] DayHeader 컴포넌트 UI구현
Jokwanhee Oct 25, 2024
223fdd6
[add] TimetableHeader UI 구현
Jokwanhee Oct 25, 2024
021dd41
[add] SidebarLabel UI 구현
Jokwanhee Oct 25, 2024
853c894
[add] TImetableSidebar UI 구현
Jokwanhee Oct 25, 2024
1aeb584
[#433] 폰트 및 텍스트 스타일 추가
nodobi Oct 25, 2024
d146993
[#433] 타이포그래피 적용
nodobi Oct 25, 2024
37ec0cf
[add] Header UI 변경
Jokwanhee Oct 25, 2024
26ff037
[#433] Shape 추가 및 적용
nodobi Oct 25, 2024
75a102f
[Fix] Koin 모듈 타이포 수정
nodobi Oct 25, 2024
3236488
[#433] 색상 팔레트 기본값 변경, 접근제어자 추가
nodobi Oct 25, 2024
81fafc6
[#433] 테마, 폰트 프리뷰 추가
nodobi Oct 25, 2024
f462d4b
Merge branch 'develop' of https://github.com/BCSDLab/KOIN_ANDROID int…
nodobi Oct 25, 2024
2bd1740
[add] color param 추가
Jokwanhee Oct 26, 2024
bab798d
[#433] 중복되는 의존성 제거
nodobi Oct 26, 2024
efc64ca
[#433] Preview 별도 파일로 분리
nodobi Oct 26, 2024
73742b7
[#433] timetable 모듈에 디자인 시스템 모듈 의존성 추가
nodobi Oct 26, 2024
a8694be
[#433] 의존성 Material3 으로 변경
nodobi Oct 26, 2024
ed800d4
[#433] M3 테마로 변경
nodobi Oct 26, 2024
33fb448
Merge pull request #435 from BCSDLab/release
hsgo2430 Oct 26, 2024
936e2df
Merge pull request #436 from BCSDLab/production
hsgo2430 Oct 26, 2024
7fbb24a
[#433] timetable 모듈 m3 적용
nodobi Oct 26, 2024
9d1387b
Merge branch 'develop' of https://github.com/BCSDLab/KOIN_ANDROID int…
nodobi Oct 26, 2024
df43297
Merge branch 'dev' into test
skdud0629 Oct 26, 2024
c3fcf71
Merge remote-tracking branch 'origin/develop' into modify-store-info
skdud0629 Oct 26, 2024
482c644
intent -> blockingIntent
skdud0629 Oct 26, 2024
5af27a5
Merge pull request #434 from BCSDLab/feature/compose_design_system
nodobi Oct 26, 2024
8073822
Merge remote-tracking branch 'origin/develop' into feature/timetable_…
Jokwanhee Oct 26, 2024
9086bc4
[fix] materia3 컴파일 에러 해결
Jokwanhee Oct 26, 2024
6bb8606
fix: 스크롤시 넘버피커 UI가 확대되고 축소되는 버그 수정
hsgo2430 Oct 26, 2024
1e64cee
사업자 인증 페이지 ui 변경
skdud0629 Oct 26, 2024
11cc029
로딩 다이얼로그 추가
skdud0629 Oct 26, 2024
0ba2914
fix: 다이얼로그 title text 크기 조절
hsgo2430 Oct 27, 2024
33f7fa8
[add] TimetableEventTime UI 구현
Jokwanhee Oct 27, 2024
0bac2b8
del: 좋아요 기능 삭제
ThirFir Oct 16, 2024
bfa6f6e
fix: 키워드 알림 상태 버그
ThirFir Oct 21, 2024
0e5ec8e
del: onResume override
ThirFir Oct 22, 2024
26e7a33
fix: 식단 카드 간격 조정
ThirFir Oct 22, 2024
a372212
fix: 식단 카드 Radius
ThirFir Oct 22, 2024
7279ad8
fix: 식단 상세 정보 ui
ThirFir Oct 22, 2024
03c0c19
fix: 식단 공유 버튼 ui
ThirFir Oct 22, 2024
107a6dd
add: onboarding 모듈
ThirFir Oct 22, 2024
d1ae376
refactor: OnboardingManager 추가, MainActivity 식단 툴팁 변경
ThirFir Oct 22, 2024
26deffb
add: 화살표 위치 매개변수
ThirFir Oct 22, 2024
49d14dc
refactor: 공지 키워드 툴팁 코드 리팩토링
ThirFir Oct 22, 2024
1647ad9
del: Koin 모듈에서 balloon lib 의존성 제거
ThirFir Oct 22, 2024
39e520c
fix: tooltip initialize 여부 조건 추가
ThirFir Oct 22, 2024
c038ed3
del: Unused onboarding codes
ThirFir Oct 22, 2024
d0b8ece
refactor: Onboarding Hilt Component: Singleton -> ActivityComponent
ThirFir Oct 22, 2024
535d4c6
refactor: 온보딩 바텀시트 액션 모듈화 이용
ThirFir Oct 22, 2024
d9d15a4
refactor: DataStore DI 로직 변경
ThirFir Oct 22, 2024
d864ea5
fix: 함수명 포괄적으로 변경
ThirFir Oct 22, 2024
85f533d
add: 툴팁 닫기 API
ThirFir Oct 23, 2024
b3511fb
add: 식단 공유 툴팁
ThirFir Oct 23, 2024
64b5bf7
add: 이벤트 로깅
ThirFir Oct 23, 2024
dded9d7
add: 알림 액티비티에 공지 키워드 진입점 추가
ThirFir Oct 23, 2024
2792822
refactor: enum 위치 이동
ThirFir Oct 24, 2024
37f9ad5
add: 원본 공지 진입버튼
ThirFir Oct 24, 2024
7304ca3
feat: 식단 공유 툴팁 gif로 변경
ThirFir Oct 27, 2024
9f2792a
fix: 빌드 에러
ThirFir Oct 28, 2024
c1e6104
[add] material2 & timber 추가
Jokwanhee Oct 28, 2024
72e7906
[fix] DayHeader 수정
Jokwanhee Oct 28, 2024
7a35a78
[add] TimetableConstants 추가
Jokwanhee Oct 28, 2024
12d6f49
[del] dummyEvent 파일 전역 변수 삭제
Jokwanhee Oct 28, 2024
91d5f2b
[fix] TimetableSidebar 수정
Jokwanhee Oct 28, 2024
c4a6297
[add] TimetableSearchBox 입력창 추가
Jokwanhee Oct 28, 2024
1ecb85a
[add] TimetableBottomSheet UI 구현
Jokwanhee Oct 28, 2024
721e612
[add] TimetableContent UI 구현
Jokwanhee Oct 28, 2024
0e08198
[add] Timetable 시간표 UI 구현
Jokwanhee Oct 28, 2024
ab1c46f
[add] TimetableScreen 추가 및 액티비티 UI 연결
Jokwanhee Oct 28, 2024
8c0b9bb
feature: 이벤트 등록 UI 생성
hsgo2430 Oct 28, 2024
a9b9958
fix: 로그 코드 삭제
hsgo2430 Oct 28, 2024
354379b
fix: 비즈니스 navigation 복구
hsgo2430 Oct 28, 2024
a241e78
fix: 사업자 이미지 업로드 로직 수정
skdud0629 Oct 28, 2024
f804ac0
Merge pull request #439 from BCSDLab/feature/hsgo/create_event
hsgo2430 Oct 29, 2024
9b5299d
Merge remote-tracking branch 'origin/develop' into test
skdud0629 Oct 29, 2024
62ea43a
Merge remote-tracking branch 'origin/develop' into feature/modify-sto…
skdud0629 Oct 29, 2024
66df615
Merge pull request #437 from BCSDLab/fix/hsgo/number_picker_error
hsgo2430 Oct 29, 2024
851f84e
feature: 사장님 앱 강제업데이트 UI 제작
hsgo2430 Oct 29, 2024
f97cf82
fix: 회원가입 약관 동의
skdud0629 Oct 29, 2024
4584400
Merge remote-tracking branch 'origin/develop' into test
skdud0629 Oct 29, 2024
696cfe3
feature: 사장님 앱 강제업데이트 기능 구횬
hsgo2430 Oct 29, 2024
1fb52b3
fix: as -> as?, Dispatchers
ThirFir Oct 29, 2024
e593fa8
[#441] 시간표 중복 ui 추가
nodobi Oct 29, 2024
e7c55af
fix: 디자인 시스템 Bold 적용 안되는 것 수정
nodobi Oct 29, 2024
eda149b
[#441] 색 채운 텍스트 버튼 컴포넌트로 분리
nodobi Oct 29, 2024
1e2587b
fix: ab테스트 변수 변경
skdud0629 Oct 30, 2024
20d115e
fix: 기본 정보 입력 버튼 활성화 로직
skdud0629 Oct 30, 2024
791f762
[add] FloatExtensions 추가
Jokwanhee Oct 30, 2024
30bea7a
[add] 시간표 상단 학기 선택, 다운로드 박스 UI 구현
Jokwanhee Oct 30, 2024
e0bf6a1
[add] TimetableEvent 요일 한국어 추가
Jokwanhee Oct 30, 2024
67f2897
[add] koin 모듈에 core:designsystem 종속성 추가
Jokwanhee Oct 30, 2024
999bd27
[del] TimetableHeader & Sidebar UI 삭제
Jokwanhee Oct 30, 2024
0c94529
[fix] TimetableContent UI 수정
Jokwanhee Oct 30, 2024
0e5fe04
[fix] Timetable UI 수정
Jokwanhee Oct 30, 2024
17b5508
[add] dummy & 수업 dafuleColor 추가
Jokwanhee Oct 30, 2024
6f9a0b6
[add] BottomSheet 구현 코드 추가
Jokwanhee Oct 30, 2024
8c4cfc3
[fix] TimetableScreen 수정
Jokwanhee Oct 30, 2024
fc77714
[add] TimetableActivity KoinTheme & 클릭 콜백 추가
Jokwanhee Oct 30, 2024
3c91ef7
[del] 샘플 파일 삭제
Jokwanhee Oct 30, 2024
80c963b
fix: 뷰모델 리팩토링
hsgo2430 Oct 30, 2024
faec1b7
[#441] HighlightedText 컴포넌트 분리
nodobi Oct 30, 2024
ab15a8d
[#441] 프리뷰 private 로 설정
nodobi Oct 30, 2024
057b8ef
fix: 1차 코멘트
hsgo2430 Oct 30, 2024
b428e40
[fix] LocalConfiguration 사용
Jokwanhee Oct 30, 2024
f29b81b
[add] 키보드 내리기 기능 구현
Jokwanhee Oct 30, 2024
3c3a2fc
Merge pull request #331 from BCSDLab/feature/modify-store-info
skdud0629 Oct 30, 2024
1a53360
Merge branch 'develop' of https://github.com/BCSDLab/KOIN_ANDROID int…
hsgo2430 Oct 30, 2024
6869ad5
Merge pull request #440 from BCSDLab/feature/hsgo/business_force_update
hsgo2430 Oct 30, 2024
3cd1c54
Merge pull request #443 from BCSDLab/feature/timetable_ui_v1
Jokwanhee Oct 30, 2024
9065122
fix: Dispatchers Switching 제거
ThirFir Oct 30, 2024
8211f45
Merge branch 'feature/onboarding' into feature/dining-abtest
ThirFir Oct 30, 2024
f621430
Merge remote-tracking branch 'origin/develop' into feature/onboarding
ThirFir Oct 30, 2024
7861aab
Merge pull request #438 from BCSDLab/feature/onboarding
ThirFir Oct 30, 2024
d1b7291
feat: Bus Feature 모듈 추가
ThirFir Oct 29, 2024
0e83c3e
add: Ripple없는 clickable
ThirFir Oct 29, 2024
b235667
add: 텍스트 칩 컴포넌트
ThirFir Oct 29, 2024
5950fd3
add: 텍스트 칩 그룹 컴포넌트
ThirFir Oct 29, 2024
5b9ef2b
fix: Theme Composition Local 기본값 변경
ThirFir Oct 29, 2024
f07f129
fix: Chip 모양 매개변수화
ThirFir Oct 30, 2024
41a66cc
add: 탭 레이아웃 컴포넌트
ThirFir Oct 30, 2024
b6a6329
add: Filled 버튼 컴포넌트
ThirFir Oct 30, 2024
0e2f181
add: Center 탑바 컴포넌트
ThirFir Oct 30, 2024
0429b95
chore: import 제거
ThirFir Oct 30, 2024
bc6e239
fix: ChipGroup 잘못된 구현 수정
ThirFir Oct 30, 2024
764ae4f
add: 아이콘+텍스트 Row 컴포넌트
ThirFir Oct 30, 2024
af8166e
add: Dining abtest
ThirFir Oct 30, 2024
f11731e
fix: 카카오톡에서 코인으로 바로 이동되지 않던 오류
ThirFir Oct 31, 2024
b27fec1
add: 알림 스위치에 로딩 추가
ThirFir Oct 31, 2024
786d8ac
add: 로깅 추가
ThirFir Oct 31, 2024
c435a75
[fix] TimetableBottomSheet 파일 이동
Jokwanhee Oct 31, 2024
4d1bfb7
[fix] TimetableBottomSheetHeader UI 수정
Jokwanhee Oct 31, 2024
24378e6
[add] TimetableBottomSheet 아이템 패딩 추가
Jokwanhee Oct 31, 2024
43c6146
[add] click listener 연결
Jokwanhee Oct 31, 2024
801d2da
fix: 사장님 앱 로고, 이름
skdud0629 Oct 31, 2024
d3658ef
[add] drawable 리소스 추가
Jokwanhee Oct 31, 2024
7841f76
[add] StableIcon 컴포넌트 추가
Jokwanhee Oct 31, 2024
ed80f7e
[add] TimetableEvent 시간 코드 함수 구현
Jokwanhee Oct 31, 2024
5abafa3
[add] TimetableEvent 테스트 함수 작성
Jokwanhee Oct 31, 2024
32f1774
[add] Lecture description 문구 변경
Jokwanhee Oct 31, 2024
a9d3f55
[fix] LectureBox 컬러 & 폰트 시스템 적용
Jokwanhee Oct 31, 2024
ae712ad
[add] 다운로드 이미지 적용
Jokwanhee Oct 31, 2024
96be91f
[fix] TimetableSearchBox 컬러 & 폰트 시스템 적용
Jokwanhee Oct 31, 2024
0ba5829
[add] 콜백 클릭 리스너 추가
Jokwanhee Oct 31, 2024
978ee56
Merge pull request #446 from BCSDLab/fix/app-name
skdud0629 Oct 31, 2024
baecaa2
[fix] clickable 위치 변경
Jokwanhee Oct 31, 2024
b4b864c
[add] 바텀시트 elevation 추가
Jokwanhee Oct 31, 2024
70a8ffe
[fix] position 위치 변경
Jokwanhee Oct 31, 2024
903fd7a
[add] 버튼 타입 추가
nodobi Oct 31, 2024
393a0ea
Merge pull request #442 from BCSDLab/feature/timetable_duplication_di…
nodobi Oct 31, 2024
8fecd7e
fix: padding -> Spacer
ThirFir Oct 31, 2024
ee10464
fix: Named Parameter
ThirFir Oct 31, 2024
fd6eff3
Merge pull request #445 from BCSDLab/feature/dining-abtest
ThirFir Oct 31, 2024
64c4d02
[add] 강의삭제 다이얼로그 추가
nodobi Oct 31, 2024
0fb0ba8
[add] 일정 삭제 다이얼로그 추가
nodobi Oct 31, 2024
7d72029
Merge pull request #444 from BCSDLab/feature/component
ThirFir Oct 31, 2024
440d0d2
[add] dialog 패키지 생성
nodobi Oct 31, 2024
1b43df9
[add] 로그인 요청 다이얼로그 추가
nodobi Oct 31, 2024
7794ddf
[fix] icon 패키지 생성 및 컴포넌트 이동
Jokwanhee Oct 31, 2024
f1d7027
[add] 학부 선택 라디오 버튼 추가
nodobi Oct 31, 2024
c84fd42
[add] 학부 선택 다이얼로그 추가
nodobi Oct 31, 2024
adea8e8
Merge pull request #447 from BCSDLab/feature/timetable_ui_v2
Jokwanhee Nov 1, 2024
f79ad8c
[add] TimetableActivity 삭제된 코드 복원
Jokwanhee Nov 1, 2024
66367ee
[fix] 함수명 변경
Jokwanhee Nov 1, 2024
b8e763f
Merge pull request #449 from BCSDLab/fix/timetable_v1
Jokwanhee Nov 1, 2024
461c4cf
Merge branch 'develop' into feature/timetable_dialogs
nodobi Nov 1, 2024
3b08409
Merge pull request #448 from BCSDLab/feature/timetable_dialogs
nodobi Nov 1, 2024
d425b3b
[Add] 체크박스 컴포넌트 추가
nodobi Nov 1, 2024
5c79ace
[Add] OutlinedBoxButton 컴포넌트 추가
nodobi Nov 1, 2024
e78390e
[Add] FilledButton 의 색상 타입 추가
nodobi Nov 1, 2024
b2f6805
[Add] ChoiceDialog 컴포넌트 추가
nodobi Nov 1, 2024
59106f4
[Fix] ErrorResponse 에 @SerialName 어노테이션 추가
nodobi Nov 1, 2024
ebef067
Merge pull request #450 from BCSDLab/feature/designsystem_components
nodobi Nov 2, 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
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ buildscript {
extra.apply {
set("versionName", "4.0.4")
set("versionCode", 40004)
// 코인 버전 관리

set("versionBusinessName", "1.0.0")
set("versionBusinessCode", 10000)
//코안 사장님 버전 관리
}

dependencies {
Expand Down
7 changes: 7 additions & 0 deletions business/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ plugins {
android {
namespace = "in.koreatech.business"

defaultConfig {
applicationId = "in.koreatech.business"
versionCode = rootProject.extra["versionBusinessCode"] as Int
versionName = rootProject.extra["versionBusinessName"].toString()
}

androidComponents {
onVariants(selector().withBuildType("release")) {
it.packaging.resources.excludes.add("META-INF/**")
Expand Down Expand Up @@ -41,6 +47,7 @@ dependencies {
implementation(libs.androidx.security.crypto)
implementation(libs.coil)
implementation(libs.coil.compose)
implementation(libs.coil.gif)
implementation(libs.compose.numberPicker)
implementation(libs.androidx.security.crypto)
implementation(libs.compose.numberPicker)
Expand Down
4 changes: 3 additions & 1 deletion business/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<activity
android:name=".main.BusinessMainActivity"
android:exported="true"
android:label="@string/title_activity_business_main"
android:icon="@mipmap/ic_launcher_koin_business"

android:label="@string/business_app_name"
android:theme="@style/Theme.KOIN_ANDROID">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package `in`.koreatech.business.feature

import android.content.ContentResolver
import android.net.Uri
import android.provider.OpenableColumns
import androidx.activity.compose.ManagedActivityResultLauncher
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext


@Composable
fun launchImagePicker(
contentResolver: ContentResolver,
maxItem: Int = 3,
initImageUrls: () -> Unit,
getPreSignedUrl: (Pair<Pair<Long, String>, Pair<String, String>>) -> Unit = {},
clearFileInfo: () -> Unit = {},
): ManagedActivityResultLauncher<PickVisualMediaRequest, List<@JvmSuppressWildcards Uri>> {
val coroutineScope = rememberCoroutineScope()
val galleryLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.PickMultipleVisualMedia(maxItem)
) { uriList ->
clearFileInfo()
initImageUrls()
uriList.forEach {
coroutineScope.launch {
var fileName = ""
var fileSize = 0L
val inputStream = contentResolver.openInputStream(it)
withContext(Dispatchers.IO) {
if (it.scheme.equals("content")) {
val cursor = contentResolver.query(it, null, null, null, null)
cursor.use {
if (cursor != null && cursor.moveToFirst()) {
val fileNameIndex =
cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
val fileSizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)

if (fileNameIndex != -1 && fileSizeIndex != -1) {
fileName = cursor.getString(fileNameIndex)
fileSize = cursor.getLong(fileSizeIndex)
}
}
}
if (inputStream != null) {
getPreSignedUrl(
Pair(
Pair(fileSize, "image/" + fileName.split(".")[1]),
Pair(fileName, it.toString())
)
)
}
inputStream?.close()
}
}
}
}
}
return galleryLauncher
}
Loading
Loading