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

Disable button instead of hiding it

Browse Source
This commit is contained in:
Erik Johansson
2018-01-22 19:58:22 +01:00
parent c9b46bf0b3
commit 1a5e94bb63
6 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
View File

@@ -179,8 +179,8 @@ public class DataEntryActivity extends Activity {
previousMeasurement = tupleScaleData[0]; previousMeasurement = tupleScaleData[0];
scaleMeasurement = tupleScaleData[1].clone(); scaleMeasurement = tupleScaleData[1].clone();
btnLeft.setVisibility(tupleScaleData[0] != null ? View.VISIBLE : View.INVISIBLE); btnLeft.setEnabled(tupleScaleData[0] != null);
btnRight.setVisibility(tupleScaleData[2] != null ? View.VISIBLE : View.INVISIBLE); btnRight.setEnabled(tupleScaleData[2] != null);
} }
} else { } else {
setViewMode(MeasurementView.MeasurementViewMode.ADD); setViewMode(MeasurementView.MeasurementViewMode.ADD);
@@ -217,10 +217,8 @@ public class DataEntryActivity extends Activity {
btnOk.setVisibility(View.VISIBLE); btnOk.setVisibility(View.VISIBLE);
btnAdd.setVisibility(View.GONE); btnAdd.setVisibility(View.GONE);
imageViewDelete.setVisibility(View.VISIBLE); imageViewDelete.setVisibility(View.VISIBLE);
if (scaleMeasurement == null) { btnLeft.setVisibility(View.VISIBLE);
btnLeft.setVisibility(View.VISIBLE); btnRight.setVisibility(View.VISIBLE);
btnRight.setVisibility(View.VISIBLE);
}
expandButton.setVisibility(View.VISIBLE); expandButton.setVisibility(View.VISIBLE);
switchEditMode.setVisibility(View.VISIBLE); switchEditMode.setVisibility(View.VISIBLE);
dateTimeVisibility = View.GONE; dateTimeVisibility = View.GONE;
@@ -229,10 +227,8 @@ public class DataEntryActivity extends Activity {
btnOk.setVisibility(View.VISIBLE); btnOk.setVisibility(View.VISIBLE);
btnAdd.setVisibility(View.GONE); btnAdd.setVisibility(View.GONE);
imageViewDelete.setVisibility(View.VISIBLE); imageViewDelete.setVisibility(View.VISIBLE);
if (scaleMeasurement == null) { btnLeft.setVisibility(View.VISIBLE);
btnLeft.setVisibility(View.VISIBLE); btnRight.setVisibility(View.VISIBLE);
btnRight.setVisibility(View.VISIBLE);
}
expandButton.setVisibility(View.VISIBLE); expandButton.setVisibility(View.VISIBLE);
switchEditMode.setVisibility(View.VISIBLE); switchEditMode.setVisibility(View.VISIBLE);
break; break;

1
android_app/app/src/main/res/drawable/flat_selector.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/rect_pressed"/> <item android:state_pressed="true" android:drawable="@drawable/rect_pressed"/>
<item android:state_enabled="false" android:drawable="@drawable/rect_disabled" />
<item android:drawable="@drawable/rect_normal"/> <item android:drawable="@drawable/rect_normal"/>
</selector> </selector>

6
android_app/app/src/main/res/drawable/rect_disabled.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/corner_radius" />
<solid android:color="@color/gray_disabled" />
</shape>

13
android_app/app/src/main/res/drawable/rect_normal.xml
View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/rect_pressed" /> <item android:drawable="@drawable/rect_pressed" />
<item android:bottom="@dimen/layer_padding"> <item android:bottom="@dimen/layer_padding">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="@dimen/corner_radius" /> <corners android:radius="@dimen/corner_radius" />
<solid android:color="@color/blue_normal" /> <solid android:color="@color/blue_normal" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

4
android_app/app/src/main/res/drawable/rect_pressed.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners android:radius="@dimen/corner_radius" /> <corners android:radius="@dimen/corner_radius" />
<solid android:color="@color/blue_pressed" /> <solid android:color="@color/blue_pressed" />
</shape> </shape>

5
android_app/app/src/main/res/values/colors.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="blue_pressed">@android:color/holo_blue_dark</color> <color name="blue_pressed">@android:color/holo_blue_dark</color>
<color name="blue_normal">@android:color/holo_blue_light</color> <color name="blue_normal">@android:color/holo_blue_light</color>
</resources> <color name="gray_disabled">#ccc</color>
</resources>