3 Commits
15 changed files with 223 additions and 212 deletions
BIN
View File
Binary file not shown.
+2 -2
View File
@@ -20,8 +20,8 @@ android {
applicationId = "com.example.shiftalarm"
minSdk = 26
targetSdk = 35
versionCode = 100
versionName = "1.0.0"
versionCode = 103
versionName = "1.0.3"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
-2
View File
@@ -12,8 +12,6 @@
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<!-- Service & Notification -->
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -175,7 +175,9 @@ object AlarmPermissionUtil {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION).apply {
data = Uri.parse("package:${context.packageName}")
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
if (context !is Activity) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(intent)
}
@@ -186,13 +188,17 @@ object AlarmPermissionUtil {
try {
val intent = Intent("android.settings.MANAGE_APP_USE_FULL_SCREEN_INTENT").apply {
data = Uri.parse("package:${context.packageName}")
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
if (context !is Activity) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(intent)
} catch (e: Exception) {
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
data = Uri.parse("package:${context.packageName}")
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
if (context !is Activity) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(intent)
}
@@ -211,7 +217,6 @@ object AlarmPermissionUtil {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager
allGranted = allGranted && pm.isIgnoringBatteryOptimizations(context.packageName)
allGranted = allGranted && Settings.canDrawOverlays(context)
}
if (Build.VERSION.SDK_INT >= 34) {
val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -32,6 +32,19 @@ object AlarmSyncManager {
val alarmId = repo.addCustomAlarm(alarm)
Log.d(TAG, "알람 DB 추가 완료: ID=$alarmId")
// 시스템 알람 볼륨이 0인 경우 최대치로 자동 보정
try {
val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as android.media.AudioManager
val maxVol = audioManager.getStreamMaxVolume(android.media.AudioManager.STREAM_ALARM)
val currVol = audioManager.getStreamVolume(android.media.AudioManager.STREAM_ALARM)
if (currVol == 0) {
audioManager.setStreamVolume(android.media.AudioManager.STREAM_ALARM, maxVol, 0)
Log.d(TAG, "알람 볼륨이 0이어서 최대($maxVol)로 자동 설정")
}
} catch (e: Exception) {
Log.w(TAG, "볼륨 자동 보정 실패", e)
}
// 2. AlarmManager에 예약
val today = LocalDate.now(SEOUL_ZONE)
val customAlarms = repo.getAllCustomAlarms()
@@ -32,6 +32,7 @@ class CalendarAdapter(
class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val root: View = view.findViewById(R.id.dayRoot)
val dayNumber: TextView = view.findViewById(R.id.dayNumber)
val tvShiftSmall: TextView = view.findViewById(R.id.tvShiftSmall)
val shiftChar: TextView = view.findViewById(R.id.shiftChar)
val holidayNameSmall: TextView = view.findViewById(R.id.holidayNameSmall)
val memoIndicator: ImageView = view.findViewById(R.id.memoIndicator)
@@ -71,6 +72,7 @@ class CalendarAdapter(
val isSaturday = item.date.dayOfWeek == java.time.DayOfWeek.SATURDAY
val fullHolidayName = HolidayManager.getHolidayName(item.date)
val isToday = item.date == LocalDate.now()
val hasMemo = item.hasMemo && !item.memoContent.isNullOrEmpty()
// Day Number Color
if (fullHolidayName != null || isSunday) {
@@ -102,82 +104,97 @@ class CalendarAdapter(
// --- Shift & Holiday Display Logic ---
holder.shiftChar.background = null
holder.shiftChar.text = ""
holder.tvShiftSmall.visibility = View.GONE
holder.holidayNameSmall.visibility = View.GONE
holder.shiftChar.textSize = 18f
// "반월", "반년" (Half-Monthly, Half-Yearly) Special Logic
// These are overrides or specific shifts that user sets.
// User requested: "월", "년" text. Half-filled background (Red + Transparent).
// Check exact string or "startswith" if logic changed?
// Logic in adapter `getShift` might return "반월", "반년".
if (showHolidays && fullHolidayName != null) {
// Holiday Mode (Priority): Show full holiday name, no circle
holder.shiftChar.text = fullHolidayName
holder.shiftChar.setTextColor(Color.parseColor("#FF5252"))
holder.shiftChar.textSize = 13f
holder.shiftChar.textSize = 13f
holder.shiftChar.background = null
holder.shiftChar.visibility = View.VISIBLE
} else if (item.shift != null && item.shift != "비번") {
// Shift Mode
val shiftAbbreviation = when (item.shift) {
"주간" -> ""
"석간" -> ""
"야간" -> ""
"주간 맞교대" -> "주맞"
"야간 맞교대" -> "야맞"
"휴무", "휴가" -> ""
"월차" -> ""
"연차" -> ""
"반월" -> ""
"반년" -> ""
"교육" -> ""
else -> item.shift.take(2)
}
// Handle specific "Half" cases first
if (item.shift == "반월" || item.shift == "반년") {
holder.shiftChar.text = if (item.shift == "반월") "" else ""
holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black)) // Black for contrast on Half Red/Transparent
holder.shiftChar.textSize = 18f
holder.shiftChar.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
val shiftColorRes = when (item.shift) {
"주간" -> R.color.shift_lemon
"석간" -> R.color.shift_seok
"야간" -> R.color.shift_ya
"주간 맞교대" -> R.color.shift_jumat
"야간 맞교대" -> R.color.shift_yamat
"휴무", "휴가", "월차", "연차" -> R.color.shift_red
"반월", "반년" -> R.color.shift_red
"교육" -> R.color.primary
else -> R.color.text_secondary
}
val shiftColor = ContextCompat.getColor(context, shiftColorRes)
if (hasMemo) {
// When day has a memo: show small shift badge next to day number, hide large center shift circle
holder.shiftChar.visibility = View.GONE
holder.tvShiftSmall.visibility = View.VISIBLE
holder.tvShiftSmall.text = shiftAbbreviation
val smallBg = ContextCompat.getDrawable(context, R.drawable.bg_shift_stroke_v4) as? android.graphics.drawable.GradientDrawable
smallBg?.mutate()
smallBg?.setStroke(dpToPx(context, 1.2f), shiftColor)
smallBg?.setColor(if (isToday) shiftColor else Color.TRANSPARENT)
holder.tvShiftSmall.background = smallBg
holder.tvShiftSmall.setTextColor(if (isToday && (item.shift == "야간" || item.shift == "교육")) Color.WHITE else shiftColor)
} else {
// Standard Logic
val shiftAbbreviation = when (item.shift) {
"주간" -> ""
"석간" -> ""
"야간" -> ""
"주간 맞교대" -> "주맞"
"야간 맞교대" -> "야맞"
"휴무", "휴가" -> ""
"월차" -> ""
"연차" -> ""
"교육" -> ""
else -> item.shift.take(1)
}
holder.shiftChar.text = shiftAbbreviation
holder.shiftChar.textSize = 20f
holder.shiftChar.setTypeface(null, android.graphics.Typeface.BOLD)
// When day has NO memo: standard large centered shift circle
holder.shiftChar.visibility = View.VISIBLE
holder.tvShiftSmall.visibility = View.GONE
val shiftColorRes = when (item.shift) {
"주간" -> R.color.shift_lemon
"석간" -> R.color.shift_seok
"야간" -> R.color.shift_ya
"주간 맞교대" -> R.color.shift_jumat
"야간 맞교대" -> R.color.shift_yamat
"휴무", "휴가", "월차", "연차" -> R.color.shift_red
"교육" -> R.color.primary
else -> R.color.text_secondary
}
val shiftColor = ContextCompat.getColor(context, shiftColorRes)
if (isToday) {
// Today: Solid Circle
val background = ContextCompat.getDrawable(context, R.drawable.bg_shift_solid_v4) as? android.graphics.drawable.GradientDrawable
background?.setColor(shiftColor)
holder.shiftChar.background = background
holder.shiftChar.backgroundTintList = null
if (item.shift == "주간" || item.shift == "석간") {
holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black))
} else {
holder.shiftChar.setTextColor(Color.WHITE)
}
if (item.shift == "반월" || item.shift == "반년") {
holder.shiftChar.text = if (item.shift == "반월") "" else ""
holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black))
holder.shiftChar.textSize = 18f
holder.shiftChar.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
} else {
// Not Today: Stroke Circle
val background = ContextCompat.getDrawable(context, R.drawable.bg_shift_stroke_v4) as? android.graphics.drawable.GradientDrawable
background?.setStroke(dpToPx(context, 1.5f), shiftColor)
background?.setColor(Color.TRANSPARENT)
holder.shiftChar.text = shiftAbbreviation
holder.shiftChar.textSize = 20f
holder.shiftChar.setTypeface(null, android.graphics.Typeface.BOLD)
holder.shiftChar.background = background
holder.shiftChar.backgroundTintList = null
if (isToday) {
// Today: Solid Circle
val background = ContextCompat.getDrawable(context, R.drawable.bg_shift_solid_v4) as? android.graphics.drawable.GradientDrawable
background?.setColor(shiftColor)
holder.shiftChar.background = background
holder.shiftChar.backgroundTintList = null
holder.shiftChar.setTextColor(shiftColor)
if (item.shift == "주간" || item.shift == "석간") {
holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black))
} else {
holder.shiftChar.setTextColor(Color.WHITE)
}
} else {
// Not Today: Stroke Circle
val background = ContextCompat.getDrawable(context, R.drawable.bg_shift_stroke_v4) as? android.graphics.drawable.GradientDrawable
background?.setStroke(dpToPx(context, 1.5f), shiftColor)
background?.setColor(Color.TRANSPARENT)
holder.shiftChar.background = background
holder.shiftChar.backgroundTintList = null
holder.shiftChar.setTextColor(shiftColor)
}
}
}
}
@@ -187,41 +204,25 @@ class CalendarAdapter(
holder.holidayNameSmall.visibility = View.VISIBLE
holder.holidayNameSmall.text = fullHolidayName
} else {
// Ensure visibility GONE if not needed (e.g. standard day)
holder.holidayNameSmall.visibility = View.GONE
holder.holidayNameSmall.visibility = View.GONE
}
// Double check: if showHolidays=true (Holiday mode), we handled it at top block.
// But if showHolidays=true and NO holiday, we show lunar date?
// User asked: "Overlap date and holiday text".
// My item_day.xml has holidayNameSmall at bottom now.
// If showHolidays=true, CalendarAdapter usually HIDES shiftChar and shows Holiday Name?
// Wait, standard logic (lines 84-91 above):
// If showHolidays && fullHolidayName != null -> shiftChar shows Name.
// If showHolidays && fullHolidayName == null -> shiftChar shows LUNAR DATE? (Old logic had this).
if (showHolidays && fullHolidayName == null) {
// Show Lunar Date in shiftChar instead of empty?
// Or shiftChar is empty, show small text?
// Previous code:
// holder.shiftChar.text = ""
// holder.holidayNameSmall.visibility = View.VISIBLE
// holder.holidayNameSmall.text = HolidayManager.getLunarDateString(item.date)
holder.shiftChar.text = HolidayManager.getLunarDateString(item.date)
holder.shiftChar.textSize = 13f
holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
holder.shiftChar.background = null
holder.shiftChar.visibility = View.VISIBLE
}
// Memo Indicator
holder.memoIndicator.visibility = View.GONE // Hide indicator, showing text instead
if (item.hasMemo && !item.memoContent.isNullOrEmpty()) {
// Memo Content Text (Up to 4 lines in center of day cell)
if (hasMemo) {
holder.memoContent.visibility = View.VISIBLE
holder.memoContent.text = item.memoContent
holder.memoIndicator.visibility = View.VISIBLE
} else {
holder.memoContent.visibility = View.GONE
holder.memoIndicator.visibility = View.GONE
}
// Today Border or Highlight
@@ -247,16 +247,31 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
visibility = if (isCollapsed) View.GONE else View.VISIBLE
}
// Click header to collapse/expand
// Click header to collapse/expand with smooth accordion animation
headerView.setOnClickListener {
if (collapsedGroups.contains(category)) {
val willExpand = collapsedGroups.contains(category)
// 1. Smooth accordion expand/collapse transition
val transition = android.transition.AutoTransition().apply {
duration = 250
interpolator = android.view.animation.AccelerateDecelerateInterpolator()
}
android.transition.TransitionManager.beginDelayedTransition(container, transition)
// 2. Smooth rotation between '+' (0 deg) and 'x' (45 deg)
val targetRotation = if (willExpand) 45f else 0f
ivExpand.animate()
.rotation(targetRotation)
.setDuration(250)
.setInterpolator(androidx.core.view.animation.PathInterpolatorCompat.create(0.22f, 1.0f, 0.36f, 1.0f))
.start()
if (willExpand) {
collapsedGroups.remove(category)
childrenContainer.visibility = View.VISIBLE
ivExpand.rotation = 45f
} else {
collapsedGroups.add(category)
childrenContainer.visibility = View.GONE
ivExpand.rotation = 0f
}
}
@@ -461,7 +476,18 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
Log.w("ShiftAlarm", "soundUri가 비어있어 기본값으로 재설정: $currentDialogSoundUri")
}
Log.d("ShiftAlarm", "알람 ${if (isNew) "생성" else "수정"} - 최종 soundUri: $currentDialogSoundUri")
// 새 알람 추가 시 또는 볼륨이 0인 경우 시스템 알람 스트림 볼륨을 최대치로 설정
try {
val audioManager = requireContext().getSystemService(Context.AUDIO_SERVICE) as android.media.AudioManager
val maxVol = audioManager.getStreamMaxVolume(android.media.AudioManager.STREAM_ALARM)
val currVol = audioManager.getStreamVolume(android.media.AudioManager.STREAM_ALARM)
if (isNew || currVol == 0) {
audioManager.setStreamVolume(android.media.AudioManager.STREAM_ALARM, maxVol, 0)
Log.d("ShiftAlarm", "알람 스트림 볼륨 최대치($maxVol)로 초기화 완료")
}
} catch (e: Exception) {
Log.w("ShiftAlarm", "알람 볼륨 설정 실패", e)
}
fun updateSoundName(uriStr: String?) {
if (uriStr.isNullOrEmpty() || uriStr == "null") {
@@ -511,6 +537,13 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
btn.setTextColor(if (isSelected) ContextCompat.getColor(requireContext(), R.color.white) else ContextCompat.getColor(requireContext(), R.color.text_secondary))
}
}
updateRepeatUI()
repeatButtons.forEachIndexed { i, btn ->
btn.setOnClickListener {
selectedRepeat = repeatValues[i]
updateRepeatUI()
}
}
// Pre-Alarm Buttons
var selectedPreAlarm = 15
val preAlarmButtons = listOf(
@@ -214,10 +214,8 @@ class FragmentSettingsBasic : Fragment() {
binding.dividerExact.visibility = View.GONE
}
// 3. 다른 앱 위에 표시 (Overlay)
val isOverlayGranted = AlarmPermissionUtil.getOverlayStatus(context)
binding.tvOverlayStatus.text = if (isOverlayGranted) "[설정 완료: 화면 우위]" else "필수: 알람창 노출을 위해 허용하세요"
binding.tvOverlayStatus.setTextColor(ContextCompat.getColor(context, if (isOverlayGranted) R.color.primary else R.color.shift_red))
// 3. 다른 앱 위에 표시 (Overlay - 레거시)
binding.btnOverlayPermission.visibility = View.GONE
// 4. 전체화면 알림 (Full Screen Intent) - Android 14+
if (Build.VERSION.SDK_INT >= 34) {
@@ -68,7 +68,6 @@ class MainActivity : AppCompatActivity() {
setupWorker()
setupSwipeGesture()
AppUpdateManager.checkUpdate(this, silent = true)
checkRoot()
val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
currentViewTeam = prefs.getString(KEY_TEAM, "A") ?: "A"
@@ -717,11 +716,6 @@ class MainActivity : AppCompatActivity() {
return java.time.Duration.between(now, midnight).toMillis()
}
private fun checkRoot() {
if (RootUtil.isDeviceRooted()) {
Toast.makeText(this, "⚠️ 루팅된 기기에서 시각적 오류나 알람 불안정이 발생할 수 있습니다.", Toast.LENGTH_LONG).show()
}
}
private fun animateMonthTransition(direction: Int) {
val card = binding.calendarCard
val width = card.width.toFloat()
@@ -1,46 +1,5 @@
package com.example.shiftalarm
import java.io.File
object RootUtil {
fun isDeviceRooted(): Boolean {
return checkRootMethod1() || checkRootMethod2() || checkRootMethod3()
}
private fun checkRootMethod1(): Boolean {
val buildTags = android.os.Build.TAGS
return buildTags != null && buildTags.contains("test-keys")
}
private fun checkRootMethod2(): Boolean {
val paths = arrayOf(
"/system/app/Superuser.apk",
"/sbin/su",
"/system/bin/su",
"/system/xbin/su",
"/data/local/xbin/su",
"/data/local/bin/su",
"/system/sd/xbin/su",
"/system/bin/failsafe/su",
"/data/local/su",
"/su/bin/su"
)
for (path in paths) {
if (File(path).exists()) return true
}
return false
}
private fun checkRootMethod3(): Boolean {
var process: Process? = null
return try {
process = Runtime.getRuntime().exec(arrayOf("/system/xbin/which", "su"))
val reader = process.inputStream.bufferedReader()
reader.readLine() != null
} catch (t: Throwable) {
false
} finally {
process?.destroy()
}
}
fun isDeviceRooted(): Boolean = false
}
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#20FF3B30" />
<solid android:color="#205856D6" />
<corners android:radius="12dp" />
<stroke
android:width="0.5dp"
android:color="#40FF3B30" />
android:color="#405856D6" />
</shape>
+1 -1
View File
@@ -269,7 +269,7 @@
android:textSize="10.5sp"
android:textStyle="bold"
android:gravity="center"
android:textColor="@color/shift_red"
android:textColor="#5856D6"
android:background="@drawable/bg_chip_soft_overtime"/>
</LinearLayout>
+51 -27
View File
@@ -7,19 +7,43 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_grid_cell_v4">
<!-- Day Number (top-left) -->
<TextView
android:id="@+id/dayNumber"
<!-- Top Row: Day Number & Small Shift Badge (shown when memo exists) -->
<LinearLayout
android:id="@+id/topBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:text="12"
android:textColor="@color/text_primary"
android:textSize="14sp"
android:textStyle="bold"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/dayNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="12"
android:textColor="@color/text_primary"
android:textSize="13sp"
android:textStyle="bold" />
<!-- Small Shift Badge next to Day Number (shown when day has memo) -->
<TextView
android:id="@+id/tvShiftSmall"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:minWidth="16dp"
android:layout_marginStart="4dp"
android:gravity="center"
android:text="주"
android:textSize="9.5sp"
android:textStyle="bold"
android:textColor="@color/text_primary"
android:background="@drawable/bg_shift_stroke_v4"
android:paddingHorizontal="3dp"
android:visibility="gone"/>
</LinearLayout>
<!-- Tide Text (top-right) -->
<TextView
@@ -27,7 +51,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
android:layout_marginTop="2dp"
android:text="08:20"
android:textColor="@color/text_tertiary"
android:textSize="9sp"
@@ -35,15 +59,14 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- Shift Abbreviation Circular Indicator (Center) -->
<!-- Standard Shift Abbreviation Circular Indicator (Center - shown when NO memo) -->
<TextView
android:id="@+id/shiftChar"
android:layout_width="48dp"
android:layout_height="48dp"
android:gravity="center"
android:text="주"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@color/text_primary"
app:layout_constraintTop_toTopOf="parent"
@@ -52,25 +75,26 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0.45"/>
<!-- Memo Content Text (Below Shift) - Max 3 lines -->
<!-- Memo Content Text (Center/Body) - Up to 4 lines when memo exists -->
<TextView
android:id="@+id/memoContent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:gravity="center"
android:text="메모내용"
android:text="메모내용\n2줄\n3줄\n4줄"
android:textSize="9.5sp"
android:textColor="@color/secondary"
android:maxLines="3"
android:lineSpacingMultiplier="1.05"
android:maxLines="4"
android:ellipsize="end"
android:visibility="gone"
android:layout_marginHorizontal="2dp"
android:layout_marginTop="1dp"
android:layout_marginBottom="1dp"
android:paddingHorizontal="2dp"
app:layout_constraintTop_toBottomOf="@id/shiftChar"
app:layout_constraintTop_toBottomOf="@id/topBar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/memoIndicator"/>
app:layout_constraintEnd_toEndOf="parent"/>
<!-- Holiday Name Small (Bottom) -->
<TextView
@@ -80,19 +104,19 @@
android:text="설날"
android:textSize="9sp"
android:textColor="@color/shift_red"
android:layout_marginBottom="2dp"
android:layout_marginBottom="1dp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/memoIndicator"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<!-- Memo Indicator (bottom-right) -->
<ImageView
android:id="@+id/memoIndicator"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="2dp"
android:layout_marginBottom="2dp"
android:src="@drawable/ic_memo"
app:tint="@color/secondary"
android:visibility="gone"
+14 -28
View File
@@ -6,32 +6,18 @@ import shutil
token = "e3b515eaa0a6683c921ca3bf718e281ed30a6075"
owner_repo = "sanjeok77/ShiftRing"
tag = "v1.0.0"
title = "v1.0.0 - ShiftRing 정식 첫 릴리즈"
body = """## 🚀 ShiftRing v1.0.0 정식 첫 릴리즈
tag = "v1.0.3"
title = "v1.0.3 - 하루 메모 4줄 확장 & 날짜 옆 근무 뱃지 배치 및 알람 추가 시 볼륨 최대치 보정"
body = """## 🚀 ShiftRing v1.0.3 릴리즈
현대자동차 / 다양한 교대근무자를 위한 스마트 교대근무 캘린더 & 맞춤 알람 솔루션
### 🌟 주요 기능 및 탑재 사항
1. **One UI 8.5 라운드 카드 디자인 시스템**:
- 24dp 라운드 카드, 36dp 스퀘어클 Soft-tint 아이콘 시스템
- 20dp 라운드 팝업창 및 12dp 알약 선택자 One UI 드롭다운(Spinner) 전면 통일
2. **대한민국 법정 대체공휴일 100% 정밀 수식**:
- 대통령령 관공서 공휴일 개정안 정밀 적용 (현충일/신정 제외, 주요 공휴일 및 설날/추석 대체공휴일 연동)
3. **이달의 누적 연장근무 복합 정산**:
- 토요일 기본 특근(2h) + 주맞(4h) + 야맞(4h) + 교육(2h) 자동 누적 합산
4. **알람 하이브리드 그룹화 & 순서 자동 정렬**:
- `주간(주) -> 석간(석) -> 야간(야) -> 주간 맞교대(주맞) -> 야간 맞교대(야맞) -> 기타` 고정 정렬
- 그룹 마스터 On/Off 스위치 및 아코디언 접기/펼치기
- 6개 근무 선택(주/석/야/주맞/야맞/기타), 알람 라벨 및 15분전 사전 알림 지원
5. **삼성 캘린더 동일 수평 유체 슬라이드 모션 & 요약 칩 바**:
- 삼성 One UI 8.5 캘린더 동일 전체 폭 수평 슬라이드 애니메이션 (`PathInterpolator(0.22, 1, 0.36, 1)`)
- 실시간 요약 칩 바 (`주간 N일 | 석간 N일 | 야간 N일 | 연장 N시간`)
- 하루 메모 3줄 직관 표시 및 달력 5줄 고정 / 6줄 스크롤 최적화
- 상단 알람 시간 단일행 간결 표시 (`오늘: 07:00 | 내일: 15:00`)
6. **배터리 최적화 4-Tier 다중 폴백 & One UI 업데이트 다이얼로그**:
- Samsung Device Care 연동 및 부드러운 프로그레스 애니메이션
7. **Android 14/15 호환 및 정식 서명키(release.jks) 적용**"""
### 🌟 주요 변경 및 개선 사항
1. **하루 메모 4줄 확장 및 날짜 옆 근무 뱃지 직관 배치**:
- 메모가 작성된 날짜의 경우 기존 중앙 큰 동그라미 대신 **날짜 숫자 바로 옆에 미니멀한 근무 뱃지(주/석/야/휴 등)**를 컴팩트하게 표시
- 달력 셀 중앙 영역을 메모 텍스트에 온전히 할애하여 **최대 4줄까지 메모 내용이 깔끔하게 표시**되도록 가독성 대폭 향상
- 메모가 없는 날짜는 기존대로 중앙에 크고 또렷한 20sp 근무 원형 표시 유지
2. **알람 추가 시 시스템 알람 스트림 볼륨 최대치 자동 보정**:
- 새 알람 추가 또는 알람 스트림 볼륨이 0(무음)으로 되어 있는 경우, 시스템 알람 볼륨(`STREAM_ALARM`)을 자동으로 최대치로 설정하여 소리가 안 나는 현상 방지
3. **Android 14/15 호환 및 정식 서명키(release.jks) 적용**"""
apk_path = "app/build/outputs/apk/release/app-release.apk"
if not os.path.exists(apk_path):
@@ -69,10 +55,10 @@ print("Updated app.apk at project root.")
# Update version.json
v_info = {
"versionCode": 100,
"versionName": "1.0.0",
"versionCode": 103,
"versionName": "1.0.3",
"apkUrl": direct_url,
"changelog": "v1.0.0: ShiftRing 정식 첫 릴리즈 - One UI 8.5 디자인 시스템, 교대근무 캘린더, 맞춤 알람 및 법정 공휴일/연장근무 자동 계산",
"changelog": "v1.0.3: 하루 메모 4줄 확장 & 날짜 옆 근무 뱃지 배치, 알람 추가 시 볼륨 최대치 자동 보정",
"forceUpdate": False
}
with open("version.json", "w", encoding="utf-8") as f:
+4 -4
View File
@@ -1,7 +1,7 @@
{
"versionCode": 100,
"versionName": "1.0.0",
"apkUrl": "https://git.webpluss.net/attachments/b1ec7eac-997c-4a33-bbb5-91a0f11ce9cf",
"changelog": "v1.0.0: ShiftRing 정식 첫 릴리즈 - One UI 8.5 디자인 시스템, 교대근무 캘린더, 맞춤 알람 및 법정 공휴일/연장근무 자동 계산",
"versionCode": 103,
"versionName": "1.0.3",
"apkUrl": "https://git.webpluss.net/attachments/90c3757b-d618-47a2-9071-260769fae8e7",
"changelog": "v1.0.3: 하루 메모 4줄 확장 & 날짜 옆 근무 뱃지 배치, 알람 추가 시 볼륨 최대치 자동 보정",
"forceUpdate": false
}