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

Commit fc4ed90d authored by Stefan Niedermann's avatar Stefan Niedermann Committed by Andy Scherzinger
Browse files

feat(theming): Reduce dependence on colorPrimary 



Signed-off-by: default avatarStefan Niedermann <info@niedermann.it>
parent 2b57ad6d

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

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
    <androidx.fragment.app.FragmentContainerView

        android:id="@+id/fragment_container_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="?attr/colorPrimary" />

        android:layout_height="match_parent" />



</LinearLayout>
 
 No newline at end of file

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

+2 −3
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:background="?attr/colorPrimary">

    android:layout_height="match_parent">



    <!-- Dummy item to prevent editContent from receiving focus -->

    <LinearLayout
@@ -28,7 +27,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginHorizontal="@dimen/spacer_activity_sides"

            android:background="?attr/colorPrimary"

            android:background="@android:color/transparent"

            android:ems="10"

            android:gravity="top"

            android:inputType="textMultiLine|textCapSentences"

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

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:background="?attr/colorPrimary">

    android:layout_height="match_parent">



    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

        android:id="@+id/swiperefreshlayout"

app/src/main/res/values-v27/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<resources>



    <style name="AppTheme" parent="BaseTheme">

        <item name="android:navigationBarColor">?attr/colorPrimary</item>

        <item name="android:navigationBarColor">@color/bg_default</item>

        <item name="android:windowLightNavigationBar">@bool/isDayMode</item>

    </style>

</resources>
 
 No newline at end of file

app/src/main/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
        <item name="colorPrimaryDark">?android:colorPrimary</item>

        <item name="colorAccent">@color/accent</item>



        <item name="android:statusBarColor">?attr/colorPrimary</item>

        <item name="android:statusBarColor">@color/bg_default</item>

        <item name="android:windowLightStatusBar">@bool/isDayMode</item>

        <item name="android:colorControlNormal">?attr/colorAccent</item>

        <item name="android:colorControlActivated">?attr/colorAccent</item>
@@ -14,7 +14,7 @@ 
        <item name="android:textColorHighlight">@color/defaultTextHighlightBackground</item>

        <item name="windowActionModeOverlay">true</item>

        <item name="android:windowBackground">@color/bg_default</item>

        <item name="android:actionModeBackground">?attr/colorPrimary</item>

        <item name="android:actionModeBackground">@color/bg_default</item>



        <!-- Workaround: Preferences Dialogs are using AlertDialogs instead of MaterialAlertDialogs. -->

        <!-- https://stackoverflow.com/questions/70650073/adjust-androidx-preference-dialogs-to-follow-material-you -->