github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-06-13 14:10:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v2

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2019-10-03 21:07:17 +02:00
parent 4c6b467847 57a70aa777
commit 48a2ae3599
268 changed files with 3573 additions and 2962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/messages_compose_activity.xml → app/src/main/res/layout/activity_compose_message.xml
View File

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".messages.MessagesComposeActivity">
tools:context=".ui.modules.messages.MessagesComposeActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@ -67,4 +67,4 @@
</FrameLayout>
</LinearLayout>
</layout>
</layout>

4
app/src/main/res/layout/activity_feedback.xml
View File

@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".activities.FeedbackActivity">
tools:context=".ui.modules.feedback.FeedbackActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@ -147,4 +147,4 @@
</LinearLayout>
</LinearLayout>
</layout>
</layout>

229
app/src/main/res/layout/activity_web_push_config.xml
View File

@ -17,147 +17,154 @@
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
<LinearLayout
<ScrollView
android:id="@+id/webPushConfig"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/textView8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:text="Przekazywanie powiadomień pozwala przesyłać wszystkie powiadomienia z tego urządzenia na wszystkie sparowane komputery, widoczne poniżej.\n\nPowiadomienia będą się wyświetlać w przeglądarce, w okienku pop-up, w prawym dolnym rogu ekranu.\n\nLista komputerów docelowych jest niezależna od wybranego profilu ucznia." />
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="@dimen/section_margin_top"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/web_push_configured_browsers"
android:textAllCaps="true"
android:textColor="?attr/colorSection"
android:textStyle="bold" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/section_underline_height"
android:layout_marginTop="2dp"
android:background="?attr/colorSection" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableLayout
android:id="@+id/browserList"
android:id="@+id/textView8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:shrinkColumns="0"
android:stretchColumns="0">
android:text="Przekazywanie powiadomień pozwala przesyłać wszystkie powiadomienia z tego urządzenia na wszystkie sparowane komputery, widoczne poniżej.\n\nPowiadomienia będą się wyświetlać w przeglądarce, w okienku pop-up, w prawym dolnym rogu ekranu.\n\nLista komputerów docelowych jest niezależna od wybranego profilu ucznia." />
<!--<TableRow
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="@dimen/section_margin_top"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="end">
android:layout_height="wrap_content"
android:text="@string/web_push_configured_browsers"
android:textAllCaps="true"
android:textColor="?attr/colorSection"
android:textStyle="bold" />
<TextView
<View
android:layout_width="match_parent"
android:layout_height="@dimen/section_underline_height"
android:layout_marginTop="2dp"
android:background="?attr/colorSection" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableLayout
android:id="@+id/browserList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:shrinkColumns="0"
android:stretchColumns="0">
<!--<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="8dp"
android:gravity="center_vertical"
android:text="Chrome 70.0.3538.102 @ Windows 7 64-bit" />
android:gravity="end">
<Button
android:id="@+id/button6"
style="@style/Widget.AppCompat.Button.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="0dp"
android:minWidth="0dp"
android:text="Usuń" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="8dp"
android:gravity="center_vertical"
android:text="Chrome 70.0.3538.102 @ Windows 7 64-bit" />
</TableRow>-->
<Button
android:id="@+id/button6"
style="@style/Widget.AppCompat.Button.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="0dp"
android:minWidth="0dp"
android:text="Usuń" />
</TableLayout>
</TableRow>-->
<ProgressBar
android:id="@+id/browserListProgressBar"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible" />
</TableLayout>
<TextView
android:id="@+id/browserListErrorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="18sp"
android:textStyle="italic"
android:visibility="visible"
android:text="@string/web_push_no_browsers" />
<ProgressBar
android:id="@+id/browserListProgressBar"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible" />
</FrameLayout>
<TextView
android:id="@+id/browserListErrorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="18sp"
android:textStyle="italic"
android:visibility="visible"
android:text="@string/web_push_no_browsers" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="@dimen/section_margin_top"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:orientation="vertical">
</FrameLayout>
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/web_push_pair_browser"
android:textAllCaps="true"
android:textColor="?attr/colorSection"
android:textStyle="bold" />
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="@dimen/section_margin_top"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:orientation="vertical">
<View
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/web_push_pair_browser"
android:textAllCaps="true"
android:textColor="?attr/colorSection"
android:textStyle="bold" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/section_underline_height"
android:layout_marginTop="2dp"
android:background="?attr/colorSection" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/section_underline_height"
android:layout_marginTop="2dp"
android:background="?attr/colorSection" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="8dp"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="W przeglądarce na komputerze wejdź na stronę\n\nhttp://edziennik.szczodrzynski.pl/wp\n\nUdziel zgody na wysyłanie powiadomień, następnie zeskanuj wygenerowany kod QR.\n\nPod tym samym adresem możesz zarządzać listą sparowanych z przeglądarką urządzeń.\n\nJeśli sparujesz kilka urządzeń z tą samą przeglądarką, możesz otrzymywać te same powiadomienia kilkukrotnie." />
<Button
android:id="@+id/webPushScanNewButton"
style="@style/Widget.AppCompat.Button.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Skanuj..." />
</LinearLayout>
android:layout_margin="8dp"
android:orientation="vertical">
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:text="W przeglądarce na komputerze wejdź na stronę\n\nhttp://edziennik.szczodrzynski.pl/wp\n\nUdziel zgody na wysyłanie powiadomień, następnie zeskanuj wygenerowany kod QR.\n\nPod tym samym adresem możesz zarządzać listą sparowanych z przeglądarką urządzeń.\n\nJeśli sparujesz kilka urządzeń z tą samą przeglądarką, możesz otrzymywać te same powiadomienia kilkukrotnie." />
<Button
android:id="@+id/webPushScanNewButton"
style="@style/Widget.AppCompat.Button.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="Skanuj..." />
</LinearLayout>
</LinearLayout>
</ScrollView>
<me.dm7.barcodescanner.zxing.ZXingScannerView
android:id="@+id/qrCodeScanner"
@ -168,4 +175,4 @@
</me.dm7.barcodescanner.zxing.ZXingScannerView>
</LinearLayout>
</layout>
</layout>

