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

Commit 80bb4fdf authored by Niedermann IT-Dienstleistungen's avatar Niedermann IT-Dienstleistungen
Browse files

Merge remote-tracking branch 'origin/master'

parents 13289949 88835673

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

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
                    android:singleLine="true"

                    android:layout_weight="1"

                    android:textColor="@drawable/list_item_color_selector"

                    android:textSize="16sp" />

                    android:textSize="@dimen/primary_font_size" />



                <ImageView

                    android:id="@+id/noteStatus"
@@ -93,7 +93,7 @@ 
                    android:paddingTop="1dp"

                    android:layout_weight="1"

                    android:textColor="@drawable/list_item_color_selector_low"

                    android:textSize="14sp" />

                    android:textSize="@dimen/secondary_font_size" />



                <TextView

                    android:id="@+id/noteCategory"
@@ -111,7 +111,7 @@ 
                    android:layout_marginLeft="8dp"

                    android:singleLine="true"

                    android:textColor="@drawable/list_item_color_selector"

                    android:textSize="14sp" />

                    android:textSize="@dimen/secondary_font_size" />

            </android.support.v7.widget.LinearLayoutCompat>

        </android.support.v7.widget.LinearLayoutCompat>

    </android.support.v7.widget.LinearLayoutCompat>

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

+6 −11
Original line number Diff line number Diff line
@@ -14,20 +14,15 @@ 
        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:layout_alignWithParentIfMissing="true"

        android:background="@color/bg_highlighted"

        android:background="@color/bg_normal"

        android:ellipsize="end"

        android:gravity="center_vertical"

        android:paddingBottom="8dp"

        android:paddingLeft="16dp"

        android:paddingLeft="56dp"

        android:paddingStart="56dp"

        android:paddingRight="16dp"

        android:paddingTop="8dp"

        android:paddingEnd="16dp"

        android:paddingTop="48dp"

        android:textColor="@color/fg_default_selection"

        android:textSize="12sp" />



    <ImageView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:padding="1px"

        android:layout_below="@id/sectionTitle"

        android:src="@color/separator" />

        android:textSize="@dimen/secondary_font_size" />

</RelativeLayout>
 
 No newline at end of file

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

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
    <dimen name="button_padding">16dp</dimen>

    <dimen name="button_elevation">5dp</dimen>



    <dimen name="primary_font_size">16sp</dimen>

    <dimen name="secondary_font_size">14sp</dimen>



    <!-- Widgets -->

    <dimen name="widget_margin">8dp</dimen>

    <dimen name="widget_single_note_padding">10dp</dimen>

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
    </style>



    <style name="NavigationItem">

        <item name="android:textSize">14sp</item>

        <item name="android:textSize">@dimen/secondary_font_size</item>

        <item name="android:fontFamily">sans-serif-medium</item>

        <item name="android:textColor">#de000000</item>

    </style>