diff --git a/UIViews/build.gradle b/UIViews/build.gradle index 47184050f..497892ec6 100644 --- a/UIViews/build.gradle +++ b/UIViews/build.gradle @@ -69,8 +69,8 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation swiperefresh implementation coroutinesCore - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.4.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.5.0' implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha01" diff --git a/build.gradle b/build.gradle index 6e888765f..490aa6b48 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext.jakepurple13 = "10.6.3" ext.otakuVersionName = "12.0" ext.latestAboutLibsRelease = "+" - ext.coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1" + ext.coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0" ext.flowutils = "com.github.jakepurple13.HelpfulTools:flowutils:$jakepurple13" ext.gsonutils = "com.github.jakepurple13.HelpfulTools:gsonutils:$jakepurple13" @@ -60,7 +60,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.5' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.0' - classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${latestAboutLibsRelease}" + classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.8.5" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files def nav_version = "2.3.5" diff --git a/mangaworld/build.gradle b/mangaworld/build.gradle index 7806bb409..8b21ff39b 100644 --- a/mangaworld/build.gradle +++ b/mangaworld/build.gradle @@ -76,7 +76,7 @@ dependencies { implementation 'com.mikepenz:google-material-typeface:4.0.0.1-kotlin@aar' implementation coroutinesCore - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0' implementation room.room // For Kotlin use kapt instead of annotationProcessor diff --git a/novelworld/src/main/ic_launcher-playstore.png b/novelworld/src/main/ic_launcher-playstore.png new file mode 100644 index 000000000..4a3e48510 Binary files /dev/null and b/novelworld/src/main/ic_launcher-playstore.png differ diff --git a/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt b/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt index fa22ead99..6fbe8a2cd 100644 --- a/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt +++ b/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt @@ -9,7 +9,7 @@ class NovelApp : OtakuApp() { override fun onCreated() { logo = R.mipmap.ic_launcher - notificationLogo = R.drawable.ic_launcher_foreground + notificationLogo = R.mipmap.ic_launcher_foreground FirebaseDb.DOCUMENT_ID = "favoriteNovels" FirebaseDb.CHAPTERS_ID = "novelsChaptersRead" diff --git a/novelworld/src/main/res/drawable/ic_launcher_background.xml b/novelworld/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cb..000000000 --- a/novelworld/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cfe5..c9ad5f98f 100644 --- a/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe5..c9ad5f98f 100644 --- a/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/novelworld/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/novelworld/src/main/res/mipmap-hdpi/ic_launcher.png b/novelworld/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a571e6009..000000000 Binary files a/novelworld/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/novelworld/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..1c01e7e30 Binary files /dev/null and b/novelworld/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/novelworld/src/main/res/mipmap-hdpi/ic_launcher_round.png b/novelworld/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551c5..000000000 Binary files a/novelworld/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-mdpi/ic_launcher.png b/novelworld/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c41dd2853..000000000 Binary files a/novelworld/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/novelworld/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..98d4a849b Binary files /dev/null and b/novelworld/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/novelworld/src/main/res/mipmap-mdpi/ic_launcher_round.png b/novelworld/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a75..000000000 Binary files a/novelworld/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-xhdpi/ic_launcher.png b/novelworld/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 6dba46dab..000000000 Binary files a/novelworld/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/novelworld/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..388872c76 Binary files /dev/null and b/novelworld/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/novelworld/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/novelworld/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a871c..000000000 Binary files a/novelworld/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher.png b/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 15ac68172..000000000 Binary files a/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..33c58b2bb Binary files /dev/null and b/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d31..000000000 Binary files a/novelworld/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index f25a41974..000000000 Binary files a/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..9519c7682 Binary files /dev/null and b/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783ccc..000000000 Binary files a/novelworld/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/novelworld/src/main/res/values/ic_launcher_background.xml b/novelworld/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..c5d5899fd --- /dev/null +++ b/novelworld/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file