4
app/src/main/res/layout/agenda_event_lesson_change.xml
View File

@ -9,8 +9,8 @@
<include
layout="@layout/row_dialog_lesson_change_item"
layout="@layout/row_lesson_change_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />
</com.github.tibolte.agendacalendarview.agenda.AgendaEventView>
</com.github.tibolte.agendacalendarview.agenda.AgendaEventView>

14
app/src/main/res/layout/agenda_event_teacher_absence.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<com.github.tibolte.agendacalendarview.agenda.AgendaEventView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<include
layout="@layout/row_teacher_absence_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />
</com.github.tibolte.agendacalendarview.agenda.AgendaEventView>

87
app/src/main/res/layout/dialog_event_list.xml
View File

@ -1,25 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:id="@+id/detailsLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="match_parent"
android:orientation="vertical">
<include
android:id="@+id/lesson_change_container"
layout="@layout/row_dialog_lesson_change_item"
android:id="@+id/lessonChangeContainer"
layout="@layout/row_lesson_change_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:visibility="gone"
tools:visibility="visible" />
<include
android:id="@+id/teacherAbsenceContainer"
layout="@layout/row_teacher_absence_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:visibility="gone"
tools:visibility="visible" />
@ -27,6 +40,8 @@
android:id="@+id/eventListLessonDetails"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:orientation="vertical">
<TextView
@ -57,34 +72,28 @@
tools:text="029 informatyczna -> 016 językowa" />
</LinearLayout>
<TextView
android:id="@+id/textNoEvents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="32dp"
android:text="@string/dialog_event_list_no_data"
android:textStyle="italic"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/eventListView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:clipToPadding="false"
android:paddingLeft="24dp"
android:paddingTop="8dp"
android:paddingRight="24dp"
android:paddingBottom="8dp"
tools:listitem="@layout/row_dialog_event_list_item" />
</LinearLayout>
<TextView
android:id="@+id/textNoEvents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="@string/dialog_event_list_no_data"
android:textStyle="italic"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/detailsLayout" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/eventListView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/detailsLayout"
tools:listitem="@layout/row_dialog_event_list_item">
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

6
app/src/main/res/layout/dialog_grade_details.xml
View File

@ -5,11 +5,11 @@
<data>
<import type="android.view.View"/>
<import type="pl.szczodrzynski.edziennik.utils.Utils"/>
<import type="pl.szczodrzynski.edziennik.models.Date"/>
<import type="pl.szczodrzynski.edziennik.models.Time"/>
<import type="pl.szczodrzynski.edziennik.utils.models.Date"/>
<import type="pl.szczodrzynski.edziennik.utils.models.Time"/>
<variable
name="grade"
type="pl.szczodrzynski.edziennik.datamodels.GradeFull" />
type="pl.szczodrzynski.edziennik.data.db.modules.grades.GradeFull" />
<variable
name="historyVisible"
type="boolean" />

19
app/src/main/res/layout/dialog_lesson_change_list.xml
View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/lessonChangeView"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/row_timetable_item" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/lessonChangeView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:clipToPadding="false"
tools:listitem="@layout/row_timetable_item" />
</layout>

15
app/src/main/res/layout/dialog_teacher_absence_list.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/teacherAbsenceView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:clipToPadding="false"
tools:listitem="@layout/row_dialog_teacher_absence_item" />
</layout>

0
app/src/main/res/layout/fragment_register_agenda_calendar.xml → app/src/main/res/layout/fragment_agenda_calendar.xml
View File

0
app/src/main/res/layout/fragment_register_agenda_default.xml → app/src/main/res/layout/fragment_agenda_default.xml
View File

0
app/src/main/res/layout/fragment_register_school_notices.xml → app/src/main/res/layout/fragment_announcements.xml
View File

10
app/src/main/res/layout/fragment_register_attendances.xml → app/src/main/res/layout/fragment_attendance.xml
View File

@ -27,7 +27,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/attendancesSummaryTitle"
android:id="@+id/attendanceSummaryTitle"
style="@style/Widget.AppCompat.Spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -36,7 +36,7 @@
android:textSize="20sp" />
<TextView
android:id="@+id/attendancesSummarySubject"
android:id="@+id/attendanceSummarySubject"
style="@style/Widget.AppCompat.Spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -168,7 +168,7 @@
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attendancesView"
android:id="@+id/attendance_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
@ -177,7 +177,7 @@
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:id="@+id/attendancesNoData"
android:id="@+id/attendance_no_data"
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="center"
@ -206,4 +206,4 @@
</FrameLayout>
</LinearLayout>
</pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
</layout>
</layout>

