Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix generate config file layout and modify item checkbox margin. #2124

Merged
merged 2 commits into from
Oct 2, 2020
Merged

fix generate config file layout and modify item checkbox margin. #2124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
498a03b
fix generate config file layout and modify item checkbox margin.
CodeWithSouma Aug 30, 2020
9f60aca
remove hard-coding value from create_config file and put into dimens.xml
CodeWithSouma Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions app/src/main/res/layout/activity_create_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,61 +14,67 @@

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/height_zero"
android:orientation="vertical"
android:padding="@dimen/config_activity_padding">

<LinearLayout
android:id="@+id/select_instrument"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/height_zero"
android:layout_weight="@dimen/weight_one"
android:orientation="horizontal">

<TextView
android:id="@+id/select_instrument_title"
style="@style/Base.TextAppearance.AppCompat.Title"
android:layout_width="wrap_content"
android:layout_width="@dimen/width_zero"
android:layout_weight="@dimen/weight_one"
android:textSize="@dimen/text_size_of_label"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/select_instrument_title" />

<android.support.v7.widget.AppCompatSpinner
android:id="@+id/select_instrument_spinner"
android:layout_width="match_parent"
android:layout_width="@dimen/width_zero"
android:layout_weight="@dimen/weight_two"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAlignment="center" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/height_zero"
android:layout_weight="@dimen/weight_one"
android:layout_marginTop="@dimen/create_config_margin1"
android:orientation="horizontal">

<TextView
android:id="@+id/time_interval_title"
style="@style/Base.TextAppearance.AppCompat.Title"
android:layout_width="wrap_content"
android:textSize="@dimen/text_size_of_label"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/time_interval_title" />

<EditText
android:id="@+id/interval_edit_text"
android:layout_width="0dp"
android:layout_width="@dimen/width_zero"
android:layout_weight="@dimen/weight_three"
android:layout_height="wrap_content"
android:hint="@string/time_interval_hint"
android:imeOptions="actionDone"
android:inputType="number"
android:textAlignment="center"
android:layout_gravity="center"
android:layout_weight="1"/>
android:layout_gravity="center"/>

<android.support.v7.widget.AppCompatSpinner
android:id="@+id/interval_unit_spinner"
android:layout_width="wrap_content"
android:layout_width="@dimen/width_zero"
android:layout_weight="@dimen/weight_one"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
</LinearLayout>
Expand All @@ -79,13 +85,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAlignment="center"
android:textSize="@dimen/text_size_of_heading"
android:layout_marginTop="@dimen/create_config_margin2"
android:text="@string/select_params_title" />

<android.support.v7.widget.RecyclerView
android:id="@+id/params_list_container"
android:layout_width="match_parent"
android:layout_height="@dimen/create_config_recycler_view"
android:layout_height="@dimen/height_zero"
android:layout_weight="@dimen/weight_four"
android:layout_marginTop="@dimen/create_config_margin1" />

<Button
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/item_checkbox.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/check_box_magin"
android:layout_marginBottom="@dimen/check_box_magin"
android:layout_margin="@dimen/check_box_magin"
app:cardCornerRadius="@dimen/check_box_corner">

<LinearLayout
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@
<dimen name="device_status_height">80dp</dimen>
<dimen name="device_status_textsize">20sp</dimen>
<dimen name="config_activity_padding">9dp</dimen>
<dimen name="height_zero">0dp</dimen>
<dimen name="width_zero">0dp</dimen>
<dimen name="weight_one">1</dimen>
<dimen name="weight_two">2</dimen>
<dimen name="weight_three">3</dimen>
<dimen name="weight_four">4</dimen>
<dimen name="text_size_of_label">17sp</dimen>
<dimen name="text_size_of_heading">20sp</dimen>

<dimen name="multimeter_layout_margin">20dp</dimen>
<dimen name="multimeter_line_width">1dp</dimen>
Expand Down Expand Up @@ -359,7 +367,7 @@
<dimen name="create_config_margin4">12dp</dimen>
<dimen name="create_config_recycler_view">280dp</dimen>
<dimen name="check_box_width">0dp</dimen>
<dimen name="check_box_magin">4dp</dimen>
<dimen name="check_box_magin">5dp</dimen>
<dimen name="check_box_corner">5dp</dimen>
<dimen name="sensor_sht21_margin">5dp</dimen>
<dimen name="sht21_height">40dp</dimen>
Expand Down