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

Commit 59eb4157 authored by Mohit Mali's avatar Mohit Mali
Browse files

Merge branch 'issue_2563_Q' into 'v1-q' 

Issue 2563 q

See merge request !19
parents 92743be0 fcfda895

res/layout/dialog_file_name.xml

+5 −2
Original line number Diff line number Diff line
@@ -29,12 +29,15 @@ 
        android:layout_marginTop="@dimen/dialog_content_padding_top"

        android:layout_marginBottom="@dimen/dialog_content_padding_bottom"

        android:layout_centerInParent="true"

        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">



        android:textColorHint="@color/hairline"

       >

        <!--style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"-->

        <com.google.android.material.textfield.TextInputEditText

            android:id="@android:id/text1"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textColorHint="@color/hairline"

            android:hint="@string/input_hint_new_folder"

            android:inputType="textCapSentences"/>



    </com.google.android.material.textfield.TextInputLayout>

res/layout/fragment_pick.xml

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:layout_height="wrap_content"

        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:textColor="@color/accent"

        android:text="@android:string/cancel"/>



    <com.google.android.material.button.MaterialButton
@@ -38,5 +39,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="4dp"

        android:textColor="@color/accent"

        android:layout_marginEnd="4dp"/>

</LinearLayout>

res/layout/fragment_save.xml

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:layout_marginEnd="4dp"

            android:textColor="@color/accent"

            android:text="@string/menu_save"/>



        <ProgressBar

res/values-night/themes.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
        <item name="android:actionBarSize">@dimen/action_bar_size</item>



        <!-- Color section -->

        <item name="android:colorAccent">@color/primary</item>

        <item name="android:colorAccent">@color/color_default_blue1</item>

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

        <item name="android:colorBackground">@color/app_background_color</item>

        <item name="android:colorBackgroundFloating">@color/background_floating</item>

        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>

res/values/styles_text.xml

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
    <style name="MaterialButtonTextAppearance" parent="@style/TextAppearance.MaterialComponents.Button">

        <item name="android:textAllCaps">@bool/config_button_all_caps</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

        <item name="android:textColor">@color/accent</item>

    </style>



</resources>
 
 No newline at end of file