v1.0.4 - 날짜 옆 근무 뱃지 원형 정밀 보정, 앱 안정성 설정 아이콘 및 색상 개편
This commit is contained in:
sanjeok77
@@ -20,8 +20,8 @@ android {
|
||||
applicationId = "com.example.shiftalarm"
|
||||
minSdk = 26
|
||||
targetSdk = 35
|
||||
versionCode = 103
|
||||
versionName = "1.0.3"
|
||||
versionCode = 104
|
||||
versionName = "1.0.4"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -150,13 +150,25 @@ class CalendarAdapter(
|
||||
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)
|
||||
holder.tvShiftSmall.textSize = if (shiftAbbreviation.length > 1) 7.5f else 9.5f
|
||||
holder.tvShiftSmall.setTypeface(null, android.graphics.Typeface.BOLD)
|
||||
|
||||
if (item.shift == "반월" || item.shift == "반년") {
|
||||
holder.tvShiftSmall.text = if (item.shift == "반월") "월" else "년"
|
||||
holder.tvShiftSmall.setTextColor(ContextCompat.getColor(context, R.color.black))
|
||||
holder.tvShiftSmall.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
|
||||
} else if (isToday) {
|
||||
val smallBg = ContextCompat.getDrawable(context, R.drawable.bg_shift_solid_v4)?.constantState?.newDrawable()?.mutate() as? android.graphics.drawable.GradientDrawable
|
||||
smallBg?.setColor(shiftColor)
|
||||
holder.tvShiftSmall.background = smallBg
|
||||
holder.tvShiftSmall.setTextColor(if (item.shift == "주간" || item.shift == "석간") ContextCompat.getColor(context, R.color.black) else Color.WHITE)
|
||||
} else {
|
||||
val smallBg = ContextCompat.getDrawable(context, R.drawable.bg_shift_stroke_v4)?.constantState?.newDrawable()?.mutate() as? android.graphics.drawable.GradientDrawable
|
||||
smallBg?.setStroke(dpToPx(context, 1.2f), shiftColor)
|
||||
smallBg?.setColor(Color.TRANSPARENT)
|
||||
holder.tvShiftSmall.background = smallBg
|
||||
holder.tvShiftSmall.setTextColor(shiftColor)
|
||||
}
|
||||
} else {
|
||||
// When day has NO memo: standard large centered shift circle
|
||||
holder.shiftChar.visibility = View.VISIBLE
|
||||
|
||||
Executable
+9
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16.67,4H15V2H9v2H7.33C6.6,4 6,4.6 6,5.33v15.33C6,21.4 6.6,22 7.33,22h9.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C18,4.6 17.4,4 16.67,4zM11,20v-5.5H9L13,7v5.5h2L11,20z"/>
|
||||
</vector>
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M7,14H5v5h5v-2H7v-3zm-2,-4h2V7h3V5H5v5zm12,7h-3v2h5v-5h-2v3zM14,5v2h3v3h2V5h-5z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M12,8.5c-1.93,0 -3.5,1.57 -3.5,3.5s1.57,3.5 3.5,3.5 3.5,-1.57 3.5,-3.5 -1.57,-3.5 -3.5,-3.5zm0,5.5c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
|
||||
</vector>
|
||||
@@ -175,8 +175,8 @@
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_alarm"
|
||||
app:tint="@color/shift_red"/>
|
||||
android:src="@drawable/ic_battery"
|
||||
app:tint="#34C759"/>
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -232,7 +232,7 @@
|
||||
android:layout_height="20dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_alarm"
|
||||
app:tint="@color/primary"/>
|
||||
app:tint="#007AFF"/>
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -344,8 +344,8 @@
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_bell"
|
||||
app:tint="@color/primary"/>
|
||||
android:src="@drawable/ic_fullscreen_intent"
|
||||
app:tint="#AF52DE"/>
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -401,7 +401,7 @@
|
||||
android:layout_height="20dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_settings"
|
||||
app:tint="@color/text_tertiary"/>
|
||||
app:tint="#FF9500"/>
|
||||
</FrameLayout>
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -31,17 +31,15 @@
|
||||
<!-- 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:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:layout_marginStart="3dp"
|
||||
android:gravity="center"
|
||||
android:includeFontPadding="false"
|
||||
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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user