github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-06-12 21:50:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Timetable] Implement Librus timetable with lesson changes and shifts. Update UI.

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2019-11-10 22:57:19 +01:00
parent 5fa7409317
commit 4eeaa54a47
12 changed files with 231 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/layout/timetable_lesson.xml
View File

@ -8,6 +8,9 @@
<variable
name="annotationVisible"
type="boolean"/>
<variable
name="lessonNumber"
type="Integer" />
</data>
<FrameLayout
android:layout_width="match_parent"
@ -91,11 +94,13 @@
android:layout_gravity="center_vertical"
android:fontFamily="sans-serif-condensed-light"
android:includeFontPadding="false"
android:layout_marginBottom="-4dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:text="9"
tools:textSize="28sp"/>
android:text="@{Integer.toString(lessonNumber)}"
android:textSize="28sp"
android:visibility="@{lessonNumber != null ? View.VISIBLE : View.GONE}"
tools:text="3"/>
<!--android:layout_marginTop="@{annotationVisible ? `-4dp` : `4dp`}"
android:layout_marginBottom="@{annotationVisible ? `-4dp` : `0dp`}"-->

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

@ -6,5 +6,6 @@
<attr name="timetable_lesson_bg" format="reference" />
<attr name="timetable_lesson_cancelled_color" format="color" />
<attr name="timetable_lesson_change_color" format="color" />
<attr name="timetable_lesson_shifted_color" format="color" />
<attr name="timetable_lesson_shifted_source_color" format="color" />
<attr name="timetable_lesson_shifted_target_color" format="color" />
</resources>

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

@ -991,4 +991,8 @@
<string name="timetable_lesson_change_format">Zastępstwo: zamiast %s</string>
<string name="timetable_lesson_shifted_same_day">Lekcja przeniesiona na godz. %s</string>
<string name="timetable_lesson_shifted_other_day">Lekcja przeniesiona na %s, godz. %s</string>
<string name="timetable_lesson_shifted_from_same_day">Lekcja przeniesiona z godz. %s</string>
<string name="timetable_lesson_shifted_from_other_day">Lekcja przeniesiona z dnia %s, godz. %s</string>
<string name="timetable_lesson_shifted">Lekcja przeniesiona na inny termin</string>
<string name="timetable_lesson_shifted_from">Lekcja przeniesiona z innego terminu</string>
</resources>

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

@ -99,7 +99,8 @@
<item name="timetable_lesson_bg">@drawable/timetable_lesson_bg_light</item>
<item name="timetable_lesson_cancelled_color">#9f9f9f</item>
<item name="timetable_lesson_change_color">#ffb300</item>
<item name="timetable_lesson_shifted_color">#4caf50</item>
<item name="timetable_lesson_shifted_source_color">#A1887F</item>
<item name="timetable_lesson_shifted_target_color">#4caf50</item>
</style>
<style name="AppTheme.Dark" parent="NavView.Dark">
<item name="colorPrimary">#64b5f6</item>
@ -128,7 +129,8 @@
<item name="timetable_lesson_bg">@drawable/timetable_lesson_bg_dark</item>
<item name="timetable_lesson_cancelled_color">#838383</item>
<item name="timetable_lesson_change_color">#ffb300</item>
<item name="timetable_lesson_shifted_color">#4caf50</item>
<item name="timetable_lesson_shifted_source_color">#A1887F</item>
<item name="timetable_lesson_shifted_target_color">#4caf50</item>
</style>