sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Merge branch 'release/2.0.3'

Browse Source
This commit is contained in:
Mikołaj Pich 2023-05-12 22:59:45 +02:00
commit d08f195968
13 changed files with 64 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/build.gradle
View File

@ -23,8 +23,8 @@ android {
testApplicationId "io.github.tests.wulkanowy"
minSdkVersion 21
targetSdkVersion 33
versionCode 124
versionName "2.0.2"
versionCode 125
versionName "2.0.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resValue "string", "app_name", "Wulkanowy"
@ -161,8 +161,8 @@ play {
defaultToAppBundles = false
track = 'production'
releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
userFraction = 0.10d
updatePriority = 2
userFraction = 0.50d
updatePriority = 3
enabled.set(false)
}
@ -182,11 +182,11 @@ ext {
room = "2.5.1"
chucker = "3.5.2"
mockk = "1.13.5"
coroutines = "1.6.4"
coroutines = "1.7.0"
}
dependencies {
implementation 'io.github.wulkanowy:sdk:2.0.1'
implementation 'io.github.wulkanowy:sdk:2.0.3'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
@ -206,7 +206,7 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
implementation "com.google.android.material:material:1.8.0"
implementation "com.google.android.material:material:1.9.0"
implementation "com.github.wulkanowy:material-chips-input:2.3.1"
implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
implementation 'com.github.lopspower:CircularImageView:4.3.0'
@ -242,7 +242,7 @@ dependencies {
implementation 'com.fredporciuncula:flow-preferences:1.9.1'
implementation 'org.apache.commons:commons-text:1.10.0'
playImplementation platform('com.google.firebase:firebase-bom:31.5.0')
playImplementation platform('com.google.firebase:firebase-bom:32.0.0')
playImplementation 'com.google.firebase:firebase-analytics-ktx'
playImplementation 'com.google.firebase:firebase-messaging:'
playImplementation 'com.google.firebase:firebase-crashlytics:'
@ -265,7 +265,7 @@ dependencies {
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testImplementation 'org.robolectric:robolectric:4.10'
testImplementation 'org.robolectric:robolectric:4.10.2'
testImplementation "androidx.test:runner:1.5.2"
testImplementation "androidx.test.ext:junit:1.1.5"
testImplementation "androidx.test:core:1.5.0"

5
app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
View File

@ -738,8 +738,8 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
val context = adminMessageViewHolder.binding.root.context
val (backgroundColor, textColor) = when (item.priority) {
"HIGH" -> {
context.getThemeAttrColor(R.attr.colorPrimary) to
context.getThemeAttrColor(R.attr.colorOnPrimary)
context.getThemeAttrColor(R.attr.colorMessageHigh) to
context.getThemeAttrColor(R.attr.colorOnMessageHigh)
}
"MEDIUM" -> {
context.getThemeAttrColor(R.attr.colorMessageMedium) to Color.BLACK
@ -754,6 +754,7 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
dashboardAdminMessageItemDescription.setTextColor(textColor)
dashboardAdminMessageItemIcon.setColorFilter(textColor)
dashboardAdminMessageItemDismiss.isVisible = item.isDismissible
dashboardAdminMessageItemDismiss.setTextColor(textColor)
dashboardAdminMessageItemDismiss.setOnClickListener {
onAdminMessageDismissClickListener(item)
}

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

@ -1,4 +1,4 @@
Wersja 2.0.2
Wersja 2.0.3
— zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
— dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym

14
app/src/main/res/values-cs/strings.xml
View File

@ -810,14 +810,14 @@
<string name="menu_order_confirm_content">Pro uložení změn je nutné aplikaci restartovat</string>
<string name="menu_order_confirm_restart">Restartovat</string>
<!--Auth-->
<string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
<string name="auth_invalid_error">Invalid PESEL</string>
<string name="auth_api_error">Autorizace byla zamítnuta. Uvedené údaje se neshodují se záznamy v kanceláři tajemníka.</string>
<string name="auth_invalid_error">Neplatný PESEL</string>
<string name="auth_pesel">PESEL</string>
<string name="auth_button">Authorize</string>
<string name="auth_success">Authorization completed successfully</string>
<string name="auth_title">Authorization</string>
<string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
<string name="auth_button_skip">Skip for now</string>
<string name="auth_button">Autorizovat</string>
<string name="auth_success">Autorizace byla úspěšně dokončena</string>
<string name="auth_title">Autorizace</string>
<string name="auth_description">Pro provoz aplikace potřebujeme potvrdit vaši identitu. Zadejte PESEL žáka &lt;b&gt;%1$s&lt;/b&gt; v níže uvedeném poli</string>
<string name="auth_button_skip">Zatím přeskočit</string>
<!--Errors-->
<string name="error_no_internet">Žádné internetové připojení</string>
<string name="error_invalid_device_datetime">Vyskytla se chyba. Zkontrolujte hodiny svého zařízení</string>

36
app/src/main/res/values-de/strings.xml
View File

@ -26,7 +26,7 @@
<string name="student_info_title">Schülerinfo</string>
<string name="dashboard_title">Übersicht</string>
<string name="notifications_center_title">Benachrichtigungszentrum</string>
<string name="menu_order_title">Menu configuartion</string>
<string name="menu_order_title">Menü Konfiguration</string>
<!--Subtitles-->
<string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
<!--Login-->
@ -56,7 +56,7 @@
<string name="login_invalid_symbol">Ungültige symbol</string>
<string name="login_incorrect_symbol">Schüler nicht gefunden. Überprüfen Sie das Symbol und die gewählte Variation des UONET+ Registers</string>
<string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
<string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
<string name="login_symbol_helper">Das Symbol kann auf der Registerseite in&#160;<b>Student </b>→&#160;<b>Tost Möbeln</b> →&#160;<b>Registrieren Sie Ihr Mobilgerät</b>gefunden werden.\n\nStellen Sie sicher, dass Sie die entsprechende Registervariante im Feld <b>UONET+ Registervariante</b> auf dem vorherigen Bildschirm festgelegt haben</string>
<string name="login_select_student">Wählen Sie die Studenten aus, die sich bei der Anwendung anmelden sollen</string>
<string name="login_advanced">Andere Optionen</string>
<string name="login_advanced_warning_mobile_api">In diesem Modus funktioniert eine Glücknummer, eine Klassenstatistik, eine Zusammenfassung der Anwesenheit, eine Entschuldigung für die Abwesenheit, abgeschlossene Lektionen, Schulinformationen und eine Vorschau der Liste der registrierten Geräte nicht</string>
@ -73,14 +73,14 @@
<string name="login_recover">Wiederherstellen</string>
<string name="login_signed_in">Student ist bereits angemeldet</string>
<string name="login_host_standard">Standard</string>
<string name="login_other_search_locations">Other search locations</string>
<string name="login_no_active_student">No active students found</string>
<string name="login_symbol_enter">Enter a different symbol</string>
<string name="login_other_search_locations">Andere Suchorte</string>
<string name="login_no_active_student">Keine aktiven Schüler gefunden</string>
<string name="login_symbol_enter">Geben Sie ein anderes Symbol ein</string>
<!--Notifications-->
<string name="notifications_header_title">Enable notifications</string>
<string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
<string name="notifications_skip">Skip</string>
<string name="notifications_enable">Enable</string>
<string name="notifications_header_title">Benachrichtigungen aktivieren</string>
<string name="notifications_header_description">Aktivieren Sie Benachrichtigungen, damit Sie keine Nachricht vom Lehrer oder eine neue Klasse verpassen</string>
<string name="notifications_skip">Überspringen</string>
<string name="notifications_enable">Ermöglichen</string>
<!--Main-->
<string name="main_account_picker">Kundenbetreuer</string>
<string name="main_log_in">Anmelden</string>
@ -288,7 +288,7 @@
<string name="message_chip_only_unread">Nur ungelesen</string>
<string name="message_chip_only_with_attachments">Nur mit Anhängen</string>
<string name="message_read">Lesen: %s</string>
<string name="message_read_by">Read by: %1$d of %2$d people</string>
<string name="message_read_by">Lesen von: %1$d von %2$d Personen</string>
<plurals name="message_number_item">
<item quantity="one">%1$d Nachricht</item>
<item quantity="other">%1$d Nachrichten</item>
@ -422,8 +422,8 @@
</plurals>
<string name="conferences_present">Teilnahme an einem Meeting</string>
<string name="conference_agenda">Agenda</string>
<string name="conference_place">Place</string>
<string name="conference_topic">Topic</string>
<string name="conference_place">Ort</string>
<string name="conference_topic">Thema</string>
<!--Director information-->
<string name="school_announcement_title">Schulankündigungen</string>
<string name="school_announcement_no_items">Keine schulankündigungen</string>
@ -591,10 +591,10 @@
<string name="all_undo">lösen</string>
<string name="all_change">Ändern</string>
<string name="all_add_to_calendar">Zum Kalender hinzufügen</string>
<string name="all_cancel">Cancel</string>
<string name="all_cancel">Stornieren</string>
<!--Timetable Widget-->
<string name="widget_timetable_no_items">Keine Lektionen</string>
<string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
<string name="widget_timetable_last_synchronization">Synchronisiert am %1$s am %2$s</string>
<string name="widget_timetable_theme_title">Thema wählen</string>
<string name="widget_timetable_theme_light">Licht</string>
<string name="widget_timetable_theme_dark">Dunkel</string>
@ -614,8 +614,8 @@
<string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
<string name="pref_view_grade_sorting_mode">Schulfachen sortieren</string>
<string name="pref_view_app_language">Sprache</string>
<string name="pref_view_menu_order_title">Menu configuration</string>
<string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
<string name="pref_view_menu_order_title">Menü Konfiguration</string>
<string name="pref_view_menu_order_summary">Legen Sie die Reihenfolge der Funktionen im Menü fest</string>
<string name="pref_notify_header">Benachrichtigungen</string>
<string name="pref_notify_header_other">Sonstiges</string>
<string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
@ -718,8 +718,8 @@
<string name="update_download_success_button">Neustart</string>
<string name="update_failed">Update fehlgeschlagen! Wulkanowy funktioniert möglicherweise nicht richtig. Überlegen Sie die Aktualisierung</string>
<!--Menu order-->
<string name="menu_order_confirm_title">Application restart</string>
<string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
<string name="menu_order_confirm_title">Neustart der Anwendung</string>
<string name="menu_order_confirm_content">Die Anwendung muss neu gestartet werden, damit die Änderungen gespeichert werden</string>
<string name="menu_order_confirm_restart">Restart</string>
<!--Auth-->
<string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>

4
app/src/main/res/values-night-v31/styles.xml
View File

@ -35,7 +35,9 @@
<item name="colorError">@color/colorErrorLight</item>
<item name="colorDivider">@color/colorDividerInverse</item>
<item name="colorSwipeRefresh">@color/material_dynamic_secondary20</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
<item name="colorMessageHigh">@color/dashboard_message_high_dark</item>
<item name="colorOnMessageHigh">@android:color/black</item>
<item name="android:windowBackground">?colorSurface</item>
<item name="android:textColor">@color/material_dynamic_neutral90</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

4
app/src/main/res/values-night/styles.xml
View File

@ -24,7 +24,9 @@
<item name="colorError">@color/colorErrorLight</item>
<item name="colorDivider">@color/colorDividerInverse</item>
<item name="colorSwipeRefresh">@color/colorSwipeRefreshDark</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
<item name="colorMessageHigh">@color/dashboard_message_high_dark</item>
<item name="colorOnMessageHigh">@android:color/black</item>
<item name="android:windowBackground">?colorSurface</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:navigationBarColor">@color/colorNavigationBarDark</item>

14
app/src/main/res/values-sk/strings.xml
View File

@ -810,14 +810,14 @@
<string name="menu_order_confirm_content">Pre uloženie zmien je nutné aplikáciu reštartovať</string>
<string name="menu_order_confirm_restart">Reštartovať</string>
<!--Auth-->
<string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
<string name="auth_invalid_error">Invalid PESEL</string>
<string name="auth_api_error">Autorizácia bola zamietnutá. Uvedené údaje sa nezhodujú so záznamami v kancelárii tajomníka.</string>
<string name="auth_invalid_error">Neplatný PESEL</string>
<string name="auth_pesel">PESEL</string>
<string name="auth_button">Authorize</string>
<string name="auth_success">Authorization completed successfully</string>
<string name="auth_title">Authorization</string>
<string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
<string name="auth_button_skip">Skip for now</string>
<string name="auth_button">Autorizovať</string>
<string name="auth_success">Autorizácia bola úspešne dokončená</string>
<string name="auth_title">Autorizácia</string>
<string name="auth_description">Na prevádzku aplikácie potrebujeme potvrdiť vašu identitu. Zadajte PESEL žiaka &lt;b&gt;%1$s&lt;/b&gt; v nižšie uvedenom poli</string>
<string name="auth_button_skip">Zatiaľ preskočiť</string>
<!--Errors-->
<string name="error_no_internet">Žiadne internetové pripojenie</string>
<string name="error_invalid_device_datetime">Vyskytla sa chyba. Skontrolujte hodiny svojho zariadenia</string>

4
app/src/main/res/values-v31/styles.xml
View File

@ -37,7 +37,9 @@
<item name="colorError">@color/colorError</item>
<item name="colorDivider">@color/colorDivider</item>
<item name="colorSwipeRefresh">@color/material_dynamic_secondary90</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
<item name="colorMessageHigh">@color/dashboard_message_high_light</item>
<item name="colorOnMessageHigh">@android:color/white</item>
<item name="android:textColor">@color/material_dynamic_neutral10</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">@android:color/transparent</item>

2
app/src/main/res/values/attrs.xml
View File

@ -5,4 +5,6 @@
<attr name="colorTimetableCanceled" format="color" />
<attr name="colorTimetableChange" format="color" />
<attr name="colorMessageMedium" format="color" />
<attr name="colorMessageHigh" format="color" />
<attr name="colorOnMessageHigh" format="color" />
</resources>

6
app/src/main/res/values/colors.xml
View File

@ -39,8 +39,10 @@
<color name="colorStatusBarDark">#342826</color>
<color name="colorStatusBarBlack">#181010</color>
<color name="dashboard_message_medium_light">#FFD980</color>
<color name="dashboard_message_medium_dark">#ffd54f</color>
<color name="dashboard_message_medium_light">#ffd54f</color>
<color name="dashboard_message_medium_dark">#FFD980</color>
<color name="dashboard_message_high_light">#B91B21</color>
<color name="dashboard_message_high_dark">#e57373</color>
<color name="timetable_canceled_light">#d32f2f</color>
<color name="timetable_canceled_dark">#e57373</color>

4
app/src/main/res/values/styles.xml
View File

@ -22,7 +22,9 @@
<item name="colorError">@color/colorError</item>
<item name="colorDivider">@color/colorDivider</item>
<item name="colorSwipeRefresh">@color/colorSwipeRefresh</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
<item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
<item name="colorMessageHigh">@color/dashboard_message_high_light</item>
<item name="colorOnMessageHigh">@android:color/white</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>

2
build.gradle
View File

@ -1,7 +1,7 @@
buildscript {
ext {
kotlin_version = '1.8.21'
about_libraries = '10.6.2'
about_libraries = '10.6.3'
hilt_version = "2.45"
}
repositories {