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

Commit 8d54e378 authored by tobias's avatar tobias
Browse files

updated dialog style

parent 81f4e405

res/layout-v11/fragment_task_list_selection.xml

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

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

    android:id="@+id/edit_name"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

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

    android:layout_gravity="center"

    android:orientation="vertical"

    android:windowMinWidthMajor="@android:dimen/dialog_min_width_major" >

    android:padding="8dp" >



    <TextView

        android:id="@android:id/title"

        style="@style/dialog_text_title"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:gravity="left|center_vertical"

        android:padding="16dp"

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

    

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:padding="24dp" >

       android:layout_margin="16dp">



        <ListView

            android:id="@id/android:list"
@@ -28,43 +39,25 @@ 
    </LinearLayout>



    <LinearLayout

        android:id="@+id/buttonArea"

        android:layout_width="match_parent"

        android:layout_height="56dp"

        android:gravity="center|right"

        android:orientation="horizontal"

        android:paddingBottom="8dip"

        android:paddingRight="8dip" >

        android:layout_height="wrap_content"

        android:gravity="right"

        android:orientation="horizontal" >



        <Button

            android:id="@android:id/button1"

            style="?android:attr/borderlessButtonStyle"

        <TextView

            android:id="@android:id/button2"

            style="@style/dialog_button_secondary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

            android:gravity="center"

            android:minHeight="36dp"

            android:minWidth="88dp"

            android:padding="16dip"

            android:text="@string/task_list_selection_cancel"

            android:textAllCaps="true"

            android:textSize="14sp"

            android:textStyle="bold" />

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



        <Button

            android:id="@android:id/button2"

            style="?android:attr/borderlessButtonStyle"

        <TextView

            android:id="@android:id/button1"

            style="@style/dialog_button_primary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

            android:gravity="center"

            android:minHeight="36dp"

            android:minWidth="88dp"

            android:padding="16dip"

            android:text="@string/task_list_selection_ok"

            android:textAllCaps="true"

            android:textSize="14sp"

            android:enabled="false"

            android:textStyle="bold" />

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

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/values-de/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -170,8 +170,8 @@ 
    <string name="notification_task_due_date">Aufgabe fällig am %1s</string>

    <string name="notification_task_start_date">Aufgabe beginnt am %1s</string>

    <string name="notification_action_complete">erledigt</string>

    <string name="notification_action_delay_1h">+1h</string>

    <string name="notification_action_delay_1d">+1d</string>

    <string name="notification_action_delay_1h">+1 Stunde</string>

    <string name="notification_action_delay_1d">+1 Tag</string>



    <!-- Strings for time UI widgets -->

    <string name="button_add_one_hour">+1 Stunde</string>

res/values-v11/styles.xml

+36 −3
Original line number Diff line number Diff line 
<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">



    <style name="AppTheme" parent="android:Theme.Holo.Light"></style>

    <style name="AppTheme" parent="android:Theme.Holo.Light">

        <item name="primaryColor">#333</item>

    </style>



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

        <item name="android:windowActionBarOverlay">true</item>
@@ -87,10 +89,41 @@ 
        <item name="android:paddingBottom">4dp</item>

    </style>



    <style name="dialog_text_title" parent="android:Widget.Holo.Light.TextView">

        <item name="android:textAppearance">@android:style/TextAppearance.Medium</item>

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

        <item name="android:textStyle">bold</item>

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

    </style>



    <style name="dialog_button_primary" parent="android:Widget.Holo.Light.TextView">

        <item name="android:textAppearance">@android:style/TextAppearance.Medium</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

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

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

        <item name="android:padding">16dp</item>

        <item name="android:clickable">true</item>

        <item name="android:focusable">true</item>

        <item name="android:focusableInTouchMode">false</item>

    </style>



    <style name="dialog_button_secondary" parent="dialog_button_primary">

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

    </style>



    <style name="dialog_button_stacked_primary" parent="dialog_button_primary">

        <item name="android:gravity">right</item>

        <item name="android:padding">12dp</item>

    </style>



    <style name="dialog_button_stacked_secondary" parent="dialog_button_stacked_primary">

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

    </style>



    <style name="actionColorBar">

        <item name="android:layout_height">?android:attr/actionBarSize</item>

    </style>



    <style name="Theme.Dialog" parent="@android:style/Theme.Holo.Light.Dialog"></style>

    <style name="Theme.Dialog" parent="@android:style/Theme.Holo.Light.Dialog.NoActionBar"></style>



</resources>
 
 No newline at end of file

res/values/attrs.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <attr name="primaryColor" format="color" />

    <attr name="primaryColorShaded" format="color" />



</resources>
 
 No newline at end of file

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ 
    <string name="notification_task_due_date">Task due %1s</string>

    <string name="notification_task_start_date">Task starts %1s</string>

    <string name="notification_action_complete">complete</string>

    <string name="notification_action_delay_1h">+1h</string>

    <string name="notification_action_delay_1d">+1d</string>

    <string name="notification_action_delay_1h">+1 hour</string>

    <string name="notification_action_delay_1d">+1 day</string>

    



    <!-- Strings for time UI widgets -->