mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 00:33:09 +02:00
Code Issues Releases Wiki Activity

replaced add measurement button with floating button.

Browse Source
This commit is contained in:
OliE
2018-02-03 19:40:03 +01:00
parent f0df98485e
commit 2a27c3801d
1 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
android_app/app/src/main/res/layout/fragment_overview.xml
View File

@@ -1,98 +1,117 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.design.widget.CoordinatorLayout
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" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:weightSum="100" android:orientation="vertical"
android:padding="5dp"> android:padding="5dp"
android:weightSum="100">
<ScrollView <ScrollView
android:id="@+id/scrollView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/scrollView"
android:layout_weight="100"> android:layout_weight="100">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/txtTitleUser"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_title_user"
android:id="@+id/txtTitleUser"
android:layout_weight="0" android:layout_weight="0"
android:textSize="20dp"/> android:text="@string/label_title_user"
android:textSize="20dp" />
<Spinner <Spinner
android:id="@+id/spinUser"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/spinUser"
android:textSize="20dp" /> android:textSize="20dp" />
</LinearLayout> </LinearLayout>
<View <View
android:id="@+id/userLineSeparator"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:id="@+id/userLineSeparator" android:background="@android:color/darker_gray" />
android:background="@android:color/darker_gray"/>
<lecho.lib.hellocharts.view.PieChartView <lecho.lib.hellocharts.view.PieChartView
android:id="@+id/pieChartLast" android:id="@+id/pieChartLast"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="150dp" android:layout_height="150dp"
android:layout_gravity="center"/> android:layout_gravity="center" />
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
android:id="@+id/lineChartLast" android:id="@+id/lineChartLast"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="150dp" android:layout_height="150dp"
android:layout_gravity="center"/> android:layout_gravity="center" />
<TextView <TextView
android:id="@+id/txtTitleLastMeasurment"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_title_last_measurement"
android:id="@+id/txtTitleLastMeasurment"
android:autoText="false" android:autoText="false"
android:text="@string/label_title_last_measurement"
android:textSize="20dp" android:textSize="20dp"
android:typeface="monospace" /> android:typeface="monospace" />
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@android:color/darker_gray"/> android:background="@android:color/darker_gray" />
<TableLayout <TableLayout
android:id="@+id/tableLayoutMeasurements"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"></TableLayout>
android:id="@+id/tableLayoutMeasurements">
</TableLayout> <Space
android:layout_width="match_parent"
android:layout_height="80dp" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<Button <android.support.design.widget.FloatingActionButton
android:id="@+id/btnInsertData" android:id="@+id/btnInsertData"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/flat_selector" android:layout_margin="16dp"
android:clickable="true"
android:textColor="@android:color/white"
app:backgroundTint="#33B5E5"
app:layout_anchor="@id/scrollView"
app:layout_anchorGravity="bottom|right|end" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="+" android:text="+"
android:textColor="@android:color/white" /> android:elevation="6dp"
android:textSize="18dp"
android:textColor="#fff"
app:layout_anchor="@id/btnInsertData"
app:layout_anchorGravity="center"/>
</android.support.design.widget.CoordinatorLayout>
</LinearLayout>