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

Merge branch 'develop' into feature/code-publish

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2021-03-31 09:38:31 +02:00
parent e6dec4c6c0 5690a136f1
commit 2a3b1422ef
112 changed files with 565 additions and 4820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="colorSection" format="color" />
<attr name="cardBackgroundDimmed" format="color" />
<attr name="cardBackgroundHighlight" format="color" />
<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_source_color" format="color" />
<attr name="timetable_lesson_shifted_target_color" format="color" />
<attr name="colorIcon" format="color" />
</resources>
</resources>

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

@ -4,7 +4,6 @@
<color name="colorPrimaryDark">#1976D2</color>
<color name="colorPrimaryLight">#6EC6FF</color>
<color name="colorAccent">#4caf50</color>
<color name="colorSection">#4CAF50</color>
<color name="primaryTextLight">#ff101010</color>
<color name="primaryTextDark">#fff3f3f3</color>
@ -13,10 +12,6 @@
<color name="dividerColor">#3e7f7f7f</color>
<color name="mdtp_accent_color">#2196f3</color>
<color name="mdtp_accent_color_dark">#64b5f6</color>
<!-- LIGHT THEME -->
<color name="windowBackgroundLight">#ffffffff</color>
<color name="colorSurfaceLight">#ffffffff</color>

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

@ -1426,4 +1426,5 @@
<string name="build_dialog_open_repo">Sprawdź kod</string>
<string name="error_no_api_access">Brak dostępu do API</string>
<string name="build_date">Data kompilacji</string>
<string name="permissions_generate_timetable">Aby móc zapisać wygenerowany plan lekcji musisz przyznać uprawnienia dostępu do pamięci urządzenia.\n\nKliknij OK, aby przyznać uprawnienia.</string>
</resources>

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

@ -87,30 +87,27 @@
<item name="textColor">?android:textColorSecondary</item>
<item name="android:textColor">?android:textColorSecondary</item>
</style>
<style name="AppTheme.MaterialAlertDialogMonospace" parent="AppTheme.MaterialAlertDialog">
<item name="materialAlertDialogBodyTextStyle">@style/AppTheme.MaterialAlertDialogMonospace.BodyText</item>
</style>
<style name="AppTheme.MaterialAlertDialogMonospace.BodyText" parent="AppTheme.MaterialAlertDialog.BodyText">
<item name="android:typeface">monospace</item>
</style>
<style name="AppTheme" parent="NavView" />
<style name="mdtp_ActionButton.Text" parent="Widget.MaterialComponents.Button.TextButton.Dialog"/>
<!-- Base application theme. -->
<style name="AppTheme.Light" parent="NavView.Light">
<item name="colorPrimary">#2196f3</item>
<item name="colorPrimaryDark">#1976d2</item>
<item name="colorPrimaryVariant">#2196f3</item>
<item name="colorAccent">#ff3d00</item>
<item name="colorSection">@color/colorSection</item>
<item name="colorFab">#4CAF50</item>
<item name="colorFabIcon">#c8e6c9</item>
<item name="colorOnFab">#ffffff</item>
<item name="colorIcon">#8a000000</item>
<item name="md_dark_theme">false</item>
<item name="md_title_color">?android:textColorPrimary</item>
<item name="md_content_color">?android:textColorPrimary</item>
<item name="md_link_color">?colorAccent</item>
<item name="md_item_color">?android:textColorPrimary</item>
<item name="mal_color_primary">?android:textColorPrimary</item>
<item name="mal_color_secondary">?android:textColorSecondary</item>
<item name="mal_card_background">?colorSurface</item>
@ -124,26 +121,18 @@
<item name="halfHourDividerColor">#e0e0e0</item>
<item name="materialAlertDialogTheme">@style/AppTheme.MaterialAlertDialog</item>
<item name="mdtp_theme_dark">false</item>
</style>
<style name="AppTheme.Dark" parent="NavView.Dark">
<item name="colorPrimary">#64b5f6</item>
<item name="colorPrimaryDark">#1976d2</item>
<item name="colorPrimaryVariant">#2196f3</item>
<item name="colorAccent">#ffb300</item>
<item name="colorSection">@color/colorSection</item>
<item name="colorFab">#4CAF50</item>
<item name="colorFabIcon">#c8e6c9</item>
<item name="colorOnFab">#ffffff</item>
<item name="colorIcon">#b4ffffff</item>
<item name="md_dark_theme">true</item>
<item name="md_title_color">?android:textColorPrimary</item>
<item name="md_content_color">?android:textColorPrimary</item>
<item name="md_link_color">?colorAccent</item>
<item name="md_item_color">?android:textColorPrimary</item>
<item name="mal_color_primary">@color/primaryTextDark</item>
<item name="mal_color_secondary">@color/secondaryTextDark</item>
<item name="mal_card_background">?colorSurface</item>
@ -157,7 +146,6 @@
<item name="halfHourDividerColor">#40ffffff</item>
<item name="materialAlertDialogTheme">@style/AppTheme.MaterialAlertDialog</item>
<item name="mdtp_theme_dark">true</item>
</style>