0
app/src/main/res/layout/fragment_register_notices.xml → app/src/main/res/layout/fragment_behaviour.xml
View File

2
app/src/main/res/layout/fragment_debug.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragments.DebugFragment">
tools:context=".ui.modules.base.DebugFragment">
<!-- TODO: Update blank fragment layout -->
<com.google.android.material.textfield.TextInputLayout

0
app/src/main/res/layout/fragment_register_grades.xml → app/src/main/res/layout/fragment_grades.xml
View File

4
app/src/main/res/layout/fragment_home.xml
View File

@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:context=".fragments.HomeFragment">
tools:context=".ui.modules.home.HomeFragment">
<LinearLayout
android:id="@+id/cardInsertPoint"
@ -88,4 +88,4 @@
</LinearLayout>
</ScrollView>
</pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
</layout>
</layout>

34
app/src/main/res/layout/fragment_homework.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<layout 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">
<pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorSurface_6dp"
app:tabIndicatorColor="?colorPrimary"
app:tabMode="auto"
app:tabSelectedTextColor="?colorPrimary"
app:tabTextColor="?android:textColorPrimary" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</LinearLayout>
</pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
</layout>

0
app/src/main/res/layout/fragment_register_messages_web.xml → app/src/main/res/layout/fragment_messages_web.xml
View File

0
app/src/main/res/layout/fragment_register_notifications.xml → app/src/main/res/layout/fragment_notifications.xml
View File

121
app/src/main/res/layout/fragment_register_homeworks.xml
View File

@ -1,121 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:fontFamily="sans-serif-medium"
android:text="@string/homework_current_title"
android:textSize="20sp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:layout_weight="2">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/homeworksCurrentView"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:id="@+id/homeworksCurrentNoData"
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="center"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible">
<com.mikepenz.iconics.view.IconicsImageView
android:layout_width="match_parent"
android:layout_height="92dp"
app:iiv_color="?android:textColorPrimary"
app:iiv_icon="szf-file-document-edit"
app:iiv_size="92dp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:text="@string/homework_current_no_data"
android:textSize="18sp"
android:textStyle="italic" />
</LinearLayout>
</FrameLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:fontFamily="sans-serif-medium"
android:text="@string/homework_past_title"
android:textSize="20sp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:layout_weight="3">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/homeworksPastView"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:id="@+id/homeworksPastNoData"
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="center"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible">
<com.mikepenz.iconics.view.IconicsImageView
android:layout_width="match_parent"
android:layout_height="92dp"
app:iiv_color="?android:textColorPrimary"
app:iiv_icon="szf-file-document-edit"
app:iiv_size="92dp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:text="@string/homework_past_no_data"
android:textSize="18sp"
android:textStyle="italic" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
</layout>

0
app/src/main/res/layout/fragment_register_timetable.xml → app/src/main/res/layout/fragment_timetable.xml
View File

0
app/src/main/res/layout/fragment_register_timetable_day.xml → app/src/main/res/layout/fragment_timetable_day.xml
View File

47
app/src/main/res/layout/homework_list.xml Normal file
View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/homeworkView"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:id="@+id/homeworkNoData"
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="center"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible">
<com.mikepenz.iconics.view.IconicsImageView
android:layout_width="match_parent"
android:layout_height="92dp"
app:iiv_color="?android:textColorPrimary"
app:iiv_icon="szf-file-document-edit"
app:iiv_size="92dp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:text="@string/homework_no_data"
android:textSize="18sp"
android:textStyle="italic" />
</LinearLayout>
</LinearLayout>
</layout>

22
app/src/main/res/layout/messages_list.xml
View File

@ -5,20 +5,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
android:id="@+id/refreshLayout"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/emailList"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/emailList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:transitionGroup="false"
tools:listitem="@layout/messages_item"
tools:targetApi="lollipop" />
</pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
android:layout_height="match_parent"
android:clipChildren="false"
android:transitionGroup="false"
tools:listitem="@layout/messages_item"
tools:targetApi="lollipop" />
<ProgressBar
android:id="@+id/progressBar"
@ -26,4 +20,4 @@
android:layout_height="wrap_content"
android:layout_gravity="center"/>
</FrameLayout>
</layout>
</layout>

41
app/src/main/res/layout/row_dialog_teacher_absence_item.xml Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
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:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp"
android:background="?selectableItemBackground"
app:cardCornerRadius="5dp"
app:cardElevation="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/teacherAbsenceTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/NavView.TextView.Helper"
tools:text="2 września - 5 kwietnia"/>
<TextView
android:id="@+id/teacherAbsenceTeacher"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Jan Kowalski"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>

16
app/src/main/res/layout/row_homeworks_item.xml → app/src/main/res/layout/row_homework_item.xml
View File

