diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 67bacb2..b35b673 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,6 +35,6 @@ android:value="false" /> + android:resource="@drawable/ic_notification_icon" /> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index b60bcd6..4e0dc5f 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/io/heckel/ntfy/msg/MessagingService.kt b/app/src/main/java/io/heckel/ntfy/msg/MessagingService.kt index 93e42c8..f3adbb6 100644 --- a/app/src/main/java/io/heckel/ntfy/msg/MessagingService.kt +++ b/app/src/main/java/io/heckel/ntfy/msg/MessagingService.kt @@ -68,7 +68,7 @@ class MessagingService : FirebaseMessagingService() { val channelId = getString(R.string.notification_channel_id) val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION) val notificationBuilder = NotificationCompat.Builder(this, channelId) - .setSmallIcon(R.mipmap.ic_launcher) // FIXME + .setSmallIcon(R.drawable.ic_notification_icon) .setContentTitle(title) .setContentText(message) .setSound(defaultSoundUri) diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification_icon.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification_icon.xml new file mode 100644 index 0000000..f84200c --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_notification_icon.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_notification_icon.png b/app/src/main/res/drawable-hdpi/ic_notification_icon.png new file mode 100644 index 0000000..1ca72bc Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_notification_icon.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_notification_icon.png b/app/src/main/res/drawable-mdpi/ic_notification_icon.png new file mode 100644 index 0000000..71bdb63 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_notification_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_notification_icon.png b/app/src/main/res/drawable-xhdpi/ic_notification_icon.png new file mode 100644 index 0000000..5d3a127 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_notification_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png b/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png new file mode 100644 index 0000000..5ba95a2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png differ diff --git a/app/src/main/res/drawable/ic_add_black_24dp.xml b/app/src/main/res/drawable/ic_add_black_24dp.xml deleted file mode 100644 index d26c016..0000000 --- a/app/src/main/res/drawable/ic_add_black_24dp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml new file mode 100644 index 0000000..b9b8eca --- /dev/null +++ b/app/src/main/res/drawable/ic_add_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index ca3826a..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 726a4d7..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index b71c789..630cae5 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -24,13 +24,13 @@ android:textStyle="italic"/> + android:id="@+id/fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:contentDescription="@string/main_add_button_description" + android:src="@drawable/ic_add_white_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:backgroundTint="@color/primaryColor"/> diff --git a/app/src/main/res/layout/main_fragment_item.xml b/app/src/main/res/layout/main_fragment_item.xml index e3dea63..202d499 100644 --- a/app/src/main/res/layout/main_fragment_item.xml +++ b/app/src/main/res/layout/main_fragment_item.xml @@ -8,7 +8,8 @@ android:text="ntfy.sh/example" android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/topic_text" - android:layout_marginTop="16dp" android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" android:layout_marginStart="16dp" + android:textColor="@color/primaryTextColor" android:textAppearance="@style/TextAppearance.AppCompat.Medium"/> + - #3949ab - #6f74dd - #00227b - #ffffff + #4ecb26 + #87ff5c + #009900 + #000000 + diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9809a79..aea0ba0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,12 +1,16 @@ - + diff --git a/assets/launcher.png b/assets/launcher.png new file mode 100644 index 0000000..e3822cd Binary files /dev/null and b/assets/launcher.png differ diff --git a/assets/launcher.svg b/assets/launcher.svg new file mode 100644 index 0000000..9b43937 --- /dev/null +++ b/assets/launcher.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/assets/launcher_20.svg b/assets/launcher_20.svg new file mode 100644 index 0000000..7f39544 --- /dev/null +++ b/assets/launcher_20.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/assets/launcher_20_bg.png b/assets/launcher_20_bg.png new file mode 100644 index 0000000..0d4b251 Binary files /dev/null and b/assets/launcher_20_bg.png differ diff --git a/assets/launcher_20_fg.png b/assets/launcher_20_fg.png new file mode 100644 index 0000000..e9de615 Binary files /dev/null and b/assets/launcher_20_fg.png differ diff --git a/assets/launcher_bg.png b/assets/launcher_bg.png new file mode 100644 index 0000000..d1468fd Binary files /dev/null and b/assets/launcher_bg.png differ diff --git a/assets/launcher_fg.png b/assets/launcher_fg.png new file mode 100644 index 0000000..d8829b7 Binary files /dev/null and b/assets/launcher_fg.png differ diff --git a/assets/launcher_round.png b/assets/launcher_round.png new file mode 100644 index 0000000..a038aa6 Binary files /dev/null and b/assets/launcher_round.png differ diff --git a/assets/notification.png b/assets/notification.png new file mode 100644 index 0000000..40a1ac3 Binary files /dev/null and b/assets/notification.png differ diff --git a/assets/notification.svg b/assets/notification.svg new file mode 100644 index 0000000..2303e7b --- /dev/null +++ b/assets/notification.svg @@ -0,0 +1,100 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/assets/drawing.svg b/assets/old/drawing.svg similarity index 100% rename from assets/drawing.svg rename to assets/old/drawing.svg diff --git a/assets/launcher_01.svg b/assets/old/launcher_01.svg similarity index 100% rename from assets/launcher_01.svg rename to assets/old/launcher_01.svg diff --git a/assets/launcher_02.svg b/assets/old/launcher_02.svg similarity index 100% rename from assets/launcher_02.svg rename to assets/old/launcher_02.svg diff --git a/assets/launcher_03.svg b/assets/old/launcher_03.svg similarity index 100% rename from assets/launcher_03.svg rename to assets/old/launcher_03.svg diff --git a/assets/launcher_04.svg b/assets/old/launcher_04.svg similarity index 100% rename from assets/launcher_04.svg rename to assets/old/launcher_04.svg diff --git a/assets/launcher_05.svg b/assets/old/launcher_05.svg similarity index 100% rename from assets/launcher_05.svg rename to assets/old/launcher_05.svg diff --git a/assets/launcher_06.svg b/assets/old/launcher_06.svg similarity index 100% rename from assets/launcher_06.svg rename to assets/old/launcher_06.svg diff --git a/assets/launcher_06.svg.png b/assets/old/launcher_06.svg.png similarity index 100% rename from assets/launcher_06.svg.png rename to assets/old/launcher_06.svg.png diff --git a/assets/launcher_06_bg.svg b/assets/old/launcher_06_bg.svg similarity index 100% rename from assets/launcher_06_bg.svg rename to assets/old/launcher_06_bg.svg diff --git a/assets/launcher_06_fg.svg b/assets/old/launcher_06_fg.svg similarity index 100% rename from assets/launcher_06_fg.svg rename to assets/old/launcher_06_fg.svg diff --git a/assets/launcher_07.svg b/assets/old/launcher_07.svg similarity index 100% rename from assets/launcher_07.svg rename to assets/old/launcher_07.svg diff --git a/assets/launcher_07.svg.png b/assets/old/launcher_07.svg.png similarity index 100% rename from assets/launcher_07.svg.png rename to assets/old/launcher_07.svg.png diff --git a/assets/launcher_07_bg.svg b/assets/old/launcher_07_bg.svg similarity index 100% rename from assets/launcher_07_bg.svg rename to assets/old/launcher_07_bg.svg diff --git a/assets/launcher_07_bg.svg.png b/assets/old/launcher_07_bg.svg.png similarity index 100% rename from assets/launcher_07_bg.svg.png rename to assets/old/launcher_07_bg.svg.png diff --git a/assets/launcher_07_fg.svg b/assets/old/launcher_07_fg.svg similarity index 100% rename from assets/launcher_07_fg.svg rename to assets/old/launcher_07_fg.svg diff --git a/assets/launcher_07_fg.svg.png b/assets/old/launcher_07_fg.svg.png similarity index 100% rename from assets/launcher_07_fg.svg.png rename to assets/old/launcher_07_fg.svg.png diff --git a/assets/old/launcher_08.svg b/assets/old/launcher_08.svg new file mode 100644 index 0000000..7f8c873 --- /dev/null +++ b/assets/old/launcher_08.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_08.svg.png b/assets/old/launcher_08.svg.png new file mode 100644 index 0000000..54f2a66 Binary files /dev/null and b/assets/old/launcher_08.svg.png differ diff --git a/assets/old/launcher_08_bg.svg b/assets/old/launcher_08_bg.svg new file mode 100644 index 0000000..0916918 --- /dev/null +++ b/assets/old/launcher_08_bg.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/assets/old/launcher_08_bg.svg.png b/assets/old/launcher_08_bg.svg.png new file mode 100644 index 0000000..5b89868 Binary files /dev/null and b/assets/old/launcher_08_bg.svg.png differ diff --git a/assets/old/launcher_08_fg.svg b/assets/old/launcher_08_fg.svg new file mode 100644 index 0000000..28d0d8e --- /dev/null +++ b/assets/old/launcher_08_fg.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_08_fg.svg.png b/assets/old/launcher_08_fg.svg.png new file mode 100644 index 0000000..fa2d356 Binary files /dev/null and b/assets/old/launcher_08_fg.svg.png differ diff --git a/assets/old/launcher_09.svg b/assets/old/launcher_09.svg new file mode 100644 index 0000000..88676f4 --- /dev/null +++ b/assets/old/launcher_09.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_09_bg.png b/assets/old/launcher_09_bg.png new file mode 100644 index 0000000..5b89868 Binary files /dev/null and b/assets/old/launcher_09_bg.png differ diff --git a/assets/old/launcher_09_bg.svg b/assets/old/launcher_09_bg.svg new file mode 100644 index 0000000..3c09646 --- /dev/null +++ b/assets/old/launcher_09_bg.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/assets/old/launcher_09_fg.png b/assets/old/launcher_09_fg.png new file mode 100644 index 0000000..25faa7e Binary files /dev/null and b/assets/old/launcher_09_fg.png differ diff --git a/assets/old/launcher_09_fg.svg b/assets/old/launcher_09_fg.svg new file mode 100644 index 0000000..a1bc36f --- /dev/null +++ b/assets/old/launcher_09_fg.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_1.svg b/assets/old/launcher_1.svg new file mode 100644 index 0000000..26451ed --- /dev/null +++ b/assets/old/launcher_1.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_10.svg b/assets/old/launcher_10.svg new file mode 100644 index 0000000..f1dbb4c --- /dev/null +++ b/assets/old/launcher_10.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_11.svg b/assets/old/launcher_11.svg new file mode 100644 index 0000000..73011b5 --- /dev/null +++ b/assets/old/launcher_11.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_12.svg b/assets/old/launcher_12.svg new file mode 100644 index 0000000..c3a5232 --- /dev/null +++ b/assets/old/launcher_12.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_12_bg.png b/assets/old/launcher_12_bg.png new file mode 100644 index 0000000..fcf64e0 Binary files /dev/null and b/assets/old/launcher_12_bg.png differ diff --git a/assets/old/launcher_12_fg.png b/assets/old/launcher_12_fg.png new file mode 100644 index 0000000..936b202 Binary files /dev/null and b/assets/old/launcher_12_fg.png differ diff --git a/assets/old/launcher_13.png b/assets/old/launcher_13.png new file mode 100644 index 0000000..be96291 Binary files /dev/null and b/assets/old/launcher_13.png differ diff --git a/assets/old/launcher_13.svg b/assets/old/launcher_13.svg new file mode 100644 index 0000000..613ab12 --- /dev/null +++ b/assets/old/launcher_13.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_13_bg.png b/assets/old/launcher_13_bg.png new file mode 100644 index 0000000..0d4b251 Binary files /dev/null and b/assets/old/launcher_13_bg.png differ diff --git a/assets/old/launcher_13_fg.png b/assets/old/launcher_13_fg.png new file mode 100644 index 0000000..8010f53 Binary files /dev/null and b/assets/old/launcher_13_fg.png differ diff --git a/assets/old/launcher_14.svg b/assets/old/launcher_14.svg new file mode 100644 index 0000000..1ad3dab --- /dev/null +++ b/assets/old/launcher_14.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_15.svg b/assets/old/launcher_15.svg new file mode 100644 index 0000000..97b79ad --- /dev/null +++ b/assets/old/launcher_15.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/assets/old/launcher_15_bg.png b/assets/old/launcher_15_bg.png new file mode 100644 index 0000000..ebefa86 Binary files /dev/null and b/assets/old/launcher_15_bg.png differ diff --git a/assets/old/launcher_15_fg.png b/assets/old/launcher_15_fg.png new file mode 100644 index 0000000..8d00613 Binary files /dev/null and b/assets/old/launcher_15_fg.png differ