github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 10:54:36 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change drawer header, dark bottombar color

Browse Source
This commit is contained in:
Adam Kasprzycki 2022-10-22 16:27:04 +02:00 committed by Kuba Szczodrzyński
parent af75049ac7
commit a26b5c93da
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -14,7 +14,7 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<!-- PowerPermission uses minSdk 21, it's safe to override as it is used only in >= 23 --> <!-- PowerPermission uses minSdk 21, it's safe to override as it is used only in >= 23 -->
<uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core" /> <uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core, com.mikepenz:materialdrawer, com.mikepenz.iconics.typeface.library.navlibfont" />
<application <application
android:name=".App" android:name=".App"

7
app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
View File

@ -197,13 +197,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
fabExtendable = true fabExtendable = true
fabExtended = false fabExtended = false
fabGravity = Gravity.CENTER fabGravity = Gravity.CENTER
if (Themes.isDark) {
setBackgroundColor(blendColors(
getColorFromAttr(context, R.attr.colorSurface),
getColorFromRes(R.color.colorSurface_4dp)
))
elevation = dpToPx(4).toFloat()
}
} }
bottomSheet.apply { bottomSheet.apply {

1
app/src/main/res/layout/card_home.xml
View File

@ -10,5 +10,4 @@
android:layout_marginVertical="8dp" android:layout_marginVertical="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:background="?colorSurfaceVariant"
style="?attr/materialCardViewFilledStyle" /> style="?attr/materialCardViewFilledStyle" />

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

@ -14,7 +14,8 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
android:visibility="gone" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/material_drawer_statusbar_guideline" android:id="@+id/material_drawer_statusbar_guideline"
@ -25,9 +26,9 @@
<com.mikepenz.materialdrawer.view.BezelImageView <com.mikepenz.materialdrawer.view.BezelImageView
android:id="@+id/material_drawer_account_header_current" android:id="@+id/material_drawer_account_header_current"
android:layout_width="0.1dp"
android:layout_height="0.1dp"
style="@style/BezelImageView" style="@style/BezelImageView"
android:layout_width="@dimen/material_drawer_account_header_selected"
android:layout_height="@dimen/material_drawer_account_header_selected"
android:layout_marginStart="@dimen/material_drawer_vertical_padding" android:layout_marginStart="@dimen/material_drawer_vertical_padding"
android:layout_marginLeft="@dimen/material_drawer_vertical_padding" android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
android:layout_marginTop="@dimen/material_drawer_account_header_horizontal_top" android:layout_marginTop="@dimen/material_drawer_account_header_horizontal_top"
@ -41,8 +42,8 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/material_drawer_account_header_current_badge" android:id="@+id/material_drawer_account_header_current_badge"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:elevation="4dp" android:elevation="4dp"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:gravity="center" android:gravity="center"