Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ccbd943c56 | |||
| 761e02fd94 | |||
| eda76a0ef6 | |||
| 8a2dacb104 | |||
| 2f4b2ebe4c | |||
| 89068b4d05 | |||
| 7835d0ab65 | |||
| 819495323e | |||
| 5a0f6de646 | |||
| f884e991a3 | |||
| b8454f76d1 | |||
| a4482f0b7b |
@@ -16,18 +16,15 @@ android {
|
||||
namespace = "com.example.shiftalarm"
|
||||
compileSdk = 35
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.example.shiftalarm"
|
||||
minSdk = 26
|
||||
targetSdk = 35
|
||||
versionCode = 1140
|
||||
versionName = "1.4.0"
|
||||
versionName = "1.3.0"
|
||||
defaultConfig {
|
||||
applicationId = "com.example.shiftalarm"
|
||||
minSdk = 26
|
||||
targetSdk = 35
|
||||
versionCode = 1143
|
||||
versionName = "1.4.3"
|
||||
|
||||
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
create("release") {
|
||||
|
||||
@@ -16,6 +16,47 @@ import java.util.concurrent.TimeUnit
|
||||
val SEOUL_ZONE: ZoneId = ZoneId.of("Asia/Seoul")
|
||||
const val TAG = "ShiftAlarm"
|
||||
|
||||
/**
|
||||
* 다크모드 지원 커스텀 토스트 표시
|
||||
*/
|
||||
fun showCustomToast(context: Context, message: String, duration: Int = android.widget.Toast.LENGTH_SHORT) {
|
||||
try {
|
||||
val inflater = android.view.LayoutInflater.from(context)
|
||||
val layout = inflater.inflate(R.layout.custom_toast, null)
|
||||
val textView = layout.findViewById<android.widget.TextView>(R.id.toastText)
|
||||
textView.text = message
|
||||
|
||||
val toast = android.widget.Toast(context)
|
||||
toast.duration = duration
|
||||
toast.view = layout
|
||||
toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 150)
|
||||
toast.show()
|
||||
} catch (e: Exception) {
|
||||
// Fallback to default toast if custom toast fails
|
||||
android.widget.Toast.makeText(context, message, duration).show()
|
||||
}
|
||||
}
|
||||
* 다크모드 지원 커스텀 토스트 표시
|
||||
*/
|
||||
fun showCustomToast(context: Context, message: String, duration: Int = android.widget.Toast.LENGTH_SHORT) {
|
||||
try {
|
||||
// Use application context with theme for proper dark mode support
|
||||
val themedContext = android.view.ContextThemeWrapper(context.applicationContext, R.style.Theme_ShiftAlarm)
|
||||
val inflater = android.view.LayoutInflater.from(themedContext)
|
||||
val layout = inflater.inflate(R.layout.custom_toast, null)
|
||||
val textView = layout.findViewById<android.widget.TextView>(R.id.toastText)
|
||||
textView.text = message
|
||||
|
||||
val toast = android.widget.Toast(context.applicationContext)
|
||||
toast.duration = duration
|
||||
toast.view = layout
|
||||
toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 100)
|
||||
toast.show()
|
||||
} catch (e: Exception) {
|
||||
// Fallback to default toast if custom toast fails
|
||||
android.widget.Toast.makeText(context, message, duration).show()
|
||||
}
|
||||
}
|
||||
// ============================================
|
||||
// 알람 ID 생성
|
||||
// ============================================
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
package com.example.shiftalarm
|
||||
|
||||
import android.content.Context
|
||||
import androidx.room.*
|
||||
import androidx.room.Database
|
||||
import androidx.room.Room
|
||||
import androidx.room.RoomDatabase
|
||||
import androidx.room.migration.Migration
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
|
||||
@Database(entities = [ShiftOverride::class, DailyMemo::class, CustomAlarm::class, AnnualLeave::class], version = 4, exportSchema = false)
|
||||
abstract class AppDatabase : RoomDatabase() {
|
||||
@@ -11,6 +15,23 @@ abstract class AppDatabase : RoomDatabase() {
|
||||
@Volatile
|
||||
private var INSTANCE: AppDatabase? = null
|
||||
|
||||
// Migration from version 3 to 4: Add AnnualLeave table
|
||||
private val MIGRATION_3_4 = object : Migration(3, 4) {
|
||||
override fun migrate(database: SupportSQLiteDatabase) {
|
||||
// Create AnnualLeave table
|
||||
database.execSQL(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS annual_leave (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
totalDays REAL NOT NULL,
|
||||
remainingDays REAL NOT NULL,
|
||||
updatedAt INTEGER NOT NULL
|
||||
)
|
||||
""".trimIndent()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun getDatabase(context: Context): AppDatabase {
|
||||
return INSTANCE ?: synchronized(this) {
|
||||
val instance = Room.databaseBuilder(
|
||||
@@ -18,7 +39,7 @@ abstract class AppDatabase : RoomDatabase() {
|
||||
AppDatabase::class.java,
|
||||
"shift_database"
|
||||
)
|
||||
.fallbackToDestructiveMigration() // Simple for now
|
||||
.addMigrations(MIGRATION_3_4)
|
||||
.build()
|
||||
INSTANCE = instance
|
||||
instance
|
||||
|
||||
@@ -13,10 +13,10 @@ import androidx.recyclerview.widget.RecyclerView
|
||||
import java.time.LocalDate
|
||||
|
||||
data class DayShift(
|
||||
val date: LocalDate?,
|
||||
val shift: String?,
|
||||
val hasMemo: Boolean = false,
|
||||
val memoContent: String? = null
|
||||
val date: LocalDate?,
|
||||
val shift: String?,
|
||||
val hasMemo: Boolean = false,
|
||||
val memoContent: String? = null
|
||||
)
|
||||
|
||||
class CalendarAdapter(
|
||||
@@ -24,7 +24,6 @@ class CalendarAdapter(
|
||||
private val listener: OnDayClickListener,
|
||||
var showHolidays: Boolean = true
|
||||
) : RecyclerView.Adapter<CalendarAdapter.ViewHolder>() {
|
||||
|
||||
interface OnDayClickListener {
|
||||
fun onDayClick(date: LocalDate, currentShift: String)
|
||||
}
|
||||
@@ -61,7 +60,6 @@ class CalendarAdapter(
|
||||
|
||||
// Day Number
|
||||
holder.dayNumber.text = item.date.dayOfMonth.toString()
|
||||
|
||||
// Holiday / Weekend logic
|
||||
val isSunday = item.date.dayOfWeek == java.time.DayOfWeek.SUNDAY
|
||||
val isSaturday = item.date.dayOfWeek == java.time.DayOfWeek.SATURDAY
|
||||
|
||||
@@ -93,6 +93,7 @@ class FragmentSettingsAdditional : Fragment() {
|
||||
|
||||
// Tide Switch
|
||||
binding.switchTide.isChecked = prefs.getBoolean("show_tide", false)
|
||||
loadAppVersion()
|
||||
}
|
||||
|
||||
private fun setupListeners() {
|
||||
@@ -211,6 +212,18 @@ class FragmentSettingsAdditional : Fragment() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private fun loadAppVersion() {
|
||||
try {
|
||||
val packageInfo = requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
|
||||
val versionName = packageInfo.versionName
|
||||
binding.tvAppVersion.text = "버전 $versionName"
|
||||
} catch (e: Exception) {
|
||||
binding.tvAppVersion.text = "버전 1.4.0"
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDestroyView() {
|
||||
super.onDestroyView()
|
||||
_binding = null
|
||||
|
||||
@@ -55,23 +55,23 @@ class FragmentSettingsLab : Fragment() {
|
||||
}
|
||||
}
|
||||
|
||||
private fun setupSaveButton() {
|
||||
binding.btnSaveAnnualLeave.setOnClickListener {
|
||||
val totalDays = binding.npTotalDays.value.toFloat()
|
||||
private fun setupSaveButton() {
|
||||
binding.btnSaveAnnualLeave.setOnClickListener {
|
||||
val totalDays = binding.npTotalDays.value.toFloat()
|
||||
|
||||
lifecycleScope.launch {
|
||||
val repo = ShiftRepository(requireContext())
|
||||
lifecycleScope.launch {
|
||||
val repo = ShiftRepository(requireContext())
|
||||
|
||||
repo.recalculateAndSaveAnnualLeave(totalDays)
|
||||
repo.recalculateAndSaveAnnualLeave(totalDays)
|
||||
|
||||
val updated = repo.getAnnualLeave()
|
||||
updated?.let {
|
||||
binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
|
||||
Toast.makeText(requireContext(), "연차가 저장되었습니다. (남은 연차: ${String.format("%.1f", it.remainingDays)}일)", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
val updated = repo.getAnnualLeave()
|
||||
updated?.let {
|
||||
binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
|
||||
showCustomToast(requireContext(), "연차가 저장되었습니다. (남은 연차: ${String.format("%.1f", it.remainingDays)}일)")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDestroyView() {
|
||||
super.onDestroyView()
|
||||
|
||||
@@ -187,22 +187,33 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||
currentViewTeam = prefs.getString(KEY_TEAM, "A") ?: "A"
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||
currentViewTeam = prefs.getString(KEY_TEAM, "A") ?: "A"
|
||||
|
||||
updateTideButtonVisibility()
|
||||
updateCalendar()
|
||||
updateTideButtonVisibility()
|
||||
updateCalendar()
|
||||
|
||||
// 일원화된 통합 권한 체크 실행 (신뢰도 100% 보장)
|
||||
AlarmPermissionUtil.checkAndRequestAllPermissions(this)
|
||||
// 일원화된 통합 권한 체크 실행 (신뢰도 100% 보장)
|
||||
AlarmPermissionUtil.checkAndRequestAllPermissions(this)
|
||||
|
||||
// 설정 변경 시 즉시 반영을 위한 강제 동기화 (30일 스케줄링)
|
||||
lifecycleScope.launch {
|
||||
syncAllAlarms(this@MainActivity)
|
||||
}
|
||||
}
|
||||
// 설정 변경 시 즉시 반영을 위한 강제 동기화 (30일 스케줄링)
|
||||
lifecycleScope.launch {
|
||||
syncAllAlarms(this@MainActivity)
|
||||
}
|
||||
|
||||
// 연차 정보 업데이트
|
||||
lifecycleScope.launch {
|
||||
val repo = ShiftRepository(this@MainActivity)
|
||||
val annualLeave = repo.getAnnualLeave()
|
||||
annualLeave?.let {
|
||||
binding.tvAnnualLeave.text = "연차: ${String.format("%.1f", it.remainingDays)}"
|
||||
} ?: run {
|
||||
binding.tvAnnualLeave.text = "연차: --"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun showMonthYearPicker() {
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_month_year_picker, null)
|
||||
@@ -314,10 +325,17 @@ class MainActivity : AppCompatActivity() {
|
||||
binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.warning_red))
|
||||
} else {
|
||||
binding.todayStatusText.text = "오늘의 근무: $shiftForViewingTeam$teamSuffix"
|
||||
binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.text_secondary))
|
||||
}
|
||||
}
|
||||
binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.text_secondary))
|
||||
}
|
||||
|
||||
// Update Annual Leave display
|
||||
val annualLeave = withContext(Dispatchers.IO) { repo.getAnnualLeave() }
|
||||
annualLeave?.let {
|
||||
binding.tvAnnualLeave.text = "연차: ${String.format("%.1f", it.remainingDays)}"
|
||||
} ?: run {
|
||||
binding.tvAnnualLeave.text = "연차: --"
|
||||
}
|
||||
}
|
||||
updateOtherTeamsLayout(today, factory, prefs)
|
||||
}
|
||||
|
||||
@@ -373,13 +391,13 @@ class MainActivity : AppCompatActivity() {
|
||||
setMargins(4, 0, 4, 0)
|
||||
}
|
||||
|
||||
setOnClickListener {
|
||||
if (currentViewTeam != t) {
|
||||
currentViewTeam = t
|
||||
updateCalendar()
|
||||
Toast.makeText(context, "${t}반 근무표를 표시합니다.", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
setOnClickListener {
|
||||
if (currentViewTeam != t) {
|
||||
currentViewTeam = t
|
||||
updateCalendar()
|
||||
showCustomToast(context, "${t}반 근무표를 표시합니다.")
|
||||
}
|
||||
}
|
||||
}
|
||||
rowLayout.addView(textView)
|
||||
}
|
||||
@@ -595,6 +613,7 @@ class MainActivity : AppCompatActivity() {
|
||||
android.widget.Toast.makeText(this, "원래 근무로 복구되었습니다.", android.widget.Toast.LENGTH_SHORT).show()
|
||||
syncAllAlarms(this)
|
||||
updateCalendar()
|
||||
repo.updateRemainingAnnualLeave()
|
||||
}
|
||||
"직접 입력" -> {
|
||||
showCustomInputDialog(date, repo, team, factory)
|
||||
@@ -620,6 +639,7 @@ class MainActivity : AppCompatActivity() {
|
||||
updateCalendar()
|
||||
syncAllAlarms(this)
|
||||
android.widget.Toast.makeText(this, "${selected}(으)로 기록되었습니다. 알람이 해제됩니다.", android.widget.Toast.LENGTH_SHORT).show()
|
||||
repo.updateRemainingAnnualLeave()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,24 +58,24 @@ class ShiftRepository(private val context: Context) {
|
||||
dao.clearCustomAlarms()
|
||||
}
|
||||
|
||||
// Annual Leave
|
||||
suspend fun calculateUsedAnnualLeave(): Float = withContext(Dispatchers.IO) {
|
||||
val currentYear = java.time.Year.now().toString()
|
||||
val overrides = dao.getAllOverrides()
|
||||
// Annual Leave
|
||||
suspend fun calculateUsedAnnualLeave(): Float = withContext(Dispatchers.IO) {
|
||||
val currentYear = java.time.Year.now(java.time.ZoneId.of("Asia/Seoul")).toString()
|
||||
val overrides = dao.getAllOverrides()
|
||||
|
||||
var usedDays = 0f
|
||||
var usedDays = 0f
|
||||
|
||||
for (override in overrides) {
|
||||
if (override.date.startsWith(currentYear)) {
|
||||
when (override.shift) {
|
||||
"연차" -> usedDays += 1f
|
||||
"반년" -> usedDays += 0.5f
|
||||
}
|
||||
}
|
||||
}
|
||||
for (override in overrides) {
|
||||
if (override.date.startsWith(currentYear)) {
|
||||
when (override.shift) {
|
||||
"연차" -> usedDays += 1f
|
||||
"반년" -> usedDays += 0.5f
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
usedDays
|
||||
}
|
||||
usedDays
|
||||
}
|
||||
|
||||
suspend fun getAnnualLeave(): AnnualLeave? = withContext(Dispatchers.IO) {
|
||||
dao.getAnnualLeave()
|
||||
|
||||
10
app/src/main/res/drawable/bg_custom_toast.xml
Normal file
10
app/src/main/res/drawable/bg_custom_toast.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<!-- 배경색: 다크모드에서도 잘 보이도록 surface 색상 사용 -->
|
||||
<solid android:color="#CC333333" />
|
||||
<corners android:radius="16dp" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="@color/outline" />
|
||||
</shape>
|
||||
@@ -58,12 +58,12 @@
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<!-- Maximized Calendar Card - Reduced margins for wider calendar -->
|
||||
<!-- Maximized Calendar Card -->
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/calendarCard"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginHorizontal="4dp"
|
||||
android:layout_marginHorizontal="12dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:cardCornerRadius="28dp"
|
||||
app:cardElevation="0dp"
|
||||
@@ -240,7 +240,7 @@
|
||||
android:id="@+id/otherTeamsCard"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="4dp"
|
||||
android:layout_marginHorizontal="12dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
app:cardCornerRadius="20dp"
|
||||
app:cardElevation="0dp"
|
||||
|
||||
20
app/src/main/res/layout/custom_toast.xml
Normal file
20
app/src/main/res/layout/custom_toast.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/bg_custom_toast"
|
||||
android:paddingHorizontal="20dp"
|
||||
android:paddingVertical="12dp"
|
||||
android:gravity="center">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/toastText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@android:color/white"
|
||||
android:maxLines="2"
|
||||
android:ellipsize="end" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -29,7 +29,7 @@
|
||||
android:text="알람 추가"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/black"
|
||||
android:textColor="@color/text_primary"
|
||||
android:layout_centerInParent="true"/>
|
||||
|
||||
<TextView
|
||||
@@ -80,7 +80,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
app:cardCornerRadius="24dp"
|
||||
app:cardElevation="0dp"
|
||||
app:cardBackgroundColor="@color/white"
|
||||
app:cardBackgroundColor="@color/surface"
|
||||
android:layout_marginBottom="16dp">
|
||||
|
||||
<LinearLayout
|
||||
@@ -116,7 +116,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
app:cardCornerRadius="24dp"
|
||||
app:cardElevation="0dp"
|
||||
app:cardBackgroundColor="@color/white"
|
||||
app:cardBackgroundColor="@color/surface"
|
||||
android:layout_marginBottom="16dp">
|
||||
<LinearLayout
|
||||
android:id="@+id/btnSelectSound"
|
||||
@@ -162,7 +162,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
app:cardCornerRadius="24dp"
|
||||
app:cardElevation="0dp"
|
||||
app:cardBackgroundColor="@color/white"
|
||||
app:cardBackgroundColor="@color/surface"
|
||||
android:layout_marginBottom="16dp">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -56,16 +56,32 @@
|
||||
<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"/>
|
||||
<TextView android:id="@+id/btnWolcha" style="@style/ShiftCircleButton" android:text="월차" android:textSize="13sp" android:textColor="@color/secondary"/>
|
||||
<TextView android:id="@+id/btnYeoncha" style="@style/ShiftCircleButton" android:text="연차" android:textSize="13sp" android:textColor="@color/secondary"/>
|
||||
<TextView android:id="@+id/btnBanwol" style="@style/ShiftCircleButton" android:text="반월" android:textSize="13sp" android:textColor="@color/shift_red"/>
|
||||
<TextView android:id="@+id/btnBannyeon" style="@style/ShiftCircleButton" android:text="반년" android:textSize="13sp" android:textColor="@color/shift_red"/>
|
||||
<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"/>
|
||||
<TextView android:id="@+id/btnReset" style="@style/ShiftCircleButton" android:text="초기" android:textSize="13sp" android:textColor="@color/text_secondary"/>
|
||||
<TextView android:id="@+id/btnManual" style="@style/ShiftCircleButton" android:text="직접" android:textSize="14sp" android:textColor="@color/shift_gray"/>
|
||||
<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"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
android:text="날짜 이동"
|
||||
android:textSize="24sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/black"
|
||||
android:textColor="@color/text_primary"
|
||||
android:layout_marginBottom="32dp"
|
||||
android:layout_gravity="center_horizontal"/>
|
||||
|
||||
|
||||
@@ -361,5 +361,17 @@
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<!-- App Version -->
|
||||
<TextView
|
||||
android:id="@+id/tvAppVersion"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="버전 1.4.0"
|
||||
android:textColor="@color/text_tertiary"
|
||||
android:textSize="12sp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="16dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
@@ -1,128 +1,135 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center_horizontal">
|
||||
android:fillViewport="true">
|
||||
|
||||
<!-- Header Title -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="나의 연차 설정"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/text_primary"
|
||||
android:layout_marginBottom="32dp"/>
|
||||
|
||||
<!-- Total Annual Leave Setting -->
|
||||
<androidx.cardview.widget.CardView
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="24dp"
|
||||
app:cardCornerRadius="16dp"
|
||||
app:cardElevation="4dp"
|
||||
app:cardBackgroundColor="@color/surface">
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
<LinearLayout
|
||||
<!-- Header Title -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="나의 연차 설정"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/text_primary"
|
||||
android:layout_marginBottom="32dp"/>
|
||||
|
||||
<!-- Total Annual Leave Setting -->
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center">
|
||||
android:layout_marginBottom="24dp"
|
||||
app:cardCornerRadius="16dp"
|
||||
app:cardElevation="4dp"
|
||||
app:cardBackgroundColor="@color/surface">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="총 연차"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/text_secondary"
|
||||
android:layout_marginBottom="16dp"/>
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center">
|
||||
|
||||
<!-- NumberPicker for Total Days -->
|
||||
<NumberPicker
|
||||
android:id="@+id/npTotalDays"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="8dp"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="총 연차"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/text_secondary"
|
||||
android:layout_marginBottom="16dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="일"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/text_tertiary"/>
|
||||
<!-- NumberPicker for Total Days -->
|
||||
<NumberPicker
|
||||
android:id="@+id/npTotalDays"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="8dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="일"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/text_tertiary"/>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Remaining Annual Leave Display -->
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="32dp"
|
||||
app:cardCornerRadius="16dp"
|
||||
app:cardElevation="4dp"
|
||||
app:cardBackgroundColor="@color/surface">
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<LinearLayout
|
||||
<!-- Remaining Annual Leave Display -->
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center">
|
||||
android:layout_marginBottom="32dp"
|
||||
app:cardCornerRadius="16dp"
|
||||
app:cardElevation="4dp"
|
||||
app:cardBackgroundColor="@color/surface">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="남은 연차"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/text_secondary"
|
||||
android:layout_marginBottom="8dp"/>
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvRemainingDays"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="0.0"
|
||||
android:textSize="36sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/primary"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="남은 연차"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/text_secondary"
|
||||
android:layout_marginBottom="8dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="일"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/text_tertiary"/>
|
||||
<TextView
|
||||
android:id="@+id/tvRemainingDays"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="0.0"
|
||||
android:textSize="36sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/primary"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="일"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/text_tertiary"/>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Calculation Info -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="※ 연차: -1일 차감 / 반년: -0.5일 차감"
|
||||
android:textSize="13sp"
|
||||
android:textColor="@color/text_tertiary"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:gravity="center"/>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<!-- Save Button -->
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btnSaveAnnualLeave"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="56dp"
|
||||
android:text="저장"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
app:cornerRadius="12dp"
|
||||
android:backgroundTint="@color/primary"/>
|
||||
<!-- Calculation Info -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="※ 연차: -1일 차감 / 반년: -0.5일 차감"
|
||||
android:textSize="13sp"
|
||||
android:textColor="@color/text_tertiary"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:gravity="center"/>
|
||||
|
||||
</LinearLayout>
|
||||
<!-- Save Button -->
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btnSaveAnnualLeave"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="56dp"
|
||||
android:text="저장"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
app:cornerRadius="12dp"
|
||||
android:backgroundTint="@color/primary"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/dayRoot"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="108dp"
|
||||
android:layout_height="92dp"
|
||||
android:background="@drawable/bg_grid_cell_v4">
|
||||
|
||||
<!-- Day Number (top-left) -->
|
||||
@@ -16,7 +16,7 @@
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="12"
|
||||
android:textColor="@color/text_primary"
|
||||
android:textSize="15sp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
@@ -35,21 +35,21 @@
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<!-- Shift Abbreviation Circular Indicator (Center) - Larger size -->
|
||||
<!-- Shift Abbreviation Circular Indicator (Center) -->
|
||||
<TextView
|
||||
android:id="@+id/shiftChar"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:gravity="center"
|
||||
android:text="주"
|
||||
android:textSize="17sp"
|
||||
android:textSize="15sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/text_primary"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintVertical_bias="0.42"/>
|
||||
app:layout_constraintVertical_bias="0.45"/>
|
||||
|
||||
<!-- Memo Content Text (Below Shift) - Replacing icon logic for visibility -->
|
||||
<TextView
|
||||
|
||||
16
version.json
16
version.json
@@ -1,13 +1,7 @@
|
||||
{
|
||||
"versionCode": 1140,
|
||||
"versionName": "1.4.0",
|
||||
"apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.4.0/app.apk",
|
||||
"changelog": "v1.4.0: 휴가 관리 기능 추가 (연차/반년 설정 및 자동 계산), 달력 UI 개선 (넓은 화면, 큰 근무 표시)",
|
||||
"forceUpdate": false
|
||||
}
|
||||
"versionCode": 1130,
|
||||
"versionName": "1.3.0",
|
||||
"apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.3.0/app.apk",
|
||||
"changelog": "v1.3.0: versionCode 기반 업데이트 체크 개선",
|
||||
"forceUpdate": false
|
||||
"versionCode": 1143,
|
||||
"versionName": "1.4.3",
|
||||
"apkUrl": "https://git.webpluss.net/attachments/40d6f89e-58c9-41a2-a4d1-c72784a95b70",
|
||||
"changelog": "v1.4.3: 달력 레이아웃 1.3.0 버전처럼 복원 (마진 12dp, 고정 높이)",
|
||||
"forceUpdate": false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user