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

make the floating buttons in material 3 round

Browse Source
This commit is contained in:
oliexdev
2023-07-22 14:18:43 +02:00
parent 252a5b7b51
commit 56dd4c4eb0
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/src/main/java/com/health/openscale/gui/graph/GraphFragment.java
View File

@@ -50,6 +50,7 @@ import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.shape.ShapeAppearanceModel;
import com.health.openscale.R;
import com.health.openscale.core.OpenScale;
import com.health.openscale.core.datatypes.ScaleMeasurement;
@@ -249,6 +250,7 @@ public class GraphFragment extends Fragment {
}
showMenu = graphView.findViewById(R.id.showMenu);
showMenu.setShapeAppearanceModel(ShapeAppearanceModel.builder().setAllCornerSizes(1000).build());
showMenu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -260,6 +262,7 @@ public class GraphFragment extends Fragment {
});
editMenu = graphView.findViewById(R.id.editMenu);
editMenu.setShapeAppearanceModel(ShapeAppearanceModel.builder().setAllCornerSizes(1000).build());
editMenu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -270,6 +273,7 @@ public class GraphFragment extends Fragment {
}
});
deleteMenu = graphView.findViewById(R.id.deleteMenu);
deleteMenu.setShapeAppearanceModel(ShapeAppearanceModel.builder().setAllCornerSizes(1000).build());
deleteMenu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

2
android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartActionBarView.java
View File

@@ -28,6 +28,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.shape.ShapeAppearanceModel;
import com.health.openscale.gui.utils.ColorUtil;
import java.util.List;
@@ -103,6 +104,7 @@ public class ChartActionBarView extends HorizontalScrollView {
actionButton.setImageDrawable(measurementView.getIcon());
actionButton.setClickable(true);
actionButton.setSize(FloatingActionButton.SIZE_MINI);
actionButton.setShapeAppearanceModel(ShapeAppearanceModel.builder().setAllCornerSizes(1000).build());
RelativeLayout.LayoutParams lay = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
lay.setMargins(0,5,20,10);
actionButton.setLayoutParams(lay);

2
android_app/app/src/main/java/com/health/openscale/gui/statistic/StatisticAdapter.java
View File

@@ -34,6 +34,7 @@ import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.shape.ShapeAppearanceModel;
import com.health.openscale.R;
import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.gui.measurement.FloatMeasurementView;
@@ -149,6 +150,7 @@ class StatisticAdapter extends RecyclerView.Adapter<StatisticAdapter.ViewHolder>
endValueText.append(measurementView.getValueAsString(true));
holder.endValueView.setText(endValueText);
holder.iconView.setImageDrawable(measurementView.getIcon());
holder.iconView.setShapeAppearanceModel(ShapeAppearanceModel.builder().setAllCornerSizes(1000).build());
holder.iconView.setBackgroundTintList(ColorStateList.valueOf(measurementView.getColor()));
measurementView.loadFrom(firstMeasurement, null);

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

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="seed">#0099cc</color>
<color name="md_theme_light_primary">#004C68</color>
<color name="md_theme_light_primary">#000000</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#C3E8FF</color>
<color name="md_theme_light_onPrimaryContainer">#001E2C</color>
<color name="md_theme_light_secondary">#4E616D</color>
<color name="md_theme_light_secondary">#D1E5F3</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#006685</color>
<color name="md_theme_light_secondaryContainer">#E1E2E5</color>
<color name="md_theme_light_onSecondaryContainer">#091E28</color>
<color name="md_theme_light_tertiary">#006685</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>

2
android_app/build.gradle
View File

@@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
}
}