Skip to content

Commit

Permalink
reorientated save button in settings #11
Browse files Browse the repository at this point in the history
  • Loading branch information
Schmitt-Florian committed Jun 10, 2017
1 parent 9c92464 commit ea04466
Showing 1 changed file with 19 additions and 21 deletions.
40 changes: 19 additions & 21 deletions app/src/main/res/layout/fragment_settings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_main"
android:layout_width="match_parent"
Expand All @@ -7,24 +7,26 @@
app:layout_collapseMode="none"
app:layout_collapseParallaxMultiplier="1.0">


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"

android:orientation="vertical">

<TextView
android:id="@+id/settings_labelGeneral"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/small_fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginStart="@dimen/small_fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:text="@string/string_general_settings"
android:textStyle="italic" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_fab_margin"
android:orientation="horizontal">

Expand All @@ -42,10 +44,10 @@
android:id="@+id/settings_textviewSeekbarPeriodsPos"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/big_fab_margin"
android:layout_marginEnd="@dimen/big_fab_margin"
android:layout_marginStart="@dimen/fab_margin"
android:layout_weight="1"
android:text="15"
android:text=""
android:textAlignment="textEnd"
android:textStyle="bold" />

Expand Down Expand Up @@ -78,19 +80,12 @@
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="@dimen/fab_margin" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:id="@+id/settings_labelPersonalisation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/small_fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginStart="@dimen/small_fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:text="@string/string_personalisation"
android:textStyle="italic" />
Expand Down Expand Up @@ -130,18 +125,21 @@
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="@dimen/fab_margin" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true">

<Button
android:id="@+id/settings_buttonSave"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:backgroundTint="@color/accent"
android:text="@string/string_save" />
</LinearLayout>
</LinearLayout>

</RelativeLayout>

0 comments on commit ea04466

Please sign in to comment.