@ -7,7 +7,7 @@
android:orientation="vertical">
<com.google.android.material.card.MaterialCardView
android:id="@+id/homeworksItemCard"
android:id="@+id/homeworkItemCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
@ -31,7 +31,7 @@
android:orientation="horizontal">
<TextView
android:id="@+id/homeworksItemHomeworkDate"
android:id="@+id/homeworkItemHomeworkDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
@ -41,7 +41,7 @@
android:layout_marginEnd="16dp" />
<com.mikepenz.iconics.view.IconicsTextView
android:id="@+id/homeworksItemSharedBy"
android:id="@+id/homeworkItemSharedBy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -61,7 +61,7 @@
android:orientation="horizontal">
<TextView
android:id="@+id/homeworksItemTopic"
android:id="@+id/homeworkItemTopic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -72,7 +72,7 @@
tools:text="topic???" />
<com.google.android.material.button.MaterialButton
android:id="@+id/homeworksItemEdit"
android:id="@+id/homeworkItemEdit"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -89,7 +89,7 @@
android:orientation="horizontal">
<TextView
android:id="@+id/homeworksItemSubjectTeacher"
android:id="@+id/homeworkItemSubjectTeacher"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="8dp"
@ -100,7 +100,7 @@
tools:text="subjectName, teacherName" />
<TextView
android:id="@+id/homeworksItemTeamDate"
android:id="@+id/homeworkItemTeamDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
@ -110,4 +110,4 @@
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
</LinearLayout>

6
app/src/main/res/layout/row_dialog_lesson_change_item.xml → app/src/main/res/layout/row_lesson_change_item.xml
View File

@ -1,7 +1,7 @@
<androidx.cardview.widget.CardView android:id="@+id/lesson_change_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:cardBackgroundColor="@color/blue_selected"
tools:cardBackgroundColor="#78909c"
app:cardCornerRadius="5dp"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
@ -23,7 +23,7 @@
android:text="@string/agenda_lesson_changes" />
<TextView
android:id="@+id/lesson_change_count"
android:id="@+id/lessonChangeCount"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
@ -32,4 +32,4 @@
</LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.cardview.widget.CardView>

35
app/src/main/res/layout/row_teacher_absence_item.xml Normal file
View File

@ -0,0 +1,35 @@
<androidx.cardview.widget.CardView android:id="@+id/teacherAbsenceCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:cardBackgroundColor="#ff1744"
app:cardCornerRadius="5dp"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<TextView
android:id="@+id/teacherAbsenceText"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:textAppearance="@style/NavView.TextView.Medium"
android:text="@string/agenda_teacher_absence" />
<TextView
android:id="@+id/teacherAbsenceCount"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:textSize="20sp"
tools:text="3" />
</LinearLayout>
</androidx.cardview.widget.CardView>

34
app/src/main/res/navigation/nav_login.xml
View File

@ -6,7 +6,7 @@
<fragment
android:id="@+id/loginChooserFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginChooserFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserFragment"
android:label="fragment_login_type"
tools:layout="@layout/fragment_login_chooser" >
<action
@ -27,7 +27,7 @@
</fragment>
<fragment
android:id="@+id/loginMobidziennikFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginMobidziennikFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMobidziennikFragment"
android:label="fragment_login_mobidziennik"
tools:layout="@layout/fragment_login_mobidziennik" >
<action
@ -39,7 +39,7 @@
</fragment>
<fragment
android:id="@+id/loginLibrusFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginLibrusFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginLibrusFragment"
android:label="fragment_login_librus"
tools:layout="@layout/fragment_login_librus" >
<action
@ -51,7 +51,7 @@
</fragment>
<fragment
android:id="@+id/loginProgressFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginProgressFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginProgressFragment"
android:label="fragment_login_progress"
tools:layout="@layout/fragment_login_progress" >
<action
@ -60,17 +60,17 @@
</fragment>
<fragment
android:id="@+id/loginMobidziennikHelpFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginMobidziennikHelpFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMobidziennikHelpFragment"
android:label="fragment_login_mobidziennik_help"
tools:layout="@layout/fragment_login_mobidziennik_help" />
<fragment
android:id="@+id/loginLibrusHelpFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginLibrusHelpFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginLibrusHelpFragment"
android:label="fragment_login_librus_help"
tools:layout="@layout/fragment_login_librus_help" />
<fragment
android:id="@+id/loginSummaryFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginSummaryFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSummaryFragment"
android:label="fragment_login_summary"
tools:layout="@layout/fragment_login_summary" >
<action
@ -82,7 +82,7 @@
</fragment>
<fragment
android:id="@+id/loginSyncFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginSyncFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSyncFragment"
android:label="fragment_login_sync"
tools:layout="@layout/fragment_login_sync" >
<action
@ -94,7 +94,7 @@
</fragment>
<fragment
android:id="@+id/loginIuczniowieFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginIuczniowieFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginIuczniowieFragment"
android:label="fragment_login_iuczniowie"
tools:layout="@layout/fragment_login_iuczniowie" >
<action
@ -106,7 +106,7 @@
</fragment>
<fragment
android:id="@+id/loginVulcanFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginVulcanFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginVulcanFragment"
android:label="fragment_login_vulcan"
tools:layout="@layout/fragment_login_vulcan" >
<action
@ -118,22 +118,22 @@
</fragment>
<fragment
android:id="@+id/loginVulcanHelpFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginVulcanHelpFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginVulcanHelpFragment"
android:label="fragment_login_vulcan_help"
tools:layout="@layout/fragment_login_vulcan_help" />
<fragment
android:id="@+id/loginIuczniowieHelpFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginIuczniowieHelpFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginIuczniowieHelpFragment"
android:label="fragment_login_iuczniowie_help"
tools:layout="@layout/fragment_login_iuczniowie_help" />
<fragment
android:id="@+id/loginFinishFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginFinishFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginFinishFragment"
android:label="fragment_login_finish"
tools:layout="@layout/fragment_login_finish" />
<fragment
android:id="@+id/loginMigrationFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginMigrationFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMigrationFragment"
android:label="fragment_login_migration"
tools:layout="@layout/fragment_login_migration" >
<action
@ -142,16 +142,16 @@
</fragment>
<fragment
android:id="@+id/loginMigrationSyncFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginMigrationSyncFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMigrationSyncFragment"
android:label="fragment_login_migration_sync"
tools:layout="@layout/fragment_login_migration_sync" />
<fragment
android:id="@+id/loginSyncErrorFragment"
android:name="pl.szczodrzynski.edziennik.login.LoginSyncErrorFragment"
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSyncErrorFragment"
android:label="fragment_login_sync_error"
tools:layout="@layout/fragment_login_sync_error" >
<action
android:id="@+id/action_loginSyncErrorFragment_to_loginFinishFragment"
app:destination="@id/loginFinishFragment" />
</fragment>
</navigation>
</navigation>

