Merge branch 'develop' into feature/agenda-updates

.idea/codeStyles/Project.xml

@@ -15,6 +15,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -25,6 +26,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -36,6 +38,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -46,6 +49,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -56,6 +60,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -66,6 +71,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -76,6 +82,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -87,6 +94,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -98,6 +106,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>

app/build.gradle

@@ -152,6 +152,7 @@ dependencies {
     implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2"
 
     // Szkolny.eu libraries/forks
+    implementation "eu.szkolny:android-snowfall:1ca9ea2da3"
     implementation "eu.szkolny:agendacalendarview:5431f03098"
     implementation "eu.szkolny:cafebar:5bf0c618de"
     implementation "eu.szkolny.fslogin:lib:2.0.0"
@@ -180,7 +181,6 @@ dependencies {
     implementation "com.github.bassaer:chatmessageview:2.0.1"
     implementation "com.github.CanHub:Android-Image-Cropper:2.2.2"
     implementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
-    implementation "com.github.jetradarmobile:android-snowfall:1.2.0"
     implementation "com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31"
     implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } }
     implementation "com.hypertrack:hyperlog:0.0.10"

app/src/main/assets/pl-changelog.html

@@ -1,13 +1,7 @@
-<h3>Wersja 4.7, 2021-04-07</h3>
+<h3>Wersja 4.7.1, 2021-04-12</h3>
 <ul>
-    <li><u>Szkolny.eu jest teraz open source!</u> Zapraszamy na stronę <a href="https://szkolny.eu/">https://szkolny.eu/</a> po więcej ważnych informacji.</li>
-    <li>Poprawiono wybieranie obrazków (tła nagłówka, tła aplikacji oraz profilu) z dowolnego źródła.</li>
-    <li>Ukończono tłumaczenie na język angielski. @MarcinK50</li>
-    <li>Dodano ekran informacji o kompilacji w Ustawieniach.</li>
-    <li>Zaktualizowano ekran licencji open source.</li>
-    <li>Naprawiono zatrzymanie aplikacji na Androidzie 4.4 i starszych.</li>
-    <li>Naprawiono problemy z połączeniem internetowym na Androidzie 4.4 i starszych.</li>
-    <li>Zoptymalizowano wielkość aplikacji.</li>
+    <li>Poprawiono sprawdzanie dostępności e-dziennika.</li>
+    <li>Zmieniono datę w informacjach o aplikacji. @Luncenok</li>
 </ul>
 <br>
 <br>

app/src/main/cpp/szkolny-signing.cpp

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xda, 0x9f, 0xd4, 0x2b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0xcc, 0x64, 0xdb, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt

@@ -21,6 +21,7 @@ import androidx.lifecycle.Observer
 import androidx.navigation.NavOptions
 import com.danimahardhika.cafebar.CafeBar
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.jetradarmobile.snowfall.SnowfallView
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import com.mikepenz.iconics.utils.colorInt
@@ -81,12 +82,9 @@ import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsFragment
 import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
 import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment
-import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
-import pl.szczodrzynski.edziennik.utils.Themes
-import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.*
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.Utils.dpToPx
-import pl.szczodrzynski.edziennik.utils.appManagerIntentList
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.NavTarget
 import pl.szczodrzynski.navlib.*
@@ -470,9 +468,21 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
         // IT'S WINTER MY DUDES
         val today = Date.getToday()
-        if ((today.month == 12 || today.month == 1) && app.config.ui.snowfall) {
+        if ((today.month % 11 == 1) && app.config.ui.snowfall) {
             b.rootFrame.addView(layoutInflater.inflate(R.layout.snowfall, b.rootFrame, false))
         }
+        else if (app.config.ui.eggfall && BigNightUtil().isDataWielkanocyNearDzisiaj()) {
+            val eggfall = layoutInflater.inflate(R.layout.eggfall, b.rootFrame, false) as SnowfallView
+            eggfall.setSnowflakeBitmaps(listOf(
+                BitmapFactory.decodeResource(resources, R.drawable.egg1),
+                BitmapFactory.decodeResource(resources, R.drawable.egg2),
+                BitmapFactory.decodeResource(resources, R.drawable.egg3),
+                BitmapFactory.decodeResource(resources, R.drawable.egg4),
+                BitmapFactory.decodeResource(resources, R.drawable.egg5),
+                BitmapFactory.decodeResource(resources, R.drawable.egg6)
+            ))
+            b.rootFrame.addView(eggfall)
+        }
 
         // WHAT'S NEW DIALOG
         if (app.config.appVersion < BuildConfig.VERSION_CODE) {

app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt

@@ -6,6 +6,7 @@ package pl.szczodrzynski.edziennik.config
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.getIntList
 import pl.szczodrzynski.edziennik.config.utils.set
@@ -123,6 +124,19 @@ class ConfigSync(private val config: Config) {
 
     private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
     var registerAvailability: Map<String, RegisterAvailabilityStatus>
-        get() { mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it -> gson.fromJson<Map<String, RegisterAvailabilityStatus>>(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type) }; return mRegisterAvailability ?: mapOf() }
-        set(value) { config.setMap("registerAvailability", value); mRegisterAvailability = value }
+        get() {
+            val flavor = config.values.get("registerAvailabilityFlavor", null as String?)
+            if (BuildConfig.FLAVOR != flavor)
+                return mapOf()
+
+            mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it ->
+                gson.fromJson(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type)
+            }
+            return mRegisterAvailability ?: mapOf()
+        }
+        set(value) {
+            config.setMap("registerAvailability", value)
+            config.set("registerAvailabilityFlavor", BuildConfig.FLAVOR)
+            mRegisterAvailability = value
+        }
 }

app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt

@@ -49,6 +49,11 @@ class ConfigUI(private val config: Config) {
         get() { mSnowfall = mSnowfall ?: config.values.get("snowfall", false); return mSnowfall ?: false }
         set(value) { config.set("snowfall", value); mSnowfall = value }
 
+    private var mEggfall: Boolean? = null
+    var eggfall: Boolean
+        get() { mEggfall = mEggfall ?: config.values.get("eggfall", false); return mEggfall ?: false }
+        set(value) { config.set("eggfall", value); mEggfall = value }
+
     private var mBottomSheetOpened: Boolean? = null
     var bottomSheetOpened: Boolean
         get() { mBottomSheetOpened = mBottomSheetOpened ?: config.values.get("bottomSheetOpened", false); return mBottomSheetOpened ?: false }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt

@@ -46,6 +46,6 @@ object Signing {
 
     /*fun provideKey(param1: String, param2: Long): ByteArray {*/
     fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
-        return "$param1.MTIzNDU2Nzg5MDLPrcQX7M===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDXHhAtZBW===.$param2".sha256()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/PostNotifications.kt

@@ -8,6 +8,9 @@ import android.util.SparseIntArray
 import androidx.core.app.NotificationCompat
 import androidx.core.util.forEach
 import androidx.core.util.set
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.utils.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_SERVER_MESSAGE
 import pl.szczodrzynski.edziennik.utils.models.Time
@@ -107,6 +110,10 @@ class PostNotifications(val app: App, nList: List<AppNotification>) {
                     .setContentText(buildSummaryText(summaryCounts))
                     .setTicker(newNotificationsText)
                     .setSmallIcon(R.drawable.ic_notification)
+                    .setLargeIcon(IconicsDrawable(app).apply {
+                        icon = CommunityMaterial.Icon.cmd_bell_ring_outline
+                        colorRes = R.color.colorPrimary
+                    }.toBitmap())
                     .setStyle(NotificationCompat.InboxStyle()
                             .also {
                                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -137,6 +144,9 @@ class PostNotifications(val app: App, nList: List<AppNotification>) {
                         .setSubText(if (it.type == TYPE_SERVER_MESSAGE) null else it.title)
                         .setTicker("${it.profileName}: ${it.title}")
                         .setSmallIcon(R.drawable.ic_notification)
+                        .setLargeIcon(IconicsDrawable(app, it.getLargeIcon()).apply {
+                            colorRes = R.color.colorPrimary
+                        }.toBitmap())
                         .setStyle(NotificationCompat.BigTextStyle()
                                 .bigText(it.text))
                         .setWhen(it.addedDate)
@@ -160,6 +170,10 @@ class PostNotifications(val app: App, nList: List<AppNotification>) {
                         .setContentText(buildSummaryText(summaryCounts))
                         .setTicker(newNotificationsText)
                         .setSmallIcon(R.drawable.ic_notification)
+                        .setLargeIcon(IconicsDrawable(app).apply {
+                            icon = CommunityMaterial.Icon.cmd_bell_ring_outline
+                            colorRes = R.color.colorPrimary
+                        }.toBitmap())
                         .addDefaults()
                         .setGroupSummary(true)
                         .setContentIntent(summaryIntent)

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt

@@ -10,6 +10,8 @@ import android.content.Intent
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.google.gson.JsonObject
+import com.mikepenz.iconics.typeface.IIcon
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import pl.szczodrzynski.edziennik.MainActivity
 
 @Entity(tableName = "notifications")
@@ -96,4 +98,19 @@ data class Notification(
         fillIntent(intent)
         return PendingIntent.getActivity(context, id.toInt(), intent, PendingIntent.FLAG_ONE_SHOT)
     }
+
+    fun getLargeIcon(): IIcon = when (type) {
+        TYPE_TIMETABLE_LESSON_CHANGE -> CommunityMaterial.Icon3.cmd_timetable
+        TYPE_NEW_GRADE -> CommunityMaterial.Icon3.cmd_numeric_5_box_outline
+        TYPE_NEW_EVENT -> CommunityMaterial.Icon.cmd_calendar_outline
+        TYPE_NEW_HOMEWORK -> CommunityMaterial.Icon3.cmd_notebook_outline
+        TYPE_NEW_SHARED_EVENT -> CommunityMaterial.Icon.cmd_calendar_outline
+        TYPE_NEW_SHARED_HOMEWORK -> CommunityMaterial.Icon3.cmd_notebook_outline
+        TYPE_NEW_MESSAGE -> CommunityMaterial.Icon.cmd_email_outline
+        TYPE_NEW_NOTICE -> CommunityMaterial.Icon.cmd_emoticon_outline
+        TYPE_NEW_ATTENDANCE -> CommunityMaterial.Icon.cmd_calendar_remove_outline
+        TYPE_LUCKY_NUMBER -> CommunityMaterial.Icon.cmd_emoticon_excited_outline
+        TYPE_NEW_ANNOUNCEMENT -> CommunityMaterial.Icon.cmd_bullhorn_outline
+        else -> CommunityMaterial.Icon.cmd_bell_ring_outline
+    }
 }

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.kt

@@ -4,6 +4,8 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.utils.colorRes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -43,6 +45,10 @@ class NotificationsAdapter(
         val date = Date.fromMillis(item.addedDate).formattedString
         val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity)
 
+        b.notificationIcon.background = IconicsDrawable(app, item.getLargeIcon()).apply {
+            colorRes = R.color.colorPrimary
+        }
+
         b.title.text = item.text
         b.profileDate.text = listOf(
                 item.profileName ?: "",

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsThemeCard.kt

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.ui.dialogs.settings.MiniMenuConfigDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.ThemeChooserDialog
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsCard
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsUtil
+import pl.szczodrzynski.edziennik.utils.BigNightUtil
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -36,6 +37,18 @@ class SettingsThemeCard(util: SettingsUtil) : SettingsCard(util) {
             }
         else null,
 
+        if (BigNightUtil().isDataWielkanocyNearDzisiaj()) // cool klasa for utility to dzień wielkanocy
+            util.createPropertyItem(
+                text = R.string.settings_theme_eggfall_text,
+                subText = R.string.settings_theme_eggfall_subtext,
+                icon = CommunityMaterial.Icon.cmd_egg_easter,
+                value = configGlobal.ui.eggfall
+            ) { _, it ->
+                configGlobal.ui.eggfall = it
+                activity.recreate()
+            }
+        else null,
+
         util.createActionItem(
             text = R.string.settings_theme_theme_text,
             subText = Themes.getThemeNameRes(),

app/src/main/java/pl/szczodrzynski/edziennik/utils/BigNightUtil.kt

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-4-8.
+ */
+
+package pl.szczodrzynski.edziennik.utils
+
+import pl.szczodrzynski.edziennik.utils.models.Date
+import kotlin.math.absoluteValue
+
+// Obliczanie daty wielkanocy - algorytm Gaussa
+// www.algorytm.org
+// (c) 2008 by Tomasz Lubinski
+// http://www.algorytm.org/przetwarzanie-dat/wyznaczanie-daty-wielkanocy-algortym-gaussa/dwg-j.html
+
+class BigNightUtil {
+
+    /* Pobierz wartosc A z tabeli lat */
+    private fun getA(rok: Int) = when {
+        rok <= 1582 -> 15
+        rok <= 1699 -> 22
+        rok <= 1899 -> 23
+        rok <= 2199 -> 24
+        rok <= 2299 -> 25
+        rok <= 2399 -> 26
+        rok <= 2499 -> 25
+        else -> 0
+    }
+
+    /* Pobierz wartosc B z tabeli lat */
+    private fun getB(rok: Int) = when {
+        rok <= 1582 -> 6
+        rok <= 1699 -> 2
+        rok <= 1799 -> 3
+        rok <= 1899 -> 4
+        rok <= 2099 -> 5
+        rok <= 2199 -> 6
+        rok <= 2299 -> 0
+        rok <= 2499 -> 1
+        else -> 0
+    }
+
+    /* oblicz ile dni po 22 marca przypada wielkanoc */
+    private fun Oblicz_Date_wielkanocy(rok: Int): Int {
+        val a = rok % 19
+        val b = rok % 4
+        val c = rok % 7
+        var d = (a * 19 + getA(rok)) % 30
+        val e = (2 * b + 4 * c + 6 * d + getB(rok)) % 7
+        if (d == 29 && e == 6 || d == 28 && e == 6) {
+            d -= 7
+        }
+        return d + e
+    }
+
+    private fun get_dataOf_bigNight(): Date {
+        val date = Date.getToday()
+        date.month = 4
+        date.day = 22 + Oblicz_Date_wielkanocy(date.year)
+        if (date.day > 31)
+            date.day = date.day % 31
+        else
+            date.month = 3
+
+        return date
+    }
+
+    fun isDataWielkanocyNearDzisiaj() =
+        Date.diffDays(Date.getToday(), get_dataOf_bigNight()).absoluteValue < 7
+}

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Mateusz Idziejczak 2021-4-3.
+  -->
+
+<com.jetradarmobile.snowfall.SnowfallView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:snowflakeAlphaMax="250"
+    app:snowflakeAlphaMin="150"
+    app:snowflakeSizeMax="32dp"
+    app:snowflakeSizeMin="16dp"
+    app:snowflakesNum="70" />

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

@@ -9,12 +9,28 @@
         android:orientation="vertical"
         android:padding="8dp">
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/NavView.TextView.Medium"
-            tools:text="Dzisiaj 1 to szczęśliwy numerek" />
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <View
+                android:id="@+id/notificationIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:scaleType="centerInside"
+                tools:background="@android:drawable/ic_menu_more" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingLeft="8dp"
+                android:textAppearance="@style/NavView.TextView.Medium"
+                tools:text="Dzisiaj 1 to szczęśliwy numerek" />
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -856,7 +856,7 @@
     <string name="settings_about_licenses_text">Open-Source-Lizenzen</string>
     <string name="settings_about_privacy_policy_text">Datenschutzrichtlinie</string>
     <string name="settings_card_register_title">E-Klassenbuch</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - Februar 2021</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - April 2021</string>
     <string name="settings_about_update_subtext">Klicken Sie hier, um nach Aktualisierungen zu suchen</string>
     <string name="settings_about_update_text">Aktualisierung</string>
     <string name="settings_about_version_text">Version</string>
@@ -967,6 +967,8 @@
     <string name="settings_theme_open_drawer_on_back_pressed_text">Öffnen Sie das Menü mit der Zurück-Taste</string>
     <string name="settings_theme_snowfall_subtext">Schlittenfahrt im Schnee</string>
     <string name="settings_theme_snowfall_text">Jingle Bells, Jingle Bells</string>
+    <string name="settings_theme_eggfall_subtext">Brrrr</string>
+    <string name="settings_theme_eggfall_text">Bajo jajo, bajo jajo</string>
     <string name="settings_theme_theme_pink">Rosa</string>
     <string name="settings_theme_theme_system">System</string>
     <string name="settings_theme_theme_text">Thema</string>

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

@@ -858,7 +858,7 @@
     <string name="settings_about_licenses_text">Open-source licenses</string>
     <string name="settings_about_privacy_policy_text">Privacy policy</string>
     <string name="settings_card_register_title">E-register</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - February 2021</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - April 2021</string>
     <string name="settings_about_update_subtext">Click to check for updates</string>
     <string name="settings_about_update_text">Update</string>
     <string name="settings_about_version_text">Version</string>
@@ -969,6 +969,8 @@
     <string name="settings_theme_open_drawer_on_back_pressed_text">Back button opens drawer</string>
     <string name="settings_theme_snowfall_subtext">Jingle all the way</string>
     <string name="settings_theme_snowfall_text">Jingle bells, Jingle bells</string>
+    <string name="settings_theme_eggfall_subtext">Brrrr</string>
+    <string name="settings_theme_eggfall_text">Bajo jajo, bajo jajo</string>
     <string name="settings_theme_theme_pink">Pink</string>
     <string name="settings_theme_theme_system">System</string>
     <string name="settings_theme_theme_text">Theme</string>

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

@@ -921,7 +921,7 @@
     <string name="settings_about_licenses_text">Licencje open-source</string>
     <string name="settings_about_privacy_policy_text">Polityka prywatności</string>
     <string name="settings_card_register_title">E-dziennik</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nwrzesień 2018 - luty 2021</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nwrzesień 2018 - kwiecień 2021</string>
     <string name="settings_about_update_subtext">Kliknij, aby sprawdzić aktualizacje</string>
     <string name="settings_about_update_text">Aktualizacja</string>
     <string name="settings_about_version_text">Wersja</string>
@@ -1034,6 +1034,8 @@
     <string name="settings_theme_open_drawer_on_back_pressed_text">Otwieraj menu przyciskiem wstecz</string>
     <string name="settings_theme_snowfall_subtext">Dzwonią dzwonki sań</string>
     <string name="settings_theme_snowfall_text">Pada śnieg, pada śnieg</string>
+    <string name="settings_theme_eggfall_subtext">Brrrr</string>
+    <string name="settings_theme_eggfall_text">Bajo jajo, bajo jajo</string>
     <string name="settings_theme_theme_pink">Różowy</string>
     <string name="settings_theme_theme_system">Systemowy</string>
     <string name="settings_theme_theme_text">Motyw</string>

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.4.31'
 
         release = [
-                versionName: "4.7",
-                versionCode: 4070099
+                versionName: "4.7.1",
+                versionCode: 4070199
         ]
 
         setup = [