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

- don't force the orientation to landscape mode

Browse Source
This commit is contained in:
OliE
2016-02-12 16:47:36 +01:00
parent efb37aaea9
commit 2737a385a2
7 changed files with 1309 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.health.openscale" package="com.health.openscale"
android:versionCode="6" android:versionCode="7"
android:versionName="1.3" > android:versionName="1.3.1" >
<uses-permission android:name="android.permission.BLUETOOTH"/> <uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

15
android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
View File

@@ -15,11 +15,9 @@
*/ */
package com.health.openscale.gui; package com.health.openscale.gui;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
@@ -876,19 +874,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
} }
} }
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (isVisibleToUser) {
if ((getActivity().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_XLARGE &&
(getActivity().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_LARGE) {
Activity a = getActivity();
if (a != null) a.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
}
}
}
private class LineChartTouchListener implements LineChartOnValueSelectListener { private class LineChartTouchListener implements LineChartOnValueSelectListener {
@Override @Override
public void onValueSelected(int lineIndex, int pointIndex, PointValue pointValue) { public void onValueSelected(int lineIndex, int pointIndex, PointValue pointValue) {

987
android_app/app/src/main/res/layout-large/fragment_overview.xml Normal file
View File

@@ -0,0 +1,987 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
tools:context="com.health.openscale.MainActivity$PlaceholderFragment"
android:weightSum="100"
android:padding="10dp">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/scrollView"
android:layout_weight="100">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_title_user"
android:id="@+id/txtTitleUser"
android:layout_weight="0"
android:textSize="20dp"/>
<Spinner
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/spinUser"
android:textSize="20dp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:weightSum="100">
<lecho.lib.hellocharts.view.PieChartView
android:id="@+id/pieChartLast"
android:layout_width="300dp"
android:layout_height="200dp"
android:measureWithLargestChild="false"
android:layout_weight="30" />
<lecho.lib.hellocharts.view.LineChartView
android:id="@+id/lineChartLast"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="70" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_title_last_measurement"
android:id="@+id/txtTitleLastMeasurment"
android:autoText="false"
android:textSize="20dp"
android:typeface="monospace" />
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<TableLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="90"
android:stretchColumns="1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowWeight">
<ImageView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:id="@+id/imageView11"
android:src="@drawable/weight"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_weight"
android:id="@+id/txtLabelWeight"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1kg"
android:id="@+id/txtWeightLast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorWeight" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowGaugeWeight"
android:visibility="gone"
android:layout_marginBottom="10dp">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeWeight" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowBMI">
<ImageView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:id="@+id/imageView"
android:src="@drawable/bmi"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_bmi"
android:id="@+id/txtLabelBMI"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1"
android:id="@+id/txtBMILast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorBMI" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeBMI"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeBMI" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowFat"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView2"
android:src="@drawable/fat"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_fat"
android:id="@+id/txtLabelFat"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %"
android:id="@+id/txtFatLast"
android:layout_column="2"
android:layout_gravity="center_vertical" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorFat" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeFat"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeFat" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowMuscle"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView3"
android:src="@drawable/muscle"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_muscle"
android:id="@+id/txtLabelMuscle"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %"
android:id="@+id/txtMuscleLast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorMuscle" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeMuscle"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeMuscle" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowWater"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView4"
android:src="@drawable/water"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_water"
android:id="@+id/txtLabelWater"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %"
android:id="@+id/txtWaterLast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorWater" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeWater"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeWater" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowWaist"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView45"
android:src="@drawable/waist"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_waist"
android:id="@+id/txtLabelWaist"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %"
android:id="@+id/txtWaistLast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorWaist" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeWaist"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeWaist" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowWHtR"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView456"
android:src="@drawable/whtr"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_whtr"
android:id="@+id/txtLabelWHtR"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1"
android:id="@+id/txtWHtRLast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorWHtR" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeWHtR"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeWHtR" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowHip"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView16"
android:src="@drawable/hip"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_hip"
android:id="@+id/txtLabelHip"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %"
android:id="@+id/txtHipLast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorHip" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeHip"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeHip" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRowWHR"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView49"
android:src="@drawable/whr"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_whr"
android:id="@+id/txtLabelWHR"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1"
android:id="@+id/txtWHRLast"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="fill_parent"
android:id="@+id/indicatorWHR" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:id="@+id/tableRowGaugeWHR"
android:visibility="gone">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<com.health.openscale.core.LinearGaugeView
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:id="@+id/linearGaugeWHR" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
<Space
android:layout_width="20px"
android:layout_height="20px" />
</TableRow>
</TableLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_title_goal"
android:id="@+id/txtTitleGoal"
android:autoText="false"
android:textSize="20dp"
android:typeface="monospace"
android:layout_marginTop="20dp" />
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<TableLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="90"
android:stretchColumns="1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView5"
android:src="@drawable/target"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Target weight"
android:id="@+id/txtLabelGoalWeight"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 kg"
android:id="@+id/txtGoalWeight"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRow9"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView6"
android:src="@drawable/difference"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Weight difference"
android:id="@+id/txtLabelGoalDiff"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 kg"
android:id="@+id/txtGoalDiff"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRow10"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView7"
android:src="@drawable/daysleft"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Days left"
android:id="@+id/txtLabelDayLeft"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 days"
android:id="@+id/txtGoalDayLeft"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
</TableRow>
</TableLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_title_statistics"
android:id="@+id/txtTitleStatistics"
android:autoText="false"
android:textSize="20dp"
android:typeface="monospace"
android:layout_marginTop="20dp" />
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<TableLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="90"
android:stretchColumns="1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView8"
android:src="@drawable/lastweek"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Last 7 days"
android:id="@+id/txtLabelAvgWeek"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1"
android:id="@+id/txtAvgWeek"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:id="@+id/tableRow11"
android:layout_marginBottom="10dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/imageView9"
android:src="@drawable/lastmonth"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Last 30 days"
android:id="@+id/txtLabelAvgMonth"
android:layout_column="1"
android:textAlignment="center"
android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false"
android:phoneNumber="false"
android:lines="2"
android:layout_marginRight="50dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1"
android:id="@+id/txtAvgMonth"
android:layout_column="2"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp" />
</TableRow>
</TableLayout>
</LinearLayout>
</ScrollView>
<Button
android:id="@+id/btnInsertData"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/flat_selector"
android:text="+"
android:textColor="@android:color/white" />
</LinearLayout>

144
android_app/app/src/main/res/layout-large/fragment_table.xml Normal file
View File

@@ -0,0 +1,144 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp"
tools:context="com.health.openscale.MainActivity$PlaceholderFragment">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="80dp" >
<TableLayout
android:id="@+id/tableDataView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:shrinkColumns="*">
<TableRow
android:id="@+id/tableHeader"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_id"
android:textStyle="bold"
android:id="@+id/txtIdTableHeader"
android:visibility="gone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_date"
android:textStyle="bold"
android:id="@+id/txtDateTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_time"
android:textStyle="bold"
android:id="@+id/txtTimeTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_weight"
android:textStyle="bold"
android:id="@+id/txtWeightTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_fat"
android:textStyle="bold"
android:id="@+id/txtFatTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_water"
android:textStyle="bold"
android:id="@+id/txtWaterTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_muscle"
android:textStyle="bold"
android:id="@+id/txtMuscleTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_waist"
android:textStyle="bold"
android:id="@+id/txtWaistTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_hip"
android:textStyle="bold"
android:id="@+id/txtHipTableHeader" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_comment"
android:textStyle="bold"
android:id="@+id/txtCommentTableHeader" />
<Button
android:id="@+id/btnDeleteAll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/flat_selector"
android:minHeight="20dp"
android:minWidth="10dp"
android:text="@string/label_delete_all"
android:textColor="@android:color/white"
android:textSize="10sp"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</TableRow>
</TableLayout>
</ScrollView>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="15dp" >
<Button
android:id="@+id/btnImportData"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:background="@drawable/flat_selector"
android:text="@string/label_import"
android:textColor="@android:color/white" />
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.5" />
<Button
android:id="@+id/btnExportData"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:background="@drawable/flat_selector"
android:text="@string/label_export"
android:textColor="@android:color/white" />
</LinearLayout>
</RelativeLayout>

5
android_app/app/src/main/res/layout/fragment_graph.xml
View File

@@ -2,10 +2,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin" android:padding="5dp"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.health.openscale.MainActivity$PlaceholderFragment" > tools:context="com.health.openscale.MainActivity$PlaceholderFragment" >
<LinearLayout <LinearLayout

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

@@ -8,7 +8,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
tools:context="com.health.openscale.MainActivity$PlaceholderFragment" tools:context="com.health.openscale.MainActivity$PlaceholderFragment"
android:weightSum="100" android:weightSum="100"
android:padding="10dp"> android:padding="5dp">
<ScrollView <ScrollView
@@ -49,27 +49,19 @@
android:layout_height="1dp" android:layout_height="1dp"
android:background="@android:color/darker_gray"/> android:background="@android:color/darker_gray"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:weightSum="100">
<lecho.lib.hellocharts.view.PieChartView <lecho.lib.hellocharts.view.PieChartView
android:id="@+id/pieChartLast" android:id="@+id/pieChartLast"
android:layout_width="300dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="150dp"
android:measureWithLargestChild="false" android:layout_gravity="center"/>
android:layout_weight="30" />
<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="match_parent" android:layout_height="150dp"
android:layout_weight="70" /> android:layout_gravity="center"/>
</LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -88,50 +80,51 @@
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="90"
android:stretchColumns="1"> android:stretchColumns="1">
<TableRow <TableRow
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginBottom="10dp" android:layout_marginBottom="5dp"
android:weightSum="100"
android:id="@+id/tableRowWeight"> android:id="@+id/tableRowWeight">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView11" android:id="@+id/imageView11"
android:src="@drawable/weight" android:src="@drawable/weight"
android:layout_gravity="center" /> android:layout_gravity="center"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_weight" android:text="@string/label_weight"
android:id="@+id/txtLabelWeight" android:id="@+id/txtLabelWeight"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2"/>
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1kg" android:text="-1kg"
android:id="@+id/txtWeightLast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:id="@+id/txtWeightLast"
android:layout_marginRight="20dp" /> android:layout_gravity="center_vertical"/>
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorWeight" /> android:id="@+id/indicatorWeight" />
</TableRow> </TableRow>
@@ -166,42 +159,45 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:weightSum="100"
android:id="@+id/tableRowBMI"> android:id="@+id/tableRowBMI">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView" android:id="@+id/imageView"
android:src="@drawable/bmi" android:src="@drawable/bmi"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_bmi" android:text="@string/label_bmi"
android:id="@+id/txtLabelBMI" android:id="@+id/txtLabelBMI"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1" android:text="-1"
android:id="@+id/txtBMILast" android:id="@+id/txtBMILast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorBMI" /> android:id="@+id/indicatorBMI" />
</TableRow> </TableRow>
@@ -211,6 +207,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:weightSum="100"
android:id="@+id/tableRowGaugeBMI" android:id="@+id/tableRowGaugeBMI"
android:visibility="gone"> android:visibility="gone">
@@ -237,33 +234,37 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/tableRowFat" android:id="@+id/tableRowFat"
android:weightSum="100"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView2" android:id="@+id/imageView2"
android:src="@drawable/fat" android:src="@drawable/fat"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_fat" android:text="@string/label_fat"
android:id="@+id/txtLabelFat" android:id="@+id/txtLabelFat"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2"/>
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %" android:text="-1 %"
android:id="@+id/txtFatLast" android:id="@+id/txtFatLast"
@@ -271,7 +272,7 @@
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorFat" /> android:id="@+id/indicatorFat" />
</TableRow> </TableRow>
@@ -307,42 +308,45 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/tableRowMuscle" android:id="@+id/tableRowMuscle"
android:weightSum="100"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView3" android:id="@+id/imageView3"
android:src="@drawable/muscle" android:src="@drawable/muscle"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_muscle" android:text="@string/label_muscle"
android:id="@+id/txtLabelMuscle" android:id="@+id/txtLabelMuscle"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %" android:text="-1 %"
android:id="@+id/txtMuscleLast" android:id="@+id/txtMuscleLast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorMuscle" /> android:id="@+id/indicatorMuscle" />
</TableRow> </TableRow>
@@ -382,38 +386,40 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView4" android:id="@+id/imageView4"
android:src="@drawable/water" android:src="@drawable/water"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_water" android:text="@string/label_water"
android:id="@+id/txtLabelWater" android:id="@+id/txtLabelWater"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2"/>
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %" android:text="-1 %"
android:id="@+id/txtWaterLast" android:id="@+id/txtWaterLast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorWater" /> android:id="@+id/indicatorWater" />
</TableRow> </TableRow>
@@ -453,38 +459,40 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView45" android:id="@+id/imageView45"
android:src="@drawable/waist" android:src="@drawable/waist"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_waist" android:text="@string/label_waist"
android:id="@+id/txtLabelWaist" android:id="@+id/txtLabelWaist"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %" android:text="-1 %"
android:id="@+id/txtWaistLast" android:id="@+id/txtWaistLast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorWaist" /> android:id="@+id/indicatorWaist" />
</TableRow> </TableRow>
@@ -523,38 +531,40 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView456" android:id="@+id/imageView456"
android:src="@drawable/whtr" android:src="@drawable/whtr"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_whtr" android:text="@string/label_whtr"
android:id="@+id/txtLabelWHtR" android:id="@+id/txtLabelWHtR"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1" android:text="-1"
android:id="@+id/txtWHtRLast" android:id="@+id/txtWHtRLast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorWHtR" /> android:id="@+id/indicatorWHtR" />
</TableRow> </TableRow>
@@ -593,35 +603,37 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView16" android:id="@+id/imageView16"
android:src="@drawable/hip" android:src="@drawable/hip"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_hip" android:text="@string/label_hip"
android:id="@+id/txtLabelHip" android:id="@+id/txtLabelHip"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 %" android:text="-1 %"
android:id="@+id/txtHipLast" android:id="@+id/txtHipLast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"/>
android:layout_marginRight="20dp" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="10dp"
@@ -665,38 +677,40 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView49" android:id="@+id/imageView49"
android:src="@drawable/whr" android:src="@drawable/whr"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/label_whr" android:text="@string/label_whr"
android:id="@+id/txtLabelWHR" android:id="@+id/txtLabelWHR"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1" android:text="-1"
android:id="@+id/txtWHRLast" android:id="@+id/txtWHRLast"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="2dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:id="@+id/indicatorWHR" /> android:id="@+id/indicatorWHR" />
</TableRow> </TableRow>
@@ -734,9 +748,9 @@
android:text="@string/label_title_goal" android:text="@string/label_title_goal"
android:id="@+id/txtTitleGoal" android:id="@+id/txtTitleGoal"
android:autoText="false" android:autoText="false"
android:textSize="20dp" android:textSize="25dp"
android:typeface="monospace" android:typeface="monospace"
android:layout_marginTop="20dp" /> android:layout_marginTop="25dp" />
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -757,35 +771,37 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView5" android:id="@+id/imageView5"
android:src="@drawable/target" android:src="@drawable/target"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Target weight" android:text="Target weight"
android:id="@+id/txtLabelGoalWeight" android:id="@+id/txtLabelGoalWeight"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 kg" android:text="-1 kg"
android:id="@+id/txtGoalWeight" android:id="@+id/txtGoalWeight"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"/>
android:layout_marginRight="20dp" />
</TableRow> </TableRow>
<TableRow <TableRow
@@ -797,35 +813,37 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView6" android:id="@+id/imageView6"
android:src="@drawable/difference" android:src="@drawable/difference"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Weight difference" android:text="Weight difference"
android:id="@+id/txtLabelGoalDiff" android:id="@+id/txtLabelGoalDiff"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2"/>
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 kg" android:text="-1 kg"
android:id="@+id/txtGoalDiff" android:id="@+id/txtGoalDiff"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"/>
android:layout_marginRight="20dp" />
</TableRow> </TableRow>
<TableRow <TableRow
@@ -837,35 +855,37 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView7" android:id="@+id/imageView7"
android:src="@drawable/daysleft" android:src="@drawable/daysleft"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Days left" android:text="Days left"
android:id="@+id/txtLabelDayLeft" android:id="@+id/txtLabelDayLeft"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2"/>
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1 days" android:text="-1 days"
android:id="@+id/txtGoalDayLeft" android:id="@+id/txtGoalDayLeft"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"/>
android:layout_marginRight="20dp" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
@@ -876,9 +896,9 @@
android:text="@string/label_title_statistics" android:text="@string/label_title_statistics"
android:id="@+id/txtTitleStatistics" android:id="@+id/txtTitleStatistics"
android:autoText="false" android:autoText="false"
android:textSize="20dp" android:textSize="25dp"
android:typeface="monospace" android:typeface="monospace"
android:layout_marginTop="20dp" /> android:layout_marginTop="25dp" />
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -899,35 +919,37 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView8" android:id="@+id/imageView8"
android:src="@drawable/lastweek" android:src="@drawable/lastweek"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Last 7 days" android:text="Last 7 days"
android:id="@+id/txtLabelAvgWeek" android:id="@+id/txtLabelAvgWeek"
android:layout_column="1" android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2"/>
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1" android:text="-1"
android:id="@+id/txtAvgWeek" android:id="@+id/txtAvgWeek"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
</TableRow> </TableRow>
<TableRow <TableRow
@@ -935,39 +957,41 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/tableRow11" android:id="@+id/tableRow11"
android:weightSum="100"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="25dp"
android:id="@+id/imageView9" android:id="@+id/imageView9"
android:src="@drawable/lastmonth" android:src="@drawable/lastmonth"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="80"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Last 30 days" android:text="Last 30 days"
android:id="@+id/txtLabelAvgMonth" android:id="@+id/txtLabelAvgMonth"
android:layout_column="1"
android:textAlignment="center" android:textAlignment="center"
android:singleLine="false" android:singleLine="false"
android:layout_marginLeft="20dp" android:layout_marginLeft="5dp"
android:password="false" android:password="false"
android:phoneNumber="false" android:phoneNumber="false"
android:lines="2" android:lines="2" />
android:layout_marginRight="50dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="20"
android:textSize="15dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:text="-1" android:text="-1"
android:id="@+id/txtAvgMonth" android:id="@+id/txtAvgMonth"
android:layout_column="2" android:layout_column="2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
android:layout_marginRight="20dp" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>

25
android_app/app/src/main/res/layout/fragment_table.xml
View File

@@ -2,22 +2,18 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin" android:padding="5dp"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.health.openscale.MainActivity$PlaceholderFragment"> tools:context="com.health.openscale.MainActivity$PlaceholderFragment">
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="match_parent" android:layout_height="fill_parent"
android:layout_marginBottom="80dp" > android:layout_marginBottom="50dp" >
<TableLayout <TableLayout
android:id="@+id/tableDataView" android:id="@+id/tableDataView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:measureWithLargestChild="false"
android:shrinkColumns="*"> android:shrinkColumns="*">
<TableRow <TableRow
@@ -101,24 +97,21 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/flat_selector" android:background="@drawable/flat_selector"
android:minHeight="20dp" android:minHeight="10dp"
android:minWidth="10dp" android:minWidth="5dp"
android:text="@string/label_delete_all" android:text="@string/label_delete_all"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="10sp" android:textSize="5dp" />
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</ScrollView> </ScrollView>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true" >
android:layout_marginBottom="15dp" >
<Button <Button
android:id="@+id/btnImportData" android:id="@+id/btnImportData"