Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f560fd73 authored by Jonas Häusler's avatar Jonas Häusler Committed by Michael Bestas
Browse files

fix layout issues 

Change-Id: I278ce54be3e420cbb7e1c475b3365639db9a2218
parent cf5a632f

app/src/main/res/color/calendar_spinner_item_colors.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="#61000000" android:state_enabled="false" />

    <item android:color="#000000" />

    <item android:color="?attr/calendarSpinnerDisabledTextColor" android:state_enabled="false" />

    <item android:color="?android:attr/textColorPrimary" />

</selector>

app/src/main/res/layout/calendars_spinner_item.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

app/src/main/res/layout/edit_event_all.xml

+12 −10
Original line number Diff line number Diff line
@@ -80,32 +80,34 @@ 


        <Spinner

            android:id="@+id/calendars_spinner"

            android:layout_width="0dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:layout_marginStart="12dp"

            android:layout_marginEnd="32dp"

            android:gravity="center_vertical"

            android:prompt="@string/edit_event_calendar_label"

            android:paddingStart="0dp"

            android:paddingEnd="2dp"

            android:prompt="@string/edit_event_calendar_label"

            app:layout_constraintBottom_toBottomOf="@+id/calendar_selector_group_icon"

            app:layout_constraintEnd_toStartOf="@+id/change_color"

            app:layout_constraintHorizontal_bias="0.0"

            app:layout_constraintStart_toEndOf="@+id/calendar_selector_group_icon"

            app:layout_constraintTop_toTopOf="@+id/calendar_selector_group_icon" />



        <ImageButton

            android:id="@+id/change_color"

            android:layout_width="0dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="24dp"

            android:layout_marginTop="20dp"

            android:background="?android:attr/selectableItemBackground"

            android:layout_marginEnd="32dp"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:contentDescription="@string/choose_event_color_label"

            android:enabled="false"

            android:scaleType="center"

            android:src="@drawable/ic_colorpicker"

            android:visibility="invisible"

            app:layout_constraintBottom_toBottomOf="@+id/calendar_selector_group_icon"

            app:layout_constraintBottom_toBottomOf="@+id/calendars_spinner"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="@+id/view" />

            app:layout_constraintTop_toTopOf="@+id/calendars_spinner"

            tools:visibility="visible" />



        <View

            android:id="@+id/view1"

app/src/main/res/values-v31/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
        <item name="iconSettingsGeneral">@android:color/black</item>

        <item name="iconAddCalendar">@android:color/black</item>

        <item name="iconCalendarAccount">@android:color/black</item>

       <item name="calendarSpinnerDisabledTextColor">@color/calendar_item_disabled</item>

    </style>

    <style name="CalendarAppThemeDarkMonet" parent="Theme.AppCompat.NoActionBar">

        <item name="colorPrimary">@android:color/system_accent1_500</item>
@@ -80,6 +81,7 @@ 
        <item name="iconSettingsGeneral">@android:color/white</item>

        <item name="iconAddCalendar">@android:color/white</item>

        <item name="iconCalendarAccount">@android:color/white</item>

        <item name="calendarSpinnerDisabledTextColor">@color/calendar_item_disabled_dark</item>

    </style>

    <style name="CalendarAppThemeBlackMonet" parent="Theme.AppCompat.NoActionBar">

        <item name="colorPrimary">@android:color/system_accent1_500</item>
@@ -120,5 +122,6 @@ 
        <item name="iconSettingsGeneral">@android:color/white</item>

        <item name="iconAddCalendar">@android:color/white</item>

        <item name="iconCalendarAccount">@android:color/white</item>

        <item name="calendarSpinnerDisabledTextColor">@color/calendar_item_disabled_black</item>

    </style>

</resources>