Skip to content

Commit

Permalink
a little #10 and some #11
Browse files Browse the repository at this point in the history
  • Loading branch information
@DWolkewitz
DWolkewitz committed Jun 28, 2017
1 parent 602e598 commit d9c2d1f
Show file tree
Hide file tree
Showing 4 changed files with 179 additions and 156 deletions.
27 changes: 24 additions & 3 deletions app/src/main/res/layout/fragment_credits.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,30 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<ListView
android:id="@+id/credits_listCredits"

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

<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/string_developers" />

<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/string_share" />

<TextView
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/string_license" />
</LinearLayout>

<android.support.design.widget.FloatingActionButton
android:id="@+id/credits_buttonEmail"
Expand All @@ -26,6 +46,7 @@
android:clickable="true"
app:fabSize="normal"
app:srcCompat="@android:drawable/ic_dialog_email" />

</FrameLayout>


Expand Down
299 changes: 146 additions & 153 deletions app/src/main/res/layout/fragment_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,184 +8,177 @@
app:layout_collapseParallaxMultiplier="1.0">


<LinearLayout
<ScrollView
android:layout_width="match_parent"
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_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="wrap_content"
android:layout_marginTop="@dimen/small_fab_margin"
android:orientation="horizontal">

<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_weight="1"
android:text="@string/string_amount_of_periods"
android:textStyle="bold" />

<TextView
android:id="@+id/settings_textviewSeekbarPeriodsPos"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/big_fab_margin"
android:layout_marginStart="@dimen/fab_margin"
android:layout_weight="1"
android:text=""
android:textAlignment="textEnd"
android:textStyle="bold" />

</LinearLayout>

<SeekBar
android:id="@+id/settings_seekbarPeriods"
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:max="15" />

<TextView
android:id="@+id/settings_labelSchooldays"
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="16dp"
android:text="@string/string_days_per_week"
android:textStyle="bold" />
android:layout_height="match_parent">

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


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

<CheckBox
android:id="@+id/settings_checkBox_for_monday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/small_fab_margin"
android:text="@string/string_day_monday" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<CheckBox
android:id="@+id/settings_checkBox_for_tuesday"
android:layout_width="wrap_content"
<TextView
android:id="@+id/settings_labelGeneral"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/string_day_tuesday" />
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" />

<CheckBox
android:id="@+id/settings_checkBox_for_wednesday"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/string_day_wednesday" />
</LinearLayout>
android:layout_marginTop="@dimen/small_fab_margin"
android:orientation="horizontal">

<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_weight="1"
android:text="@string/string_amount_of_periods"
android:textStyle="bold" />

<TextView
android:id="@+id/settings_textviewSeekbarPeriodsPos"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/big_fab_margin"
android:layout_marginStart="@dimen/fab_margin"
android:layout_weight="1"
android:text=""
android:textAlignment="textEnd"
android:textStyle="bold" />

</LinearLayout>

<SeekBar
android:id="@+id/settings_seekbarPeriods"
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:max="15" />

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

<CheckBox
android:id="@+id/settings_checkBox_for_thursday"
android:layout_width="wrap_content"
<TextView
android:id="@+id/settings_labelSchooldays"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/string_day_thursday" />
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="16dp"
android:text="@string/string_days_per_week"
android:textStyle="bold" />

<CheckBox
android:id="@+id/settings_checkBox_for_friday"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginTop="@dimen/small_fab_margin"
android:orientation="vertical">


<CheckBox
android:id="@+id/settings_checkBox_for_monday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/string_day_monday" />

<CheckBox
android:id="@+id/settings_checkBox_for_tuesday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/string_day_tuesday" />

<CheckBox
android:id="@+id/settings_checkBox_for_wednesday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/string_day_wednesday" />

<CheckBox
android:id="@+id/settings_checkBox_for_thursday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/string_day_thursday" />

<CheckBox
android:id="@+id/settings_checkBox_for_friday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/string_day_friday" />

<CheckBox
android:id="@+id/settings_checkBox_for_saturday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/string_day_saturday" />

</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" />

<Spinner
android:id="@+id/settings_spinnerDate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="@string/string_day_friday" />
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginTop="@dimen/fab_margin" />

<CheckBox
android:id="@+id/settings_checkBox_for_saturday"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/string_day_saturday" />
<TextView
android:id="@+id/settings_labelPersonalisation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginStart="@dimen/small_fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:text="@string/string_personalisation" />

<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:text="@string/string_select_theme_color"
android:textStyle="bold" />

<Spinner
android:id="@+id/settings_spinnerColor"
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" />
</LinearLayout>

</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" />

<Spinner
android:id="@+id/settings_spinnerDate"
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" />

<TextView
android:id="@+id/settings_labelPersonalisation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginStart="@dimen/small_fab_margin"
android:layout_marginTop="@dimen/fab_margin"
android:text="@string/string_personalisation" />

<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:text="@string/string_select_theme_color"
android:textStyle="bold" />

<Spinner
android:id="@+id/settings_spinnerColor"
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" />
</LinearLayout>
</ScrollView>

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

<Button
android:id="@+id/settings_buttonSave"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,8 @@
<string name="string_select_color">Wählen Sie eine Farbe</string>
<string name="string_day_monday">Montag</string>
<string name="string_days_per_week">Schultage</string>
<string name="string_developers">Entwickler</string>
<string name="hello_blank_fragment" translatable="false"></string>
<string name="string_license">Lizenz</string>
<string name="string_share">Teile diese App!</string>
</resources>
5 changes: 5 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,9 @@
<string name="string_cancel">Cancel</string>
<string name="string_select_color">Select Color</string>
<string name="string_days_per_week">Schooldays</string>

<string name="string_license">License</string>
<string name="string_developers">Developers</string>
<string name="string_share">Share this App!</string>

</resources>

0 comments on commit d9c2d1f

Please sign in to comment.