diff --git a/app/src/main/ICONS NOTICE.txt b/app/src/main/ICONS NOTICE.txt new file mode 100644 index 00000000..ec301107 --- /dev/null +++ b/app/src/main/ICONS NOTICE.txt @@ -0,0 +1,4 @@ +Almost all Icons are licensed under Apache License 2.0 and were taken from Material Design Icons. + +https://www.apache.org/licenses/LICENSE-2.0.html +https://fonts.google.com/icons \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/notification/UpdatesNotificationServiceImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/local/notification/UpdatesNotificationServiceImpl.kt index bdc16737..8339ada8 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/local/notification/UpdatesNotificationServiceImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/local/notification/UpdatesNotificationServiceImpl.kt @@ -57,7 +57,7 @@ class UpdatesNotificationServiceImpl @Inject constructor( .setContentIntent(latestReleasePendingIntent) .addAction( Notification.Action.Builder( - Icon.createWithResource(application, R.drawable.app_icon_monochrome), + Icon.createWithResource(application, R.drawable.notification_icon), application.getString(R.string.updates_notification_action), downloadLatestVersionPendingIntent ).build() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsEmpty.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsEmpty.kt index 311afe73..3e99d4ad 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsEmpty.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsEmpty.kt @@ -49,10 +49,10 @@ fun IsEmpty( Icon( painter = icon, contentDescription = message, - modifier = Modifier.size(120.dp), + modifier = Modifier.size(190.dp), tint = MaterialTheme.colorScheme.primary ) - Spacer(modifier = Modifier.height(36.dp)) + Spacer(modifier = Modifier.height(12.dp)) Text( text = message, style = MaterialTheme.typography.bodyLarge, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsError.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsError.kt index 25e5e20b..e4964cac 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsError.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsError.kt @@ -48,10 +48,10 @@ fun IsError( Icon( painter = icon, contentDescription = errorMessage, - modifier = Modifier.size(120.dp), + modifier = Modifier.size(140.dp), tint = MaterialTheme.colorScheme.error ) - Spacer(modifier = Modifier.height(36.dp)) + Spacer(modifier = Modifier.height(24.dp)) Text( text = errorMessage, style = MaterialTheme.typography.bodyLarge, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt index 5d6a162c..25f566e0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt @@ -109,10 +109,10 @@ fun StartDone( } ) { Icon( - painter = painterResource(id = R.drawable.checklist), + painter = painterResource(id = R.drawable.start_done), contentDescription = null, tint = MaterialTheme.colorScheme.primary, - modifier = Modifier.size(150.dp) + modifier = Modifier.size(190.dp) ) Spacer(modifier = Modifier.height(16.dp)) Text( diff --git a/app/src/main/res/drawable/browse_screen_filled.png b/app/src/main/res/drawable/browse_screen_filled.png deleted file mode 100644 index dd02fa92..00000000 Binary files a/app/src/main/res/drawable/browse_screen_filled.png and /dev/null differ diff --git a/app/src/main/res/drawable/browse_screen_filled.xml b/app/src/main/res/drawable/browse_screen_filled.xml new file mode 100644 index 00000000..a03c6520 --- /dev/null +++ b/app/src/main/res/drawable/browse_screen_filled.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/browse_screen_outlined.png b/app/src/main/res/drawable/browse_screen_outlined.png deleted file mode 100644 index 1defb39f..00000000 Binary files a/app/src/main/res/drawable/browse_screen_outlined.png and /dev/null differ diff --git a/app/src/main/res/drawable/browse_screen_outlined.xml b/app/src/main/res/drawable/browse_screen_outlined.xml new file mode 100644 index 00000000..d0bf00e9 --- /dev/null +++ b/app/src/main/res/drawable/browse_screen_outlined.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/checklist.png b/app/src/main/res/drawable/checklist.png deleted file mode 100644 index 0f29eed7..00000000 Binary files a/app/src/main/res/drawable/checklist.png and /dev/null differ diff --git a/app/src/main/res/drawable/empty_browse.png b/app/src/main/res/drawable/empty_browse.png deleted file mode 100644 index f1798e6c..00000000 Binary files a/app/src/main/res/drawable/empty_browse.png and /dev/null differ diff --git a/app/src/main/res/drawable/empty_browse.xml b/app/src/main/res/drawable/empty_browse.xml new file mode 100644 index 00000000..d3230a31 --- /dev/null +++ b/app/src/main/res/drawable/empty_browse.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/empty_history.png b/app/src/main/res/drawable/empty_history.png deleted file mode 100644 index 0e5ab0e8..00000000 Binary files a/app/src/main/res/drawable/empty_history.png and /dev/null differ diff --git a/app/src/main/res/drawable/empty_history.xml b/app/src/main/res/drawable/empty_history.xml new file mode 100644 index 00000000..ad6d8ff3 --- /dev/null +++ b/app/src/main/res/drawable/empty_history.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/app/src/main/res/drawable/empty_library.png b/app/src/main/res/drawable/empty_library.png deleted file mode 100644 index dace3dc0..00000000 Binary files a/app/src/main/res/drawable/empty_library.png and /dev/null differ diff --git a/app/src/main/res/drawable/empty_library.xml b/app/src/main/res/drawable/empty_library.xml new file mode 100644 index 00000000..8612cf0e --- /dev/null +++ b/app/src/main/res/drawable/empty_library.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/error.png b/app/src/main/res/drawable/error.png deleted file mode 100644 index abee5e8a..00000000 Binary files a/app/src/main/res/drawable/error.png and /dev/null differ diff --git a/app/src/main/res/drawable/error.xml b/app/src/main/res/drawable/error.xml new file mode 100644 index 00000000..3f8953db --- /dev/null +++ b/app/src/main/res/drawable/error.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/history_screen_filled.png b/app/src/main/res/drawable/history_screen_filled.png deleted file mode 100644 index a2636f1e..00000000 Binary files a/app/src/main/res/drawable/history_screen_filled.png and /dev/null differ diff --git a/app/src/main/res/drawable/history_screen_filled.xml b/app/src/main/res/drawable/history_screen_filled.xml new file mode 100644 index 00000000..3c9844ba --- /dev/null +++ b/app/src/main/res/drawable/history_screen_filled.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/history_screen_outlined.png b/app/src/main/res/drawable/history_screen_outlined.png deleted file mode 100644 index 0dc0413f..00000000 Binary files a/app/src/main/res/drawable/history_screen_outlined.png and /dev/null differ diff --git a/app/src/main/res/drawable/history_screen_outlined.xml b/app/src/main/res/drawable/history_screen_outlined.xml new file mode 100644 index 00000000..ed47780f --- /dev/null +++ b/app/src/main/res/drawable/history_screen_outlined.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/library_screen_filled.png b/app/src/main/res/drawable/library_screen_filled.png deleted file mode 100644 index 9a2b898f..00000000 Binary files a/app/src/main/res/drawable/library_screen_filled.png and /dev/null differ diff --git a/app/src/main/res/drawable/library_screen_filled.xml b/app/src/main/res/drawable/library_screen_filled.xml new file mode 100644 index 00000000..6638db7b --- /dev/null +++ b/app/src/main/res/drawable/library_screen_filled.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/library_screen_outlined.png b/app/src/main/res/drawable/library_screen_outlined.png deleted file mode 100644 index 6f92b5a0..00000000 Binary files a/app/src/main/res/drawable/library_screen_outlined.png and /dev/null differ diff --git a/app/src/main/res/drawable/library_screen_outlined.xml b/app/src/main/res/drawable/library_screen_outlined.xml new file mode 100644 index 00000000..ea5bab63 --- /dev/null +++ b/app/src/main/res/drawable/library_screen_outlined.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/start_done.xml b/app/src/main/res/drawable/start_done.xml new file mode 100644 index 00000000..3b9056b3 --- /dev/null +++ b/app/src/main/res/drawable/start_done.xml @@ -0,0 +1,12 @@ + + + + +