v1.1.4 - 기기 사용 중 전체화면 알람 팝업 보장 및 설정 화면 상단 닫기 아이콘 배치로 화면 공간 극대화
This commit is contained in:
sanjeok77
@@ -20,8 +20,8 @@ android {
|
||||
applicationId = "com.example.shiftalarm"
|
||||
minSdk = 26
|
||||
targetSdk = 35
|
||||
versionCode = 113
|
||||
versionName = "1.1.3"
|
||||
versionCode = 114
|
||||
versionName = "1.1.4"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<!-- Alarm & Full Screen -->
|
||||
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||
|
||||
<!-- Service & Notification -->
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||
|
||||
@@ -44,16 +44,6 @@ class AlarmActivity : AppCompatActivity() {
|
||||
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
// ForegroundService가 실행 중이면 먼저 중지
|
||||
stopService(Intent(this, AlarmForegroundService::class.java))
|
||||
|
||||
// Service 중지 후 약간의 지연을 두어 AudioFocus가 완전히 해제되도록 함
|
||||
try {
|
||||
Thread.sleep(100)
|
||||
} catch (e: InterruptedException) {
|
||||
// 무시
|
||||
}
|
||||
|
||||
enableEdgeToEdge()
|
||||
binding = ActivityAlarmBinding.inflate(layoutInflater)
|
||||
binding.root.background = ContextCompat.getDrawable(this, R.drawable.bg_alarm_gradient)
|
||||
@@ -467,6 +457,10 @@ class AlarmActivity : AppCompatActivity() {
|
||||
} catch (e: Exception) {}
|
||||
vibrator = null
|
||||
|
||||
try {
|
||||
stopService(Intent(this, AlarmForegroundService::class.java))
|
||||
} catch (e: Exception) {}
|
||||
|
||||
val nm = getSystemService(Context.NOTIFICATION_SERVICE) as android.app.NotificationManager
|
||||
nm.cancel(1)
|
||||
}
|
||||
|
||||
@@ -78,9 +78,20 @@ class AlarmForegroundService : Service() {
|
||||
|
||||
// 5. 사용 중일 때도 즉시 전체화면 AlarmActivity 화면 띄우기
|
||||
try {
|
||||
startActivity(fullScreenIntent)
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||
val options = android.app.ActivityOptions.makeBasic().apply {
|
||||
setPendingIntentBackgroundActivityStartMode(android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
|
||||
}
|
||||
fullScreenPendingIntent.send(this, 0, null, null, null, null, options.toBundle())
|
||||
} else {
|
||||
fullScreenPendingIntent.send()
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
try {
|
||||
startActivity(fullScreenIntent)
|
||||
} catch (e2: Exception) {
|
||||
e2.printStackTrace()
|
||||
}
|
||||
}
|
||||
|
||||
return START_NOT_STICKY
|
||||
|
||||
@@ -89,11 +89,31 @@ class AlarmReceiver : BroadcastReceiver() {
|
||||
putExtra("EXTRA_SNOOZE_REPEAT", intent?.getIntExtra("EXTRA_SNOOZE_REPEAT", 3) ?: 3)
|
||||
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
|
||||
}
|
||||
|
||||
val pendingLaunch = android.app.PendingIntent.getActivity(
|
||||
context,
|
||||
200,
|
||||
activityIntent,
|
||||
android.app.PendingIntent.FLAG_UPDATE_CURRENT or android.app.PendingIntent.FLAG_IMMUTABLE
|
||||
)
|
||||
|
||||
try {
|
||||
context.startActivity(activityIntent)
|
||||
Log.d(TAG, "AlarmActivity 즉시 실행 완료")
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||
val options = android.app.ActivityOptions.makeBasic().apply {
|
||||
setPendingIntentBackgroundActivityStartMode(android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
|
||||
}
|
||||
pendingLaunch.send(context, 0, null, null, null, null, options.toBundle())
|
||||
} else {
|
||||
pendingLaunch.send()
|
||||
}
|
||||
Log.d(TAG, "AlarmActivity PendingIntent 전송 완료")
|
||||
} catch (e: Exception) {
|
||||
Log.e(TAG, "AlarmActivity 실행 실패", e)
|
||||
try {
|
||||
context.startActivity(activityIntent)
|
||||
Log.d(TAG, "AlarmActivity 직접 startActivity 완료")
|
||||
} catch (e2: Exception) {
|
||||
Log.e(TAG, "AlarmActivity 실행 실패", e2)
|
||||
}
|
||||
}
|
||||
|
||||
} catch (e: Exception) {
|
||||
|
||||
@@ -49,8 +49,7 @@ class SettingsActivity : AppCompatActivity() {
|
||||
val targetTab = intent.getIntExtra("TARGET_TAB", 0)
|
||||
binding.viewPager.setCurrentItem(targetTab, false)
|
||||
|
||||
binding.btnSave.text = "닫기"
|
||||
binding.btnSave.setOnClickListener {
|
||||
binding.btnCloseSettings.setOnClickListener {
|
||||
finish()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,28 +7,39 @@
|
||||
android:background="@drawable/bg_mesh_gradient"
|
||||
android:id="@+id/settings_root">
|
||||
|
||||
<!-- Top Header: Title + Close Icon Button -->
|
||||
<LinearLayout
|
||||
android:id="@+id/settingsHeader"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingTop="4dp"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingStart="24dp"
|
||||
android:paddingEnd="24dp"
|
||||
android:paddingEnd="16dp"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/settingsTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="설정"
|
||||
android:textColor="@color/text_primary"
|
||||
android:textSize="32sp"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold"
|
||||
android:letterSpacing="-0.03"/>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/btnCloseSettings"
|
||||
android:layout_width="44dp"
|
||||
android:layout_height="44dp"
|
||||
android:src="@drawable/ic_close"
|
||||
android:background="?attr/selectableItemBackgroundBorderless"
|
||||
app:tint="@color/text_primary"
|
||||
android:padding="10dp"/>
|
||||
</LinearLayout>
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
@@ -46,33 +57,12 @@
|
||||
android:background="@android:color/transparent"
|
||||
app:layout_constraintTop_toBottomOf="@id/settingsHeader"/>
|
||||
|
||||
<!-- Full-height ViewPager2 without cramped bottom bar -->
|
||||
<androidx.viewpager2.widget.ViewPager2
|
||||
android:id="@+id/viewPager"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintTop_toBottomOf="@id/tabLayout"
|
||||
app:layout_constraintBottom_toTopOf="@id/bottomActionLayout"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/bottomActionLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="20dp"
|
||||
android:background="@android:color/transparent"
|
||||
app:layout_constraintBottom_toBottomOf="parent">
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btnSave"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="58dp"
|
||||
android:text="닫기"
|
||||
android:textSize="17sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="#FFFFFF"
|
||||
app:cornerRadius="29dp"
|
||||
android:backgroundTint="@color/primary"
|
||||
android:elevation="6dp"
|
||||
android:stateListAnimator="@null"/>
|
||||
</LinearLayout>
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
Reference in New Issue
Block a user