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

v1.1.1 - 전체 알람 온오프 스위치 및 해제 시 경고 팝업 적용, 앱 정보 화면 바운스 수정, 데이터 초기화 4단계 세분화

Browse Source
This commit is contained in:
sanjeok77
2026-08-14 10:31:56 +09:00
parent a356b3c581
commit d012b178b7
10 changed files with 291 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/fragment_settings_additional.xml
+90 -6
View File
@@ -397,32 +397,116 @@
app:cardCornerRadius="24dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@android:color/transparent"
android:layout_marginBottom="40dp">
android:layout_marginBottom="32dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/bg_oneui_settings_card"
android:padding="20dp">
android:padding="16dp">
<!-- 1. 개별 근무/알람 설정 전체 삭제 -->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnResetOverrides"
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="개별 근무/알람 설정 전체 삭제"
android:textColor="@color/shift_red"
android:textColor="@color/text_primary"
android:textStyle="bold"
android:textSize="15sp"
android:textSize="14sp"
android:background="@drawable/bg_glass_button_light"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="달력에서 개별적으로 바꾼 근무와 알람 시간이 모두 기본값으로 복구됩니다."
android:text="달력에서 개별 변경한 근무와 알람 시간을 모두 기본값으로 복구합니다."
android:textSize="11sp"
android:textColor="@color/text_tertiary"
android:layout_marginTop="8dp"/>
android:layout_marginTop="4dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="4dp"/>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/divider_subtle"
android:layout_marginBottom="12dp"/>
<!-- 2. 개별 근무 삭제 -->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnResetShifts"
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="개별 근무 삭제"
android:textColor="@color/text_primary"
android:textStyle="bold"
android:textSize="14sp"
android:background="@drawable/bg_glass_button_light"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="달력에서 개별 변경한 교대근무 일정만 기본값으로 복구합니다."
android:textSize="11sp"
android:textColor="@color/text_tertiary"
android:layout_marginTop="4dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="4dp"/>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/divider_subtle"
android:layout_marginBottom="12dp"/>
<!-- 3. 알람 삭제 -->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnResetAlarms"
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="알람 삭제"
android:textColor="@color/text_primary"
android:textStyle="bold"
android:textSize="14sp"
android:background="@drawable/bg_glass_button_light"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="추가된 사용자 지정 알람을 모두 삭제하고 기본 설정으로 복원합니다."
android:textSize="11sp"
android:textColor="@color/text_tertiary"
android:layout_marginTop="4dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="4dp"/>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/divider_subtle"
android:layout_marginBottom="12dp"/>
<!-- 4. 전체 삭제 (완전 초기화) -->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnResetAll"
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="전체 삭제"
android:textColor="@color/shift_red"
android:textStyle="bold"
android:textSize="14sp"
android:background="@drawable/bg_glass_button_light"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="메모, 연차, 개별 근무, 알람 등 앱의 모든 데이터를 완전히 초기화합니다."
android:textSize="11sp"
android:textColor="@color/shift_red"
android:layout_marginTop="4dp"
android:layout_marginStart="4dp"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
app/src/main/res/layout/fragment_settings_alarm.xml
+26 -15
View File
@@ -12,33 +12,44 @@
android:background="@color/surface"
android:padding="16dp">
<!-- Master Alarm Header with Switch -->
<LinearLayout
android:id="@+id/masterAlarmCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingHorizontal="8dp"
android:layout_marginBottom="8dp">
android:background="@drawable/bg_group_header"
android:paddingHorizontal="16dp"
android:paddingVertical="12dp"
android:layout_marginBottom="12dp"
android:clickable="true"
android:focusable="true">
<ImageView
android:id="@+id/ivMasterBell"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_bell"
app:tint="@color/primary"
android:layout_marginEnd="10dp"/>
<TextView
android:id="@+id/tvMasterStatus"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="전체 알람 켜짐"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/primary"
android:background="@drawable/bg_glass_pill_v4"
android:backgroundTint="#F2F2F7"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:clickable="true"
android:focusable="true"/>
android:textColor="@color/text_primary"/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/masterSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:thumbTint="@color/white"
app:trackTint="@color/sl_switch_track"/>
</LinearLayout>
<!-- Unified Alarm List Container (Background removed as items are now individual cards) -->