mirror of
https://github.com/oliexdev/openScale.git
synced 2025-08-24 09:13:04 +02:00
move add measurement button to toolbar.
remember last fragment id.
This commit is contained in:
@@ -49,6 +49,7 @@ import com.health.openscale.R;
|
|||||||
import com.health.openscale.core.OpenScale;
|
import com.health.openscale.core.OpenScale;
|
||||||
import com.health.openscale.core.bluetooth.BluetoothCommunication;
|
import com.health.openscale.core.bluetooth.BluetoothCommunication;
|
||||||
import com.health.openscale.core.datatypes.ScaleMeasurement;
|
import com.health.openscale.core.datatypes.ScaleMeasurement;
|
||||||
|
import com.health.openscale.gui.activities.DataEntryActivity;
|
||||||
import com.health.openscale.gui.activities.SettingsActivity;
|
import com.health.openscale.gui.activities.SettingsActivity;
|
||||||
import com.health.openscale.gui.activities.UserSettingsActivity;
|
import com.health.openscale.gui.activities.UserSettingsActivity;
|
||||||
import com.health.openscale.gui.fragments.GraphFragment;
|
import com.health.openscale.gui.fragments.GraphFragment;
|
||||||
@@ -64,7 +65,6 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
private static boolean valueOfCountModified = false;
|
private static boolean valueOfCountModified = false;
|
||||||
private static int bluetoothStatusIcon = R.drawable.ic_bluetooth_disabled;
|
private static int bluetoothStatusIcon = R.drawable.ic_bluetooth_disabled;
|
||||||
private static MenuItem bluetoothStatus;
|
private static MenuItem bluetoothStatus;
|
||||||
private static CharSequence fragmentTitle;
|
|
||||||
|
|
||||||
private DrawerLayout drawerLayout;
|
private DrawerLayout drawerLayout;
|
||||||
private Toolbar toolbar;
|
private Toolbar toolbar;
|
||||||
@@ -118,16 +118,10 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
// Setup drawer view
|
// Setup drawer view
|
||||||
setupDrawerContent(navDrawer);
|
setupDrawerContent(navDrawer);
|
||||||
|
|
||||||
// Initial first fragment
|
|
||||||
if(savedInstanceState == null) {
|
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_content,new OverviewFragment()).commit();
|
|
||||||
fragmentTitle = getString(R.string.title_overview);
|
|
||||||
}
|
|
||||||
|
|
||||||
setTitle(fragmentTitle);
|
|
||||||
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
|
|
||||||
|
selectDrawerItem(prefs.getInt("lastFragmentId", R.id.nav_overview));
|
||||||
|
|
||||||
if (prefs.getBoolean("firstStart", true)) {
|
if (prefs.getBoolean("firstStart", true)) {
|
||||||
Intent intent = new Intent(this, UserSettingsActivity.class);
|
Intent intent = new Intent(this, UserSettingsActivity.class);
|
||||||
intent.putExtra(UserSettingsActivity.EXTRA_MODE, UserSettingsActivity.ADD_USER_REQUEST);
|
intent.putExtra(UserSettingsActivity.EXTRA_MODE, UserSettingsActivity.ADD_USER_REQUEST);
|
||||||
@@ -224,7 +218,9 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
new NavigationView.OnNavigationItemSelectedListener() {
|
new NavigationView.OnNavigationItemSelectedListener() {
|
||||||
@Override
|
@Override
|
||||||
public boolean onNavigationItemSelected(MenuItem menuItem) {
|
public boolean onNavigationItemSelected(MenuItem menuItem) {
|
||||||
selectDrawerItem(menuItem);
|
selectDrawerItem(menuItem.getItemId());
|
||||||
|
// Highlight the selected item has been done by NavigationView
|
||||||
|
menuItem.setChecked(true);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -232,23 +228,34 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void selectDrawerItem(MenuItem menuItem) {
|
public void selectDrawerItem(int menuItemId) {
|
||||||
// Create a new fragment and specify the fragment to show based on nav item clicked
|
// Create a new fragment and specify the fragment to show based on nav item clicked
|
||||||
Fragment fragment = null;
|
Fragment fragment = null;
|
||||||
Class fragmentClass;
|
Class fragmentClass;
|
||||||
|
String fragmentTitle;
|
||||||
|
|
||||||
switch(menuItem.getItemId()) {
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
|
|
||||||
|
switch(menuItemId) {
|
||||||
case R.id.nav_overview:
|
case R.id.nav_overview:
|
||||||
fragmentClass = OverviewFragment.class;
|
fragmentClass = OverviewFragment.class;
|
||||||
|
fragmentTitle = getResources().getString(R.string.title_overview);
|
||||||
|
prefs.edit().putInt("lastFragmentId", menuItemId).commit();
|
||||||
break;
|
break;
|
||||||
case R.id.nav_graph:
|
case R.id.nav_graph:
|
||||||
fragmentClass = GraphFragment.class;
|
fragmentClass = GraphFragment.class;
|
||||||
|
fragmentTitle = getResources().getString(R.string.title_graph);
|
||||||
|
prefs.edit().putInt("lastFragmentId", menuItemId).commit();
|
||||||
break;
|
break;
|
||||||
case R.id.nav_table:
|
case R.id.nav_table:
|
||||||
fragmentClass = TableFragment.class;
|
fragmentClass = TableFragment.class;
|
||||||
|
fragmentTitle = getResources().getString(R.string.title_table);
|
||||||
|
prefs.edit().putInt("lastFragmentId", menuItemId).commit();
|
||||||
break;
|
break;
|
||||||
case R.id.nav_statistic:
|
case R.id.nav_statistic:
|
||||||
fragmentClass = StatisticsFragment.class;
|
fragmentClass = StatisticsFragment.class;
|
||||||
|
fragmentTitle = getResources().getString(R.string.title_statistics);
|
||||||
|
prefs.edit().putInt("lastFragmentId", menuItemId).commit();
|
||||||
break;
|
break;
|
||||||
case R.id.nav_settings:
|
case R.id.nav_settings:
|
||||||
Intent settingsIntent = new Intent(this, SettingsActivity.class);
|
Intent settingsIntent = new Intent(this, SettingsActivity.class);
|
||||||
@@ -257,6 +264,8 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
return;
|
return;
|
||||||
default:
|
default:
|
||||||
fragmentClass = OverviewFragment.class;
|
fragmentClass = OverviewFragment.class;
|
||||||
|
fragmentTitle = getResources().getString(R.string.title_overview);
|
||||||
|
prefs.edit().putInt("lastFragmentId", menuItemId).commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -270,12 +279,8 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
FragmentManager fragmentManager = getSupportFragmentManager();
|
FragmentManager fragmentManager = getSupportFragmentManager();
|
||||||
fragmentManager.beginTransaction().replace(R.id.fragment_content, fragment).commit();
|
fragmentManager.beginTransaction().replace(R.id.fragment_content, fragment).commit();
|
||||||
|
|
||||||
// Highlight the selected item has been done by NavigationView
|
|
||||||
menuItem.setChecked(true);
|
|
||||||
|
|
||||||
// Set action bar title
|
// Set action bar title
|
||||||
setTitle(menuItem.getTitle());
|
setTitle(fragmentTitle);
|
||||||
fragmentTitle = menuItem.getTitle();
|
|
||||||
|
|
||||||
// Close the navigation drawer
|
// Close the navigation drawer
|
||||||
drawerLayout.closeDrawers();
|
drawerLayout.closeDrawers();
|
||||||
@@ -292,6 +297,10 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
case android.R.id.home:
|
case android.R.id.home:
|
||||||
drawerLayout.openDrawer(GravityCompat.START);
|
drawerLayout.openDrawer(GravityCompat.START);
|
||||||
return true;
|
return true;
|
||||||
|
case R.id.action_add_measurement:
|
||||||
|
Intent intent = new Intent(getApplicationContext(), DataEntryActivity.class);
|
||||||
|
startActivityForResult(intent, 1);
|
||||||
|
return true;
|
||||||
case R.id.action_bluetooth_status:
|
case R.id.action_bluetooth_status:
|
||||||
invokeSearchBluetoothDevice();
|
invokeSearchBluetoothDevice();
|
||||||
return true;
|
return true;
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
package com.health.openscale.gui.fragments;
|
package com.health.openscale.gui.fragments;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
@@ -39,7 +38,6 @@ import com.health.openscale.core.datatypes.ScaleMeasurement;
|
|||||||
import com.health.openscale.core.datatypes.ScaleUser;
|
import com.health.openscale.core.datatypes.ScaleUser;
|
||||||
import com.health.openscale.core.utils.Converters;
|
import com.health.openscale.core.utils.Converters;
|
||||||
import com.health.openscale.core.utils.DateTimeHelpers;
|
import com.health.openscale.core.utils.DateTimeHelpers;
|
||||||
import com.health.openscale.gui.activities.DataEntryActivity;
|
|
||||||
import com.health.openscale.gui.views.BMIMeasurementView;
|
import com.health.openscale.gui.views.BMIMeasurementView;
|
||||||
import com.health.openscale.gui.views.BMRMeasurementView;
|
import com.health.openscale.gui.views.BMRMeasurementView;
|
||||||
import com.health.openscale.gui.views.BoneMeasurementView;
|
import com.health.openscale.gui.views.BoneMeasurementView;
|
||||||
@@ -150,12 +148,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
|
|||||||
pieChartLast.setOnValueTouchListener(new PieChartLastTouchListener());
|
pieChartLast.setOnValueTouchListener(new PieChartLastTouchListener());
|
||||||
pieChartLast.setChartRotationEnabled(false);
|
pieChartLast.setChartRotationEnabled(false);
|
||||||
|
|
||||||
overviewView.findViewById(R.id.btnInsertData).setOnClickListener(new View.OnClickListener() {
|
|
||||||
public void onClick(View view) {
|
|
||||||
btnOnClickInsertData();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
userSelectedData = null;
|
userSelectedData = null;
|
||||||
|
|
||||||
spinUserAdapter = new ArrayAdapter<>(overviewView.getContext(), R.layout.support_simple_spinner_dropdown_item, new ArrayList<String>());
|
spinUserAdapter = new ArrayAdapter<>(overviewView.getContext(), R.layout.support_simple_spinner_dropdown_item, new ArrayList<String>());
|
||||||
@@ -421,12 +413,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
|
|||||||
pieChartLast.setPieChartData(pieChartData);
|
pieChartLast.setPieChartData(pieChartData);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void btnOnClickInsertData()
|
|
||||||
{
|
|
||||||
Intent intent = new Intent(overviewView.getContext(), DataEntryActivity.class);
|
|
||||||
startActivityForResult(intent, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class PieChartLastTouchListener implements PieChartOnValueSelectListener
|
private class PieChartLastTouchListener implements PieChartOnValueSelectListener
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
|
BIN
android_app/app/src/main/res/drawable-hdpi/ic_add.png
Normal file
BIN
android_app/app/src/main/res/drawable-hdpi/ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 774 B |
BIN
android_app/app/src/main/res/drawable-ldpi/ic_add.png
Normal file
BIN
android_app/app/src/main/res/drawable-ldpi/ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 383 B |
BIN
android_app/app/src/main/res/drawable-mdpi/ic_add.png
Normal file
BIN
android_app/app/src/main/res/drawable-mdpi/ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 499 B |
BIN
android_app/app/src/main/res/drawable-xhdpi/ic_add.png
Normal file
BIN
android_app/app/src/main/res/drawable-xhdpi/ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
BIN
android_app/app/src/main/res/drawable-xxhdpi/ic_add.png
Normal file
BIN
android_app/app/src/main/res/drawable-xxhdpi/ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
BIN
android_app/app/src/main/res/drawable-xxxhdpi/ic_add.png
Normal file
BIN
android_app/app/src/main/res/drawable-xxxhdpi/ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.3 KiB |
@@ -93,14 +93,4 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</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>
|
</LinearLayout>
|
||||||
|
@@ -84,34 +84,6 @@
|
|||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"></TableLayout>
|
android:layout_height="fill_parent"></TableLayout>
|
||||||
|
|
||||||
<Space
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="80dp" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
|
||||||
android:id="@+id/btnInsertData"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
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:elevation="6dp"
|
|
||||||
android:textSize="18dp"
|
|
||||||
android:textColor="#fff"
|
|
||||||
app:layout_anchor="@id/btnInsertData"
|
|
||||||
app:layout_anchorGravity="center"/>
|
|
||||||
|
|
||||||
</android.support.design.widget.CoordinatorLayout>
|
</android.support.design.widget.CoordinatorLayout>
|
||||||
|
@@ -3,9 +3,15 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context="com.example.openscale.MainActivity" >
|
tools:context="com.example.openscale.MainActivity" >
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_add_measurement"
|
||||||
|
android:icon="@drawable/ic_add"
|
||||||
|
android:title="+"
|
||||||
|
app:showAsAction="always" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_bluetooth_status"
|
android:id="@+id/action_bluetooth_status"
|
||||||
android:icon="@drawable/ic_bluetooth_disabled"
|
android:icon="@drawable/ic_bluetooth_disabled"
|
||||||
android:title="@string/action_bluetooth_status"
|
android:title="@string/action_bluetooth_status"
|
||||||
app:showAsAction="ifRoom"/>
|
app:showAsAction="always" />
|
||||||
</menu>
|
</menu>
|
||||||
|
Reference in New Issue
Block a user