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

Merge pull request #176 from erijo/color

Browse Source 
use of AppCompat
This commit is contained in:
OliE
2018-02-08 17:16:23 +01:00
committed by GitHub
parent 7bff693926 4ea32a4298
commit 8159cb8a18
4 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,6 @@
*/ */
package com.health.openscale.gui.activities; package com.health.openscale.gui.activities;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -25,6 +24,7 @@ import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TableLayout; import android.widget.TableLayout;
@@ -58,7 +58,7 @@ import java.util.Date;
import lecho.lib.hellocharts.util.ChartUtils; import lecho.lib.hellocharts.util.ChartUtils;
public class DataEntryActivity extends Activity { public class DataEntryActivity extends AppCompatActivity {
public static String EXTRA_ID = "id"; public static String EXTRA_ID = "id";
private ArrayList<MeasurementView> dataEntryMeasurements; private ArrayList<MeasurementView> dataEntryMeasurements;

94
android_app/app/src/main/res/layout/activity_usersettings.xml
View File

@@ -16,7 +16,7 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp" > android:padding="5dp" >
<TableLayout <TableLayout
android:id="@+id/tableUserData" android:id="@+id/tableUserData"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -165,25 +165,25 @@
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/tableRowInitialWeight" android:id="@+id/tableRowInitialWeight"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/lblInitialWeight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" >
android:text="@string/label_initial_weight" />
<EditText <TextView
android:id="@+id/txtInitialWeight" android:id="@+id/lblInitialWeight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:text="@string/label_initial_weight" />
android:hint="@string/info_enter_initial_weight"
android:inputType="numberDecimal|numberSigned" /> <EditText
</TableRow> android:id="@+id/txtInitialWeight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/info_enter_initial_weight"
android:inputType="numberDecimal|numberSigned" />
</TableRow>
<TableRow <TableRow
android:id="@+id/rowGoalWeight" android:id="@+id/rowGoalWeight"
@@ -229,42 +229,38 @@
</TableLayout> </TableLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/btnCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="5"
android:background="@drawable/flat_selector"
android:text="@string/label_cancel"
android:layout_marginRight="10dp" />
<LinearLayout <Button
android:layout_width="match_parent" android:id="@+id/btnDelete"
android:layout_height="wrap_content" > android:layout_width="wrap_content"
<Button android:layout_height="wrap_content"
android:id="@+id/btnCancel" android:layout_weight="5"
android:layout_width="wrap_content" android:background="@drawable/flat_selector"
android:layout_height="wrap_content" android:text="@string/label_delete"
android:layout_weight="5" android:layout_marginRight="10dp" />
android:background="@drawable/flat_selector"
android:text="@string/label_cancel"
android:layout_marginRight="10dp" />
<Button <Button
android:id="@+id/btnDelete" android:id="@+id/btnOk"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="5" android:layout_weight="5"
android:background="@drawable/flat_selector" android:background="@drawable/flat_selector"
android:text="@string/label_delete" android:text="@string/label_ok" />
android:layout_marginRight="10dp" /> </LinearLayout>
<Button
android:id="@+id/btnOk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="5"
android:background="@drawable/flat_selector"
android:text="@string/label_ok" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

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

@@ -3,4 +3,8 @@
<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>
<color name="gray_disabled">#ccc</color> <color name="gray_disabled">#ccc</color>
<color name="primaryColor">#000000</color>
<color name="primaryLightColor">@android:color/holo_blue_light</color>
<color name="primaryDarkColor">#000000</color>
</resources> </resources>

11
android_app/app/src/main/res/values/styles.xml
View File

@@ -1,12 +1,11 @@
<resources> <resources>
<!-- Application theme. --> <!-- Application theme. -->
<style name="AppTheme_Light" parent="Theme.Design.Light.NoActionBar"> <style name="AppTheme_Light" parent="Theme.AppCompat.Light.NoActionBar">
<!-- All customizations that are NOT specific to a particular API-level can go here. --> <item name="colorPrimary">@color/primaryColor</item>
<item name="colorPrimary">#000000</item> <item name="colorPrimaryDark">@color/primaryDarkColor</item>
<item name="colorPrimaryDark">#000000</item> <item name="colorAccent">@color/primaryLightColor</item>
<item name="colorAccent">@android:color/holo_blue_light</item>
</style> </style>
<style name="AppTheme_Dark" parent="Theme.Design.NoActionBar"> <style name="AppTheme_Dark" parent="Theme.AppCompat.NoActionBar">
</style> </style>
</resources> </resources>