148
app/src/main/res/navigation/nav_main.xml
View File

@ -1,148 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation 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:id="@+id/nav_main"
app:startDestination="@+id/homeFragment">
<fragment
android:id="@+id/loadingFragment"
android:name="pl.szczodrzynski.edziennik.fragments.LoadingFragment"
android:label="LoadingFragment"
tools:layout="@layout/fragment_loading">
<action
android:id="@+id/action_loadingFragment_to_homeFragment"
app:destination="@id/homeFragment" />
</fragment>
<fragment
android:id="@+id/homeFragment"
android:name="pl.szczodrzynski.edziennik.fragments.HomeFragment"
android:label="fragment_home"
tools:layout="@layout/fragment_home">
<action
android:id="@+id/action_homeFragment_to_timetableFragment"
app:destination="@id/timetableFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_gradesFragment"
app:destination="@id/gradesFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_messagesFragment"
app:destination="@id/messagesFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_agendaFragment"
app:destination="@id/agendaFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_noticesFragment"
app:destination="@id/noticesFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_announcementsFragment"
app:destination="@id/announcementsFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_attendancesFragment"
app:destination="@id/attendancesFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_homeworkFragment"
app:destination="@id/homeworkFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_notificationsFragment"
app:destination="@id/notificationsFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_settingsFragment"
app:destination="@id/settingsFragment"
app:popUpTo="@+id/homeFragment" />
<action
android:id="@+id/action_homeFragment_to_profileManagerFragment"
app:destination="@id/profileManagerFragment" />
<action
android:id="@+id/action_homeFragment_to_helpFragment"
app:destination="@id/helpFragment"
app:popUpTo="@+id/homeFragment" />
</fragment>
<fragment
android:id="@+id/gradesFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterGradesFragment"
android:label="fragment_register_grades"
tools:layout="@layout/fragment_register_grades">
<action
android:id="@+id/action_gradesFragment_to_gradesEditorFragment"
app:destination="@id/gradesEditorFragment" />
</fragment>
<fragment
android:id="@+id/gradesEditorFragment"
android:name="pl.szczodrzynski.edziennik.fragments.GradesEditorFragment"
android:label="fragment_grades_editor"
tools:layout="@layout/fragment_grades_editor" />
<fragment
android:id="@+id/timetableFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterTimetableFragment"
android:label="fragment_register_timetable"
tools:layout="@layout/fragment_register_timetable" />
<fragment
android:id="@+id/messagesFragment"
android:name="pl.szczodrzynski.edziennik.messages.MessagesListFragment"
android:label="messages_list"
tools:layout="@layout/messages_list">
<action
android:id="@+id/action_messagesFragment_to_messagesDetailsFragment"
app:destination="@id/messagesDetailsFragment" />
</fragment>
<fragment
android:id="@+id/messagesDetailsFragment"
android:name="pl.szczodrzynski.edziennik.messages.MessagesDetailsFragment"
android:label="messages_details"
tools:layout="@layout/messages_details" />
<fragment
android:id="@+id/agendaFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterAgendaDefaultFragment"
android:label="fragment_register_agenda_default"
tools:layout="@layout/fragment_register_agenda_default" />
<fragment
android:id="@+id/homeworkFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterHomeworksFragment"
android:label="fragment_register_homeworks"
tools:layout="@layout/fragment_register_homeworks" />
<fragment
android:id="@+id/noticesFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterNoticesFragment"
android:label="fragment_register_notices"
tools:layout="@layout/fragment_register_notices" />
<fragment
android:id="@+id/attendancesFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterAttendancesFragment"
android:label="fragment_register_attendances"
tools:layout="@layout/fragment_register_attendances" />
<fragment
android:id="@+id/announcementsFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterAnnouncementsFragment"
android:label="fragment_register_school_notices"
tools:layout="@layout/fragment_register_school_notices" />
<fragment
android:id="@+id/notificationsFragment"
android:name="pl.szczodrzynski.edziennik.fragments.RegisterNotificationsFragment"
android:label="fragment_register_notifications"
tools:layout="@layout/fragment_register_notifications" />
<fragment
android:id="@+id/settingsFragment"
android:name="pl.szczodrzynski.edziennik.fragments.SettingsNewFragment"
android:label="fragment_register_settings" />
<fragment
android:id="@+id/profileManagerFragment"
android:name="pl.szczodrzynski.edziennik.fragments.ProfileManagerFragment"
android:label="fragment_profile_manager"
tools:layout="@layout/fragment_profile_manager" />
<fragment
android:id="@+id/helpFragment"
android:name="pl.szczodrzynski.edziennik.fragments.HelpFragment"
android:label="fragment_help"
tools:layout="@layout/fragment_help" />
</navigation>

56
app/src/main/res/values-en/strings.xml
View File

@ -69,8 +69,8 @@
<string name="attendances_releases">Releases:</string>
<string name="attendances_summary_subject_loading_format">All subjects</string>
<string name="attendances_summary_title_loading_format">Summary - loading…</string>
<string name="attendances_summary_title_semester_format">Summary - semester %d&#160;</string>
<string name="attendances_summary_title_year">Summary - all year&#160;</string>
<string name="attendance_summary_title_semester_format">Summary - semester %d&#160;</string>
<string name="attendance_summary_title_year">Summary - all year&#160;</string>
<string name="back">Back</string>
<string name="bell_sync_adjust_content">Adjust the bell sync time. Format: ±H:MM:SS</string>
<string name="bell_sync_adjust_error">Incorrect format</string>
@ -287,11 +287,7 @@
<string name="help">Help</string>
<string name="help_notification_web_push">Notification forwarding allows you to pair a PC web browser to receive notifications on your desktop. This includes new grades, events, homework etc.\n\nClick \"Notification forwarding\" to begin.</string>
<string name="help_register_agreement">Registraton will run automatically on the first login.\n\nThere will be some data sent to the app server:\n- your school and class ID\n- your e-register username\n- your first and last name\n\nThe only data visible to others is your name (when sharing events). Any private data (like password, grades etc.) won\'t be sent anywhere. Learn more in the Privacy policy.</string>
<string name="homework_current_no_data">There is no current homework.</string>
<string name="homework_current_title">Current homework</string>
<string name="homework_edit">Edit</string>
<string name="homework_past_no_data">No previous homework.</string>
<string name="homework_past_title">Past homework</string>
<string name="i_agree">I agree</string>
<string name="i_disagree">I disagree</string>
<string name="incorrect_format">Incorrect format</string>
@ -405,7 +401,7 @@
<string name="menu_add_new_profile">Add a new student</string>
<string name="menu_agenda">Agenda</string>
<string name="menu_announcements">Notice board</string>
<string name="menu_attendances">Attendance</string>
<string name="menu_attendance">Attendance</string>
<string name="menu_grades">Grades</string>
<string name="menu_grades_editor">Grade editing simulator</string>
<string name="menu_help">Help</string>
@ -548,7 +544,7 @@
<string name="settings_about_licenses_text">Open-source licenses</string>
<string name="settings_about_privacy_policy_text">Privacy policy</string>
<string name="settings_about_register_title_text">E-register</string>
<string name="settings_about_title_subtext">© Kuba Szczodrzyński September 2019</string>
<string name="settings_about_title_subtext">© Kuba Szczodrzyński September 2018 - October 2019</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>
@ -602,12 +598,12 @@
<string name="settings_register_shared_events_subtext">Share exams in your class</string>
<string name="settings_register_shared_events_text">Enable Event sharing</string>
<string name="settings_sync_customize_endpoint_announcements">Notice board</string>
<string name="settings_sync_customize_endpoint_attendances">Attendances</string>
<string name="settings_sync_customize_endpoint_attendance">Attendances</string>
<string name="settings_sync_customize_endpoint_class_free_days">Class free days</string>
<string name="settings_sync_customize_endpoint_classrooms">Classrooms</string>
<string name="settings_sync_customize_endpoint_events">Events/agenda</string>
<string name="settings_sync_customize_endpoint_grades">Grades</string>
<string name="settings_sync_customize_endpoint_homeworks">Homework</string>
<string name="settings_sync_customize_endpoint_homework">Homework</string>
<string name="settings_sync_customize_endpoint_lucky_numbers">Lucky number</string>
<string name="settings_sync_customize_endpoint_messages_inbox">Messages - received</string>
<string name="settings_sync_customize_endpoint_messages_outbox">Messages - sent</string>
@ -684,7 +680,7 @@
<string name="sync_action_syncing_account_info">Getting account info</string>
<string name="sync_action_syncing_announcements">Getting notice board</string>
<string name="sync_action_syncing_attendance_types">Getting attendance types</string>
<string name="sync_action_syncing_attendances">Getting attendance</string>
<string name="sync_action_syncing_attendance">Getting attendance</string>
<string name="sync_action_syncing_behaviour_grade_categories">Getting behaviour grades categories</string>
<string name="sync_action_syncing_behaviour_grades">Getting behaviour grades</string>
<string name="sync_action_syncing_calendar">Getting agenda</string>
@ -751,9 +747,9 @@
<string name="sync_feature_agenda">Syncing agenda…</string>
<string name="sync_feature_all">All</string>
<string name="sync_feature_announcements">Syncing announcements…</string>
<string name="sync_feature_attendances">Syncing attendances…</string>
<string name="sync_feature_attendance">Syncing attendance…</string>
<string name="sync_feature_grades">Syncing grades…</string>
<string name="sync_feature_homeworks">Syncing homeworks…</string>
<string name="sync_feature_homework">Syncing homework…</string>
<string name="sync_feature_messages_inbox">Syncing received messages…</string>
<string name="sync_feature_messages_outbox">Syncing sent messages…</string>
<string name="sync_feature_notices">Syncing notices…</string>
@ -827,4 +823,36 @@
<string name="yesterday">yesterday</string>
<string name="you_are_offline_text">You\'re offline. Try enabling Wi-Fi or mobile data.</string>
<string name="you_are_offline_title">Internet connection</string>
</resources>
<string name="homework_tab_current">Current</string>
<string name="homework_tab_past">Past</string>
<string name="homework_no_data">There is no homework.</string>
<string name="sort_by_date">By date</string>
<string name="sort_by_subject">By subject</string>
<string name="sync_error_librus_disconnected">LIBRUS account has lost connection with the Synergia account. Login on portal.librus.pl or in the Librus mobile app and follow the instructions to fix the problem.</string>
<string name="compose_title">Compose</string>
<string name="drawer_add_new_profile_desc">Add a new profile</string>
<string name="drawer_manage_profiles_desc">Add or remove students\' profiles</string>
<string name="error_invalid_fragment">Wrong module given: %d Report it to the application developer</string>
<string name="menu_add_event">Add event</string>
<string name="menu_add_event_desc">Save own event or homework in the agenda</string>
<string name="menu_agenda_change_view">Change Agenda view</string>
<string name="menu_debug">Debugging</string>
<string name="menu_feedback">Help and FAQ</string>
<string name="menu_generate_block_timetable">Save the timetable as an image</string>
<string name="menu_generate_block_timetable_desc">Generates timetable for the whole week</string>
<string name="menu_grades_average_mode">End-of-year average calculation method</string>
<string name="menu_grades_averages">Grade averages</string>
<string name="menu_grades_averages_desc">Show semester and end-of-year averages</string>
<string name="menu_grades_color_mode">Grades color</string>
<string name="menu_grades_sort_mode">Sort grades</string>
<string name="menu_message">Message</string>
<string name="menu_set_student_number">Set your register number</string>
<string name="messages_compose_menu_attachment">Add an attachment</string>
<string name="messages_compose_menu_discard">Abort message</string>
<string name="messages_compose_menu_save_draft">Save draft</string>
<string name="messages_compose_menu_send">Send</string>
<string name="agenda_teacher_absence">Absent teachers</string>
<string name="sync_action_syncing_grade_comments">Getting grade comments</string>
<string name="sync_action_syncing_school_free_days">Getting school free days</string>
<string name="settings_register_show_teacher_absences_text">Show teacher absences in Agenda</string>
</resources>

33
app/src/main/res/values/strings.xml
View File

@ -76,8 +76,8 @@
<string name="attendances_releases">Zwolnienia:</string>
<string name="attendances_summary_subject_loading_format">Wszystkie przedmioty</string>
<string name="attendances_summary_title_loading_format">Podsumowanie - ładowanie…</string>
<string name="attendances_summary_title_semester_format">Podsumowanie - semestr %d&#160;</string>
<string name="attendances_summary_title_year">Podsumowanie - cały rok&#160;</string>
<string name="attendance_summary_title_semester_format">Podsumowanie - semestr %d&#160;</string>
<string name="attendance_summary_title_year">Podsumowanie - cały rok&#160;</string>
<string name="back">Wróć</string>
<string name="bell_sync_adjust_content">Dostosuj wartość przesunięcia dzwonka. Format: ±H:MM:SS</string>
<string name="bell_sync_adjust_error">Nieprawidłowy format</string>
@ -308,13 +308,9 @@
<string name="help">Pomoc</string>
<string name="help_notification_web_push">Przekazywanie powiadomień umożliwia sparowanie z przeglądarką internetową w celu wysyłania wszystkich powiadomień z aplikacji na komputer. Można do nich zaliczyć np. nowe oceny, wydarzenia, zadania domowe itp.\n\nKliknij \"Przekazywanie powiadomień\", aby rozpocząć.</string>
<string name="help_register_agreement">Rejestracja odbędzie się automatycznie przy pierwszym logowaniu do e-dziennika.\n\nDo poprawnego działania funkcji zostaną przesłane:\n- Twój identyfikator szkoły i klasy\n- Twoja nazwa użytkownika do e-dziennika\n- Twoje imię i nazwisko\n\nJedyne dane widoczne dla innych osób z twojej klasy to Imię i Nazwisko podczas udostępniania wydarzeń. Nie zostaną wysłane żadne prywatne dane, takie jak hasła, oceny itp. Dowiedz się więcej w Polityce Prywatności.</string>
<string name="homework_current_no_data">Brak aktualnych zadań domowych.</string>
<string name="homework_current_title">Aktualne zadania</string>
<string name="homework_edit">Edytuj</string>
<string name="homework_past_no_data">Brak poprzednich zadań domowych.</string>
<string name="homework_past_title">Poprzednie zadania</string>
<string name="homeworks_subject_teacher_format" translatable="false">%s, %s</string>
<string name="homeworks_team_date_format" translatable="false">%s %s</string>
<string name="homework_subject_teacher_format" translatable="false">%s, %s</string>
<string name="homework_team_date_format" translatable="false">%s %s</string>
<string name="i_agree">Zgadzam się</string>
<string name="i_disagree">Nie zgadzam się</string>
<string name="incorrect_format">Nieprawidłowy format</string>
@ -429,7 +425,7 @@
<string name="menu_add_new_profile">Dodaj nowego ucznia</string>
<string name="menu_agenda">Terminarz</string>
<string name="menu_announcements">Tablica ogłoszeń</string>
<string name="menu_attendances">Frekwencja</string>
<string name="menu_attendance">Frekwencja</string>
<string name="menu_generate_block_timetable">Zapisz plan lekcji jako obraz</string>
<string name="menu_generate_block_timetable_desc">Generuje plan lekcji na cały tydzień</string>
<string name="menu_grades">Oceny</string>
@ -593,7 +589,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_about_register_title_text">E-dziennik</string>
<string name="settings_about_title_subtext">© Kuba Szczodrzyński wrzesień 2019</string>
<string name="settings_about_title_subtext">© Kuba Szczodrzyński wrzesień 2018 - październik 2019</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>
@ -647,12 +643,12 @@
<string name="settings_register_shared_events_subtext">Udostępniaj sprawdziany w swojej klasie</string>
<string name="settings_register_shared_events_text">Włącz Udostępnianie wydarzeń</string>
<string name="settings_sync_customize_endpoint_announcements">Tablica ogłoszeń</string>
<string name="settings_sync_customize_endpoint_attendances">Obecności/nieobecności</string>
<string name="settings_sync_customize_endpoint_attendance">Obecności/nieobecności</string>
<string name="settings_sync_customize_endpoint_class_free_days">Dni wolne klasy</string>
<string name="settings_sync_customize_endpoint_classrooms">Sale lekcyjne</string>
<string name="settings_sync_customize_endpoint_events">Wydarzenia/terminarz</string>
<string name="settings_sync_customize_endpoint_grades">Oceny</string>
<string name="settings_sync_customize_endpoint_homeworks">Zadania domowe</string>
<string name="settings_sync_customize_endpoint_homework">Zadania domowe</string>
<string name="settings_sync_customize_endpoint_lucky_numbers">Szczęśliwy numerek</string>
<string name="settings_sync_customize_endpoint_messages_inbox">Wiadomości odebrane</string>
<string name="settings_sync_customize_endpoint_messages_outbox">Wiadomości wysłane</string>
@ -730,7 +726,7 @@
<string name="sync_action_syncing_account_info">Pobieranie informacji o koncie</string>
<string name="sync_action_syncing_announcements">Pobieranie ogłoszeń szkolnych</string>
<string name="sync_action_syncing_attendance_types">Pobieranie kategorii obecności</string>
<string name="sync_action_syncing_attendances">Pobieranie obecności</string>
<string name="sync_action_syncing_attendance">Pobieranie obecności</string>
<string name="sync_action_syncing_behaviour_grade_categories">Pobieranie kategorii ocen z zachowania</string>
<string name="sync_action_syncing_behaviour_grades">Pobieranie ocen z zachowania</string>
<string name="sync_action_syncing_calendar">Pobieranie kalendarza</string>
@ -798,9 +794,9 @@
<string name="sync_feature_agenda">Pobieram terminarz…</string>
<string name="sync_feature_all">Wszystkie</string>
<string name="sync_feature_announcements">Pobieram tablicę ogłoszeń…</string>
<string name="sync_feature_attendances">Pobieram obecności…</string>
<string name="sync_feature_attendance">Pobieram obecności…</string>
<string name="sync_feature_grades">Pobieram oceny…</string>
<string name="sync_feature_homeworks">Pobieram zadania domowe…</string>
<string name="sync_feature_homework">Pobieram zadania domowe…</string>
<string name="sync_feature_messages_inbox">Pobieram wiadomości odebrane…</string>
<string name="sync_feature_messages_outbox">Pobieram wiadomości wysłane…</string>
<string name="sync_feature_notices">Pobieram uwagi…</string>
@ -921,4 +917,11 @@
<string name="edziennik_notification_api_error_report_task">Zgłaszanie błędów...</string>
<string name="edziennik_notification_api_error_report_title">Zgłaszanie błędów</string>
<string name="edziennik_progress_endpoint_student_info">Pobieram informacje o uczniu...</string>
<string name="sync_action_syncing_school_free_days">Pobieranie dni wolnych szkoły</string>
<string name="homework_tab_current">Aktualne</string>
<string name="homework_tab_past">Minione</string>
<string name="homework_no_data">Brak zadań domowych.</string>
<string name="agenda_teacher_absence">Nieobecni nauczyciele</string>
<string name="sync_action_syncing_grade_comments">Pobieranie komentarzy ocen</string>
<string name="settings_register_show_teacher_absences_text">Pokazuj nieobecności nauczycieli w Terminarzu</string>
</resources>

2
app/src/main/res/xml/widget_lucky_number_info.xml
View File

@ -12,4 +12,4 @@
android:updatePeriodMillis="1800000"
android:widgetCategory="home_screen"
android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity"
tools:ignore="UnusedAttribute" />
tools:ignore="UnusedAttribute" />

2
app/src/main/res/xml/widget_notifications_info.xml
View File

@ -12,4 +12,4 @@
android:updatePeriodMillis="5400000"
android:widgetCategory="home_screen"
android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity"
tools:ignore="UnusedAttribute" />
tools:ignore="UnusedAttribute" />

2
app/src/main/res/xml/widget_timetable_info.xml
View File

@ -12,4 +12,4 @@
android:updatePeriodMillis="1800000"
android:widgetCategory="home_screen"
android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity"
tools:ignore="UnusedAttribute" />
tools:ignore="UnusedAttribute" />