Skip to content

Commit

Permalink
#11 & added some strings
Browse files Browse the repository at this point in the history
  • Loading branch information
natascha.becker committed Jun 6, 2017
1 parent 7bb7463 commit ca4c290
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 10 deletions.
92 changes: 82 additions & 10 deletions app/src/main/res/layout/fragment_settings.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,93 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/settings_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.SettingsFragment">
android:orientation="vertical"
app:layout_collapseMode="none"
app:layout_collapseParallaxMultiplier="1.0">

<!-- TODO: Update blank fragment layout -->
<TextView
android:id="@+id/settings_labelDatabase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:text="@string/string_database_settings"
android:textStyle="italic" />

<TextView
android:id="@+id/settings_labelPeriods"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:text="@string/string_amount_of_periods"
android:textStyle="bold" />

<LinearLayout
<SeekBar
android:id="@+id/settings_seekbarPeriods"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:max="15" />

</LinearLayout>
<TextView
android:id="@+id/settings_labelDate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:text="@string/string_select_date_format"
android:textStyle="bold" />

<ListView
<Spinner
android:id="@+id/settings_spinnerDate"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="wrap_content"
android:layout_marginTop="16dp" />

</FrameLayout>
<TextView
android:id="@+id/settings_labelPersonalisation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:text="@string/string_personalisation"
android:textStyle="italic" />

<TextView
android:id="@+id/settings_labelLanguage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:textStyle="bold"
android:text="@string/string_select_language" />

<Spinner
android:id="@+id/settings_spinnerLanguage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"/>

<TextView
android:id="@+id/settings_labelColor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:textStyle="bold"
android:text="@string/string_select_theme_color" />

<Spinner
android:id="@+id/settings_spinnerColor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"/>
</LinearLayout>
6 changes: 6 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
<string name="string_confirm_delete">Confirm Delete</string>
<string name="string_do_you_really_want_to_delete_this_object_this_will_also_lead_to_the_deletion_of">Do you really want to delete this object? This will also lead to the deletion of</string>
<string name="string_related_objects">related objects.</string>
<string name="string_select_date_format">Select date format</string>
<string name="string_amount_of_periods">Amount of periods</string>
<string name="string_select_language">Select language</string>
<string name="string_database_settings">Database settings</string>
<string name="string_personalisation">Personalisation</string>
<string name="string_select_theme_color">Select theme color</string>

<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
Expand Down

0 comments on commit ca4c290

Please sign in to comment.