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 'hotfix-3.0.2' into develop

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2019-09-25 18:49:09 +02:00
parent e344be0fa1 349bcc851d
commit 0cea6af5b1
7 changed files with 84 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,11 +18,11 @@
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
<ScrollView
android:id="@+id/webPushConfig"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/webPushConfig"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

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

@ -95,8 +95,6 @@
<item name="mal_color_secondary">?android:textColorSecondary</item>
<item name="mal_card_background">?colorSurface</item>
<item name="mal_divider_color">@color/dividerColor</item>
<item name="android:statusBarColor" tools:targetApi="lollipop">?android:windowBackground</item>
</style>
<style name="AppTheme.Dark" parent="NavView.Dark">
<item name="colorPrimary">#64b5f6</item>
@ -121,8 +119,6 @@
<item name="mal_color_secondary">@color/secondaryTextDark</item>
<item name="mal_card_background">?colorSurface</item>
<item name="mal_divider_color">@color/dividerColor</item>
<item name="android:statusBarColor" tools:targetApi="lollipop">?android:windowBackground</item>
</style>