diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bfd36b8ff..b9c60f0af 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -427,9 +427,9 @@
android:windowSoftInputMode="stateHidden" />
+ android:label="@string/activity_filter_filter_title"
+ android:parentActivityName=".activities.ActivitySummariesActivity"
+ android:excludeFromRecents="true"/>
activityKindMap = new HashMap<>(1);
+ int BACKGROUND_COLOR;
public static int getAlternateColor(Context context) {
TypedValue typedValue = new TypedValue();
@@ -79,6 +83,7 @@ public class ActivitySummariesFilter extends Activity implements View.OnClickLis
if (appContext instanceof GBApplication) {
setContentView(R.layout.sport_activity_filter);
}
+ BACKGROUND_COLOR = GBApplication.getBackgroundColor(appContext);;
//get spinner ready - assign data, set selected item...
final Spinner filterKindSpinner = findViewById(R.id.select_kind);
@@ -182,8 +187,8 @@ public class ActivitySummariesFilter extends Activity implements View.OnClickLis
filterDateFromDataView.setBackgroundColor(Color.RED);
filterDateToDataView.setBackgroundColor(Color.RED);
} else {
- filterDateFromDataView.setBackgroundColor(Color.WHITE);
- filterDateToDataView.setBackgroundColor(Color.WHITE);
+ filterDateFromDataView.setBackgroundColor(BACKGROUND_COLOR);
+ filterDateToDataView.setBackgroundColor(BACKGROUND_COLOR);
}
if (dateToFilter != 0 || dateFromFilter != 0 || activityFilter != 0) {
@@ -232,4 +237,15 @@ public class ActivitySummariesFilter extends Activity implements View.OnClickLis
}
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ // back button
+ finish();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
index 762d7284c..588c1e137 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
@@ -239,7 +239,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
unit = "km_h";
break;
case "seconds_m":
- value = 3.6 / value;
+ value = value * (1000/60);
unit = "minutes_km";
break;
case "seconds_km":
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java
index c411ce0e4..1ba9bac2d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java
@@ -129,6 +129,17 @@ public class AndroidUtils {
return colorToHex(color);
}
+ public static int getBackgroundColor(Context context) {
+ int color;
+ if (GBApplication.isDarkThemeEnabled()) {
+ color = context.getResources().getColor(R.color.cardview_dark_background);
+ } else {
+ color = context.getResources().getColor(R.color.cardview_light_background);
+ }
+ return color;
+ }
+
+
private static String colorToHex(int color) {
return "#"
+ Integer.toHexString(Color.red(color))
diff --git a/app/src/main/res/layout/activity_summary_details.xml b/app/src/main/res/layout/activity_summary_details.xml
index 99e2db3a2..6d9898dd1 100644
--- a/app/src/main/res/layout/activity_summary_details.xml
+++ b/app/src/main/res/layout/activity_summary_details.xml
@@ -1,18 +1,18 @@
-
+
-
+
diff --git a/app/src/main/res/layout/sport_activity_filter.xml b/app/src/main/res/layout/sport_activity_filter.xml
index d5a8f7930..5daad96cf 100644
--- a/app/src/main/res/layout/sport_activity_filter.xml
+++ b/app/src/main/res/layout/sport_activity_filter.xml
@@ -1,5 +1,6 @@
+
+
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c0e856b5a..894ea5b3d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -9,4 +9,5 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 726bd52eb..6fb09eee2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,7 +32,7 @@
#545254
#d8d9d8
- #ffd0d0d0
+ #FFEDEDED
#545254
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ef8950b6..6a6f29ec2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -928,7 +928,6 @@
Average Stroke Distance
Average Strokes
Average Lap Pace
- Strokes
swolfIndex
swimStyle
Laps
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fd20bdf8e..0153f73a3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,8 +16,8 @@
- @color/chart_light_sleep_light
- @color/chart_activity_light
- @color/chart_not_worn_light
-
- @color/alternate_row_background_light
+ - @color/chart_heartrate_fill