sanjeok77/ShiftRing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 19 Wiki Activity

v1.1.5 - 근무 변경 모달 팝업 버튼 겹침 현상 완벽 수정 및 업데이트 정보 자동 기입 동기화

Browse Source
This commit is contained in:
sanjeok77
2026-08-14 11:01:19 +09:00
parent a00f009b44
commit 77eea9cf11
7 changed files with 156 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
+2 -2
View File
@@ -20,8 +20,8 @@ android {
applicationId = "com.example.shiftalarm"
minSdk = 26
targetSdk = 35
versionCode = 114
versionName = "1.1.4"
versionCode = 115
versionName = "1.1.5"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
app/src/main/assets/CHANGELOG.md
+10
View File
@@ -1,5 +1,15 @@
# Changelog
## [1.1.5] - 2026-08-14
### Fixed
- **근무 변경 모달 팝업 버튼 겹침 현상 완벽 수정**: ConstraintLayout Flow 충돌을 제거하고 3행 리니어 그리드로 전면 개편하여 모든 버튼이 겹침 없이 정렬되도록 수정
- **업데이트 정보 자동 기입 및 실시간 동기화 완전 자동화**: 릴리즈 시 체인지로그 및 원격 동기화가 누락 없이 자동 기입되도록 시스템 고도화
## [1.1.4] - 2026-08-14
### Added
- **기기 사용 중 전체화면 알람 팝업 보장**: SYSTEM_ALERT_WINDOW 및 백그라운드 액티비티 시작 모드 적용으로 사용 중에도 전체화면 알람창 즉시 표시
- **설정 화면 상단 닫기(X) 아이콘 배치**: 하단 고정 닫기 바를 제거하고 상단에 배치하여 탭 전체 화면 공간 극대화
## [1.1.3] - 2026-08-14
### Added
- **하루 메모 저장/삭제 아이콘 원형 컨테이너 적용**: 설정 스타일의 블루(저장) / 레드(삭제) 아이콘 컨테이너로 통일하여 세련된 디자인 제공
app/src/main/java/com/example/shiftalarm/NoticeActivity.kt
+1 -1
View File
@@ -132,6 +132,6 @@ class NoticeActivity : AppCompatActivity() {
notices.add(NoticeItem("v$currentVersion 업데이트 정보", currentDate, currentBody.toString().trim()))
}
return notices.take(7)
return notices.take(15)
}
}
app/src/main/res/layout/dialog_day_settings.xml
+128 -51
View File
@@ -49,62 +49,139 @@
android:letterSpacing="-0.02"/>
</LinearLayout>
<!-- 5-Column Grid Refactored -->
<androidx.constraintlayout.widget.ConstraintLayout
<!-- 3-Row Clean Shift Buttons Grid (Zero Overlap Guaranteed) -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- Row 1 -->
<TextView android:id="@+id/btnJu" style="@style/ShiftCircleButton" android:text="주" android:textColor="@color/shift_ju"/>
<TextView android:id="@+id/btnSeok" style="@style/ShiftCircleButton" android:text="석" android:textColor="@color/shift_seok"/>
<TextView android:id="@+id/btnYa" style="@style/ShiftCircleButton" android:text="야" android:textColor="@color/shift_ya"/>
<TextView android:id="@+id/btnJuMat" style="@style/ShiftCircleButton" android:text="주맞" android:textSize="13sp" android:textColor="@color/shift_jumat"/>
<TextView android:id="@+id/btnYaMat" style="@style/ShiftCircleButton" android:text="야맞" android:textSize="13sp" android:textColor="@color/shift_yamat"/>
<!-- Row 2 -->
<TextView android:id="@+id/btnOff" style="@style/ShiftCircleButton" android:text="휴" android:textColor="@color/shift_off"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView android:id="@+id/btnWolcha" style="@style/ShiftCircleButton" android:text="월차" android:textSize="13sp" android:textColor="@color/secondary"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView android:id="@+id/btnYeoncha" style="@style/ShiftCircleButton" android:text="연차" android:textSize="13sp" android:textColor="@color/secondary"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView android:id="@+id/btnBanwol" style="@style/ShiftCircleButton" android:text="반월" android:textSize="13sp" android:textColor="@color/shift_red"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView android:id="@+id/btnBannyeon" style="@style/ShiftCircleButton" android:text="반년" android:textSize="13sp" android:textColor="@color/shift_red"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<!-- Row 3 -->
<TextView android:id="@+id/btnEdu" style="@style/ShiftCircleButton" android:text="교육" android:textSize="13sp" android:textColor="@color/primary"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView android:id="@+id/btnReset" style="@style/ShiftCircleButton" android:text="초기" android:textSize="13sp" android:textColor="@color/text_secondary"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView android:id="@+id/btnManual" style="@style/ShiftCircleButton" android:text="직접" android:textSize="14sp" android:textColor="@color/shift_gray"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/gridFlow"
<!-- Row 1: 주, 석, 야, 주맞, 야맞 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:constraint_referenced_ids="btnJu,btnSeok,btnYa,btnJuMat,btnYaMat, btnOff,btnWolcha,btnYeoncha,btnBanwol,btnBannyeon, btnEdu,btnReset,btnManual"
app:flow_wrapMode="aligned"
app:flow_maxElementsWrap="5"
app:flow_horizontalStyle="packed"
app:flow_horizontalGap="8dp"
app:flow_verticalGap="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
android:orientation="horizontal"
android:gravity="center"
android:layout_marginBottom="10dp">
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/btnJu"
style="@style/ShiftCircleButton"
android:text="주"
android:textColor="@color/shift_ju"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnSeok"
style="@style/ShiftCircleButton"
android:text="석"
android:textColor="@color/shift_seok"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnYa"
style="@style/ShiftCircleButton"
android:text="야"
android:textColor="@color/shift_ya"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnJuMat"
style="@style/ShiftCircleButton"
android:text="주맞"
android:textSize="13sp"
android:textColor="@color/shift_jumat"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnYaMat"
style="@style/ShiftCircleButton"
android:text="야맞"
android:textSize="13sp"
android:textColor="@color/shift_yamat"
android:layout_marginHorizontal="5dp"/>
</LinearLayout>
<!-- Row 2: 휴, 월차, 연차, 반월, 반년 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:layout_marginBottom="10dp">
<TextView
android:id="@+id/btnOff"
style="@style/ShiftCircleButton"
android:text="휴"
android:textColor="@color/shift_off"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnWolcha"
style="@style/ShiftCircleButton"
android:text="월차"
android:textSize="13sp"
android:textColor="@color/secondary"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnYeoncha"
style="@style/ShiftCircleButton"
android:text="연차"
android:textSize="13sp"
android:textColor="@color/secondary"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnBanwol"
style="@style/ShiftCircleButton"
android:text="반월"
android:textSize="13sp"
android:textColor="@color/shift_red"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnBannyeon"
style="@style/ShiftCircleButton"
android:text="반년"
android:textSize="13sp"
android:textColor="@color/shift_red"
android:layout_marginHorizontal="5dp"/>
</LinearLayout>
<!-- Row 3: 교육, 원래대로(초기), 직접 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center">
<TextView
android:id="@+id/btnEdu"
style="@style/ShiftCircleButton"
android:text="교육"
android:textSize="13sp"
android:textColor="@color/primary"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnReset"
style="@style/ShiftCircleButton"
android:text="초기"
android:textSize="13sp"
android:textColor="@color/text_secondary"
android:layout_marginHorizontal="5dp"/>
<TextView
android:id="@+id/btnManual"
style="@style/ShiftCircleButton"
android:text="직접"
android:textSize="13sp"
android:textColor="@color/shift_gray"
android:layout_marginHorizontal="5dp"/>
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/memoDivider"