Merge branch 'release/1.4.3'

app/build.gradle

@@ -22,8 +22,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 100
+        versionCode 101
-        versionName "1.4.2"
+        versionName "1.4.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -174,7 +174,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.4.2"
+    implementation "io.github.wulkanowy:sdk:1.4.3"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
@@ -190,7 +190,7 @@ dependencies {
 
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.2"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
@@ -218,7 +218,7 @@ dependencies {
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.9.3"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
@@ -235,10 +235,10 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.android.play:core:1.10.2'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:20.4.0'
+    playImplementation 'com.google.android.gms:play-services-ads:20.5.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.3.0.303'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.3.2.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.1.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.2.200'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
@@ -250,7 +250,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.7'
+    testImplementation 'org.robolectric:robolectric:4.7.2'
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation "androidx.test:core:1.4.0"

app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt

@@ -123,14 +123,6 @@ class FragmentLifecycleLogger @Inject constructor() :
         Timber.d("${f::class.java.simpleName} VIEW DESTROYED")
     }
 
-    override fun onFragmentActivityCreated(
-        fm: FragmentManager,
-        f: Fragment,
-        savedInstanceState: Bundle?
-    ) {
-        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${savedInstanceState.checkSavedState()}")
-    }
-
     override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
         Timber.d("${f::class.java.simpleName} PAUSED")
     }
@@ -141,5 +133,5 @@ class FragmentLifecycleLogger @Inject constructor() :
 }
 
 private fun Bundle?.checkSavedState() =
-    if (this == null) "(STATE IS NULL)" else "(STATE IS NOT NULL)"
+    if (this == null) "(STATE IS NULL)" else "(RESTORE STATE)"
 

app/src/main/play/release-notes/pl-PL/default.txt

@@ -1,10 +1,6 @@
-Wersja 1.4.2
+Wersja 1.4.3
 
-- dodaliśmy możliwość dodawania własnych zadań domowych
+Naprawiliśmy drobne problemy ze stabilnością oraz małą usterkę w wyszukiwarce wiadomości.
-- dodaliśmy kafelek z wiadomościami od twórców
+Wszystko po to, aby jeszcze bardziej podnieść komfort z używania aplikacji!
-- dodaliśmy dodatkowy tryb rozwijania szczegółów ocen
-- dodaliśmy wsparcie dla Androida 12
-- ulepszyliśmy powiadomienia na Mi Bandzie
-- dokonaliśmy też kilka innych zmian i kosmetycznych poprawek poprawiających komfort używania aplikacji
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

app/src/main/res/layout/fragment_grade_statistics.xml

@@ -1,9 +1,14 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-    android:orientation="vertical">
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
 
         <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
             android:id="@+id/gradeStatisticsSubjectsContainer"
@@ -155,4 +160,5 @@
                 </androidx.core.widget.NestedScrollView>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-</LinearLayout>
+    </LinearLayout>
+</FrameLayout>

app/src/main/res/values-cs/strings.xml

@@ -707,7 +707,7 @@
     <string name="pref_ads_privacy_agree">Souhlasím</string>
     <string name="pref_ads_privacy_link">Ochrana osobních údajů</string>
     <string name="pref_ads_loading">Reklama se načítá</string>
-    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_ads_once_per_visit">Děkujeme za vaši podporu, vraťte se později pro více reklam</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhled a chování</string>
     <string name="pref_settings_notifications_title">Upozornění</string>

app/src/main/res/values-sk/strings.xml

@@ -707,7 +707,7 @@
     <string name="pref_ads_privacy_agree">Súhlasím</string>
     <string name="pref_ads_privacy_link">Ochrana osobných údajov</string>
     <string name="pref_ads_loading">Reklama sa načítava</string>
-    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_ads_once_per_visit">Ďakujeme za vašu podporu, vráťte sa neskôr pre viac reklám</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhľad a správanie</string>
     <string name="pref_settings_notifications_title">Upozornenia</string>

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.6.0'
         about_libraries = '8.9.4'
-        hilt_version = "2.40.1"
+        hilt_version = "2.40.2"
     }
     repositories {
         mavenCentral()
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.huawei.agconnect:agcp:1.6.1.300'
+        classpath 'com.huawei.agconnect:agcp:1.6.2.200'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.0"