Skip to content

Commit 4abf012

Browse files
KxxHyoRimKxxHyoRim
authored
Merge pull request #169 from hellokitty-coding-club/ui/push-icon
[UI] 푸시알림 수신 시 monochrome icon 설정 #168
2 parents c8d69f4 + 07c3326 commit 4abf012

File tree

6 files changed

+59
-5
lines changed

6 files changed

+59
-5
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838
<activity
3939
android:name=".auth.ui.signup.SignUpActivity"
40-
android:windowSoftInputMode="adjustPan"
41-
android:exported="false" />
40+
android:exported="false"
41+
android:windowSoftInputMode="adjustPan" />
4242

4343
<activity
4444
android:name=".main.MainActivity"

‎app/src/main/java/com/lgtm/android/LGTMFirebaseMessagingService.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import android.content.Context
1111
import android.content.Intent
1212
import android.util.Log
1313
import androidx.core.app.NotificationCompat
14+
import androidx.core.content.ContextCompat
1415
import com.google.firebase.messaging.FirebaseMessaging
1516
import com.google.firebase.messaging.FirebaseMessagingService
1617
import com.google.firebase.messaging.RemoteMessage
@@ -92,7 +93,8 @@ class LGTMFirebaseMessagingService : FirebaseMessagingService(), LgtmMessagingSe
9293
): NotificationCompat.Builder {
9394
return NotificationCompat.Builder(this, channelID)
9495
.setPriority(NotificationCompat.PRIORITY_HIGH)
95-
.setSmallIcon(R.drawable.ic_launcher_foreground)
96+
.setSmallIcon(R.drawable.ic_launch_mono)
97+
.setColor(ContextCompat.getColor(this, R.color.green))
9698
.setAutoCancel(true)
9799
.setContentTitle(title)
98100
.setStyle(NotificationCompat.BigTextStyle().bigText(message))

‎common-ui/src/main/res/drawable/ic_launch_mono.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="369dp"
3+
android:height="400dp"
4+
android:viewportWidth="369"
5+
android:viewportHeight="400">
6+
<group>
7+
<clip-path
8+
android:fillType="evenOdd"
9+
android:pathData="M108.71,352.65C48.67,352.65 0,304.03 0,244.05s48.67,-108.6 108.71,-108.6 110.82,45.46 110.82,105.44c0,0.67 -0.01,1.33 -0.02,2l0.01,-0.01c0,0.58 0,1.21 0,1.88 0.07,21.57 0.29,89.87 -60.44,151.04 -4.37,4.4 -14.67,-1.8 -15.18,-7.99 -1.3,-15.83 -9.69,-31.61 -28.88,-35.36 -2.1,0.13 -4.21,0.19 -6.33,0.19z"/>
10+
<path
11+
android:fillColor="#56EE9B"
12+
android:pathData="m219.51,242.9 l8.45,8.52 -21.01,20.84 0.56,-29.59 12,0.23zM219.52,242.89 L211.07,234.37 231.52,214.07v28.81h-12zM219.53,244.77 L231.53,244.73 219.53,244.77zM159.09,395.81l-8.52,-8.45 8.52,8.45zM143.92,387.82 L131.96,388.81 143.92,387.82zM115.04,352.46l-0.73,-11.98 1.53,-0.09 1.5,0.29 -2.31,11.78zM12,244.05c0,53.34 43.29,96.6 96.71,96.6v24C42.05,364.65 -12,310.67 -12,244.05h24zM108.71,147.46c-53.42,0 -96.71,43.26 -96.71,96.6h-24c0,-66.62 54.05,-120.6 120.71,-120.6v24zM207.53,240.9c0,-52.59 -44.63,-93.44 -98.82,-93.44v-24c65.88,0 122.82,50.07 122.82,117.44h-24zM207.51,242.67c0.01,-0.59 0.02,-1.18 0.02,-1.77h24c0,0.74 -0.01,1.48 -0.02,2.22l-24,-0.45zM227.98,251.4 L227.97,251.41 211.06,234.38 211.07,234.37 227.98,251.4zM207.53,244.81c-0,-0.67 -0,-1.32 -0,-1.92h24c0,0.56 0,1.17 0,1.84l-24,0.08zM150.58,387.36c57.22,-57.64 57.02,-121.76 56.95,-142.55l24,-0.08c0.07,22.35 0.31,94.84 -63.92,159.53l-17.03,-16.91zM155.88,386.84c-0.13,-1.52 -0.73,-2.17 -0.61,-2.03 0.06,0.08 0.3,0.31 0.63,0.5 0.38,0.21 0.25,0.02 -0.5,-0.01 -0.91,-0.03 -3.01,0.23 -4.82,2.06l17.03,16.91c-4,4.03 -9.02,5.17 -13.11,5.02 -3.93,-0.15 -7.49,-1.45 -10.29,-3.01 -4.91,-2.74 -11.54,-8.72 -12.26,-17.46l23.92,-1.97zM117.35,340.68c26.3,5.15 36.96,27.11 38.53,46.15l-23.92,1.97c-1.04,-12.61 -7.14,-22.21 -19.22,-24.57l4.61,-23.55zM108.71,340.65c1.88,0 3.75,-0.06 5.6,-0.17l1.46,23.95c-2.34,0.14 -4.69,0.22 -7.06,0.22v-24z"/>
13+
</group>
14+
<group>
15+
<clip-path
16+
android:fillType="evenOdd"
17+
android:pathData="M260.29,352.65C320.33,352.65 369,304.03 369,244.05s-48.67,-108.6 -108.71,-108.6 -110.82,45.46 -110.82,105.44c0,0.67 0.01,1.33 0.02,2l-0.01,-0.01c0,0.58 -0,1.21 -0,1.88 -0.07,21.57 -0.29,89.85 60.26,151.01 4.37,4.41 14.72,-1.79 15.24,-7.98 1.34,-15.64 9.52,-31.28 28,-35.4 2.42,0.17 4.86,0.26 7.32,0.26z"/>
18+
<path
19+
android:fillColor="#56EE9B"
20+
android:pathData="m149.49,242.9 l-8.44,8.53 20.99,20.76 -0.56,-29.52 -12,0.23zM149.48,242.89 L157.92,234.35 137.48,214.14v28.75h12zM149.47,244.77 L161.47,244.81 149.47,244.77zM209.73,395.78 L201.2,404.22 209.73,395.78zM224.97,387.8 L236.93,388.82 224.97,387.8zM252.98,352.39 L253.82,340.42 252.07,340.3 250.36,340.68 252.98,352.4zM357,244.05c0,53.34 -43.29,96.6 -96.71,96.6v24C326.95,364.65 381,310.67 381,244.05h-24zM260.29,147.46c53.42,0 96.71,43.26 96.71,96.6h24c0,-66.62 -54.05,-120.6 -120.71,-120.6v24zM161.47,240.9c0,-52.59 44.63,-93.44 98.82,-93.44v-24c-65.88,0 -122.82,50.07 -122.82,117.44h24zM161.48,242.67a95.11,95.11 0,0 1,-0.02 -1.77h-24c0,0.74 0.01,1.48 0.02,2.22l24,-0.45zM141.04,251.42 L141.05,251.43 157.93,234.36 157.92,234.35 141.04,251.42zM161.47,244.81c0,-0.67 0,-1.32 0,-1.92h-24c0,0.56 -0,1.17 -0,1.84l24,0.08zM218.26,387.33c-57.05,-57.63 -56.85,-121.73 -56.79,-142.53l-24,-0.08c-0.07,22.34 -0.31,94.8 63.73,159.49l17.06,-16.88zM213.02,386.78c0.13,-1.53 0.74,-2.18 0.62,-2.03a2.59,2.59 0,0 1,-0.66 0.51c-0.4,0.22 -0.28,0.03 0.47,0 0.9,-0.03 3,0.23 4.82,2.07l-17.06,16.88c4,4.04 9.03,5.18 13.12,5.03 3.93,-0.14 7.49,-1.44 10.29,-3 4.91,-2.72 11.57,-8.69 12.32,-17.44l-23.91,-2.04zM250.36,340.68c-25.42,5.67 -35.75,27.37 -37.35,46.09l23.91,2.04c1.07,-12.56 7.12,-22.14 18.66,-24.71l-5.23,-23.42zM260.29,340.65c-2.17,0 -4.33,-0.08 -6.47,-0.23l-1.68,23.94c2.7,0.19 5.42,0.29 8.16,0.29v-24z"/>
21+
</group>
22+
<path
23+
android:fillColor="#56EE9B"
24+
android:fillType="evenOdd"
25+
android:pathData="M184.25,217.4c-59.37,-0.7 -107.29,-49.1 -107.29,-108.7C76.96,48.67 125.58,0 185.55,0c59.54,0 107.89,47.97 108.58,107.4l0.01,-0.01c0,0.58 0,1.21 0,1.88 0.07,21.54 0.29,89.74 -60.35,150.82 -4.37,4.4 -14.69,-1.81 -15.29,-7.99 -1.62,-16.67 -11.52,-33.01 -34.26,-34.69l0.01,-0.01z"/>
26+
</vector>

‎common-ui/src/main/res/drawable/ic_launch_monochrome.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="512dp"
3+
android:height="512dp"
4+
android:viewportWidth="512"
5+
android:viewportHeight="512">
6+
<group>
7+
<clip-path
8+
android:fillType="evenOdd"
9+
android:pathData="M180.71,408.65C120.67,408.65 72,360.03 72,300.05s48.67,-108.6 108.71,-108.6 110.82,45.46 110.82,105.44c0,0.67 -0.01,1.33 -0.02,2l0.01,-0.01c0,0.58 0,1.21 0,1.88 0.07,21.57 0.29,89.87 -60.44,151.04 -4.37,4.4 -14.67,-1.8 -15.18,-7.99 -1.3,-15.83 -9.69,-31.61 -28.88,-35.36 -2.1,0.13 -4.21,0.19 -6.33,0.19z"/>
10+
<path
11+
android:fillColor="#56EE9B"
12+
android:pathData="m291.51,298.89 l8.45,8.52 -21.01,20.84 0.56,-29.59 12,0.23zM291.52,298.89 L283.07,290.37 303.52,270.07v28.81h-12zM291.53,300.77 L303.53,300.73 291.53,300.77zM231.09,451.81l-8.52,-8.45 8.52,8.45zM215.92,443.82 L203.96,444.81 215.92,443.82zM187.04,408.46l-0.73,-11.98 1.53,-0.09 1.5,0.29 -2.31,11.78zM84,300.05c0,53.34 43.29,96.6 96.71,96.6v24C114.05,420.65 60,366.67 60,300.05h24zM180.71,203.46c-53.42,0 -96.71,43.26 -96.71,96.6L60,300.05c0,-66.62 54.05,-120.6 120.71,-120.6v24zM279.53,296.9c0,-52.59 -44.63,-93.44 -98.82,-93.44v-24c65.88,0 122.82,50.07 122.82,117.44h-24zM279.52,298.67c0.01,-0.59 0.02,-1.18 0.02,-1.77h24c0,0.74 -0.01,1.48 -0.02,2.22l-24,-0.45zM299.98,307.4 L299.96,307.41 283.06,290.38 283.07,290.37 299.98,307.4zM279.53,300.81c-0,-0.67 -0,-1.32 -0,-1.92h24c0,0.56 0,1.17 0,1.84l-24,0.08zM222.58,443.36c57.22,-57.64 57.02,-121.76 56.95,-142.55l24,-0.08c0.07,22.35 0.31,94.84 -63.92,159.53l-17.03,-16.91zM227.88,442.84c-0.13,-1.52 -0.73,-2.17 -0.61,-2.03 0.06,0.08 0.3,0.31 0.63,0.5 0.38,0.21 0.25,0.02 -0.5,-0.01 -0.91,-0.03 -3.01,0.23 -4.82,2.06l17.03,16.91c-4,4.03 -9.02,5.17 -13.11,5.02 -3.93,-0.15 -7.49,-1.45 -10.29,-3.01 -4.91,-2.74 -11.54,-8.72 -12.26,-17.46l23.92,-1.97zM189.35,396.68c26.3,5.15 36.96,27.11 38.53,46.15l-23.92,1.97c-1.04,-12.61 -7.14,-22.21 -19.22,-24.57l4.61,-23.55zM180.71,396.65c1.88,0 3.75,-0.06 5.6,-0.17l1.46,23.95c-2.34,0.14 -4.69,0.22 -7.06,0.22v-24z"/>
13+
</group>
14+
<group>
15+
<clip-path
16+
android:fillType="evenOdd"
17+
android:pathData="M332.29,408.65C392.33,408.65 441,360.03 441,300.05s-48.67,-108.6 -108.71,-108.6 -110.82,45.46 -110.82,105.44c0,0.67 0.01,1.33 0.02,2l-0.01,-0.01c0,0.58 -0,1.21 -0,1.88 -0.07,21.57 -0.29,89.85 60.26,151.01 4.37,4.41 14.72,-1.79 15.24,-7.98 1.34,-15.64 9.52,-31.28 28,-35.4 2.42,0.17 4.86,0.26 7.32,0.26z"/>
18+
<path
19+
android:fillColor="#56EE9B"
20+
android:pathData="m221.49,298.89 l-8.44,8.53 20.99,20.76 -0.56,-29.52 -12,0.23zM221.48,298.89 L229.92,290.35 209.48,270.14v28.75h12zM221.47,300.77 L233.47,300.81 221.47,300.77zM281.73,451.78 L273.2,460.22 281.73,451.78zM296.97,443.8 L308.93,444.82 296.97,443.8zM324.98,408.39 L325.82,396.42 324.07,396.3 322.36,396.68 324.98,408.4zM429,300.05c0,53.34 -43.29,96.6 -96.71,96.6v24C398.95,420.65 453,366.67 453,300.05h-24zM332.29,203.46c53.42,0 96.71,43.26 96.71,96.6h24c0,-66.62 -54.05,-120.6 -120.71,-120.6v24zM233.47,296.9c0,-52.59 44.63,-93.44 98.82,-93.44v-24c-65.88,0 -122.82,50.07 -122.82,117.44h24zM233.48,298.67a95.11,95.11 0,0 1,-0.02 -1.77h-24c0,0.74 0.01,1.48 0.02,2.22l24,-0.45zM213.04,307.42 L213.05,307.43 229.93,290.36 229.92,290.35 213.04,307.42zM233.47,300.81c0,-0.67 0,-1.32 0,-1.92h-24c0,0.56 -0,1.17 -0,1.84l24,0.08zM290.26,443.33c-57.05,-57.63 -56.85,-121.73 -56.79,-142.53l-24,-0.08c-0.07,22.34 -0.31,94.8 63.73,159.49l17.06,-16.88zM285.02,442.78c0.13,-1.53 0.74,-2.18 0.62,-2.03a2.59,2.59 0,0 1,-0.66 0.51c-0.4,0.22 -0.28,0.03 0.47,0 0.9,-0.03 3,0.23 4.82,2.07l-17.06,16.88c4,4.04 9.03,5.18 13.12,5.03 3.93,-0.14 7.49,-1.44 10.29,-3 4.91,-2.72 11.57,-8.69 12.32,-17.44l-23.91,-2.04zM322.36,396.68c-25.42,5.67 -35.75,27.37 -37.35,46.09l23.91,2.04c1.07,-12.56 7.12,-22.14 18.66,-24.71l-5.23,-23.42zM332.29,396.65c-2.17,0 -4.33,-0.08 -6.47,-0.23l-1.68,23.94c2.7,0.19 5.42,0.29 8.16,0.29v-24z"/>
21+
</group>
22+
<path
23+
android:fillColor="#56EE9B"
24+
android:fillType="evenOdd"
25+
android:pathData="M256.25,273.4c-59.37,-0.7 -107.29,-49.1 -107.29,-108.7C148.96,104.67 197.58,56 257.55,56c59.54,0 107.89,47.97 108.58,107.4l0.01,-0.01c0,0.58 0,1.21 0,1.88 0.07,21.54 0.29,89.74 -60.35,150.82 -4.37,4.4 -14.69,-1.81 -15.29,-7.99 -1.62,-16.67 -11.52,-33.01 -34.26,-34.69l0.01,-0.01z"/>
26+
</vector>

‎common-ui/src/main/res/drawable/oval_diameter_9_gray_2.xml‎ renamed to ‎common-ui/src/main/res/drawable/oval_diameter_9_gray_3.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<size
66
android:width="9dp"
77
android:height="9dp" />
8-
<solid android:color="@color/gray_2" />
8+
<solid android:color="@color/gray_3" />
99
</shape>

‎feature/main/src/main/res/layout/item_notification_center.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:layout_height="9dp"
2323
android:layout_marginStart="24dp"
2424
android:layout_marginTop="30dp"
25-
android:src="@{data.isRead ? @drawable/oval_diameter_9_gray_2 : @drawable/oval_diameter_9_green}"
25+
android:src="@{data.isRead ? @drawable/oval_diameter_9_gray_3 : @drawable/oval_diameter_9_green}"
2626
app:layout_constraintStart_toStartOf="parent"
2727
app:layout_constraintTop_toTopOf="parent"
2828
tools:src="@drawable/oval_diameter_9_green" />

0 commit comments

Comments
 (0)