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

Commit fa88fbad authored by cretin45's avatar cretin45
Browse files

SetupWizard: Title and button bar text and padding size changes 

Change-Id: If99caaf8d14b0f90c48ea27d9e0a0dee2b37e6e1
parent 8ef13051

res/layout/button_bar.xml

+7 −8
Original line number Diff line number Diff line
@@ -14,23 +14,22 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

    android:id="@+id/button_bar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal">

    android:layout_height="wrap_content">



    <Button

        style="@style/ButtonBar.Left"

        android:id="@+id/prev_button"

        android:layout_width="0dp"

        android:layout_weight="1"/>

        android:layout_width="wrap_content"

        android:layout_alignParentLeft="true"/>



    <Button

        style="@style/ButtonBar.Right"

        android:id="@+id/next_button"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_width="wrap_content"

        android:layout_alignParentRight="true"

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



</LinearLayout>
 
 No newline at end of file
 
</RelativeLayout>
 
 No newline at end of file

res/values/dimens.xml

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

    <dimen name="logo_header_height">220dp</dimen>

    <dimen name="header_height">220dp</dimen>

    <dimen name="page_title_height">56dp</dimen>

    <dimen name="page_title_height">64dp</dimen>

    <dimen name="header_title_margin_left">26dp</dimen>

    <dimen name="header_logo_margin_left">25dp</dimen>

    <dimen name="header_logo_margin_bottom">11dp</dimen>

res/values/styles.xml

+7 −7
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


    <style name="PageTitle">

        <item name="android:id">@android:id/title</item>

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

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

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

        <item name="android:background">@color/primary_dark</item>

        <item name="android:layout_alignParentBottom">true</item>
@@ -60,25 +60,25 @@ 
    </style>



    <style name="ButtonBar" parent="@android:style/Widget.Material.ActionButton">

        <item name="android:layout_height">48dp</item>

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

        <item name="android:layout_height">56dp</item>

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

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

        <item name="android:maxLines">1</item>

        <item name="android:minWidth">15dp</item>

        <item name="android:minHeight">15dp</item>

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

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

        <item name="android:drawablePadding">5dp</item>

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

        <item name="android:drawablePadding">6dp</item>

    </style>



    <style name="ButtonBar.Left">

        <item name="android:paddingStart">15dp</item>

        <item name="android:paddingStart">34dp</item>

        <item name="android:gravity">center_vertical|start</item>

        <item name="android:drawableLeft">@drawable/ic_chevron_left_dark</item>

    </style>



    <style name="ButtonBar.Right">

        <item name="android:paddingEnd">15dp</item>

        <item name="android:paddingEnd">34dp</item>

        <item name="android:gravity">center_vertical|end</item>

        <item name="android:drawableRight">@drawable/ic_chevron_right_dark</item>

    </style>