Skip to content

Commit

Permalink
Minor updates to layouts
Browse files Browse the repository at this point in the history
  • Loading branch information
@trife
trife committed May 1, 2021
1 parent c4e7230 commit 53ac8bd
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 71 deletions.
15 changes: 8 additions & 7 deletions onekk/src/main/res/layout/contour_list_toolbar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@color/colorPrimary"
android:contentDescription="@string/back_button"
android:src="?attr/homeAsUpIndicator"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="@string/back_button" />
app:layout_constraintTop_toTopOf="parent" />

<TextView style="@style/Text.CountTitle"
<TextView
android:id="@+id/countTextView"
style="@style/Text.CountTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/countTextView"
app:layout_constraintStart_toEndOf="@id/backButton"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
62 changes: 33 additions & 29 deletions onekk/src/main/res/layout/fragment_contour_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<data>

<import type="android.view.View"/>
<import type="android.view.View" />

<variable
name="onClick"
Expand All @@ -17,65 +17,69 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<include layout="@layout/contour_list_toolbar"
<include
android:id="@+id/toolbar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
layout="@layout/contour_list_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/imageView"
android:visibility="gone"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:contentDescription="@string/frag_contour_list_image_content_description"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintStart_toStartOf="parent"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/contour_header"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />

<include android:id="@+id/contour_header"
<include
android:id="@+id/contour_header"
layout="@layout/header_contour"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="36dp"
android:layout_marginTop="16dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="16dp"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginEnd="12dp"
app:layout_constraintBottom_toTopOf="@id/recyclerView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/imageView"
app:layout_constraintBottom_toTopOf="@id/recyclerView"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/imageView" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="2dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="2dp"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/submitButton"
app:layout_constraintBottom_toBottomOf="@id/submitButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contour_header"
tools:listitem="@layout/list_item_contour" />

<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:id="@+id/submitButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:elevation="2dp"
android:scaleType="fitCenter"
android:text="@string/frag_contour_list_save_button"
android:textSize="24sp"
app:layout_constraintTop_toBottomOf="@id/recyclerView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/recyclerView" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
32 changes: 16 additions & 16 deletions onekk/src/main/res/layout/fragment_scale.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>

<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<include layout="@layout/scale_toolbar"
<include
android:id="@+id/toolbar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
layout="@layout/scale_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/imageView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="4dp"
android:contentDescription="@string/frag_scale_image_content_description"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintBottom_toTopOf="@+id/scaleFragmentEditText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />

<EditText
android:id="@+id/scaleFragmentEditText"
Expand All @@ -34,6 +36,7 @@
android:layout_marginEnd="8dp"
android:hint="@string/frag_scale_autofill_hint_weight"
android:inputType="numberDecimal"
android:selectAllOnFocus="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textSize="36sp"
Expand All @@ -44,19 +47,16 @@

<Button
android:id="@+id/scaleCaptureButton"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:elevation="2dp"
android:scaleType="fitCenter"
android:text="@string/frag_scale_weight_button_text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

Expand Down
17 changes: 0 additions & 17 deletions onekk/src/main/res/raw/changelog_releases.txt
View file

This file was deleted.

5 changes: 3 additions & 2 deletions onekk/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@
</style>

<style name="Text.CountTitle">
<item name="android:textSize">@dimen/text_count_size</item>
<item name="android:textAlignment">center</item>
<item name="android:textSize">@dimen/text_size</item>
<item name="android:textAlignment">viewEnd</item>
<item name="android:textStyle">bold</item>
</style>

<style name="Text.ObservationUnit">
Expand Down

0 comments on commit 53ac8bd

Please sign in to comment.