From 07e02a19a927edc82ca3b6be05e75d36a184e22b Mon Sep 17 00:00:00 2001
From: Justin Foell <630830+jrfoell@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:37:49 -0600
Subject: [PATCH] Don't extend Style Renderer
---
src/WPStrava/ActivityRenderer.php | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/WPStrava/ActivityRenderer.php b/src/WPStrava/ActivityRenderer.php
index 5322af6..3ee825c 100644
--- a/src/WPStrava/ActivityRenderer.php
+++ b/src/WPStrava/ActivityRenderer.php
@@ -2,7 +2,7 @@
/*
* ActivityRenderer has all the markup for the Activity Block & Shortcode.
*/
-class WPStrava_ActivityRenderer extends WPStrava_StyleTranslationRenderer {
+class WPStrava_ActivityRenderer {
/**
* Get the HTML for a single activity.
@@ -64,15 +64,6 @@ class WPStrava_ActivityRenderer extends WPStrava_StyleTranslationRenderer {
return $activity_output;
}
- public static function load_style_translations() {
- self::add_style_translation( 'wp-strava-td-avg-speed', __( 'Average Speed', 'wp-strava' ) );
- self::add_style_translation( 'wp-strava-td-max-speed', __( 'Max Speed', 'wp-strava' ) );
- self::add_style_translation( 'wp-strava-td-elevation', __( 'Elevation Gain', 'wp-strava' ) );
- self::add_style_translation( 'wp-strava-td-elapsed-time', __( 'Elapsed Time', 'wp-strava' ) );
- self::add_style_translation( 'wp-strava-td-moving-time', __( 'Moving Time', 'wp-strava' ) );
- self::add_style_translation( 'wp-strava-td-distance', __( 'Distance', 'wp-strava' ) );
- }
-
/**
* The the activity details in in HTML table.
*
@@ -89,7 +80,7 @@ class WPStrava_ActivityRenderer extends WPStrava_StyleTranslationRenderer {
$avg_title = '| ' . __( 'Average Speed', 'wp-strava' ) . ' | ';
$max_title = '' . __( 'Max Speed', 'wp-strava' ) . ' | ';
$elevation_title = '' . __( 'Elevation Gain', 'wp-strava' ) . ' | ';
- $elevation = '
+ $elevation = ' |
' . $strava_som->elevation( $activity_details->total_elevation_gain ) . '
' . $strava_som->get_elevation_label() . '
| ';
@@ -98,30 +89,30 @@ class WPStrava_ActivityRenderer extends WPStrava_StyleTranslationRenderer {
switch ( $strava_activitytype ) {
case WPStrava_ActivityType::TYPE_GROUP_PACE:
- $avg_speed = '
+ $avg_speed = ' |
' . $strava_som->pace( $activity_details->average_speed ) . '
' . $strava_som->get_pace_label() . '
| ';
- $max_speed = '
+ $max_speed = ' |
' . $strava_som->pace( $activity_details->max_speed ) . '
| ';
break;
case WPStrava_ActivityType::TYPE_GROUP_SPEED:
- $avg_speed = '
+ $avg_speed = ' |
' . $strava_som->speed( $activity_details->average_speed ) . '
' . $strava_som->get_speed_label() . '
| ';
- $max_speed = '
+ $max_speed = ' |
' . $strava_som->speed( $activity_details->max_speed ) . '
' . $strava_som->get_speed_label() . '
| ';
break;
case WPStrava_ActivityType::TYPE_GROUP_PACE:
- $avg_speed = '
+ $avg_speed = ' |
' . $strava_som->swimpace( $activity_details->average_speed ) . '
' . $strava_som->get_swimpace_label() . '
| ';
- $max_speed = '
+ $max_speed = ' |
' . $strava_som->swimpace( $activity_details->max_speed ) . '
' . $strava_som->get_swimpace_label() . '
| ';
@@ -151,15 +142,15 @@ class WPStrava_ActivityRenderer extends WPStrava_StyleTranslationRenderer {
- |
+ |
' . $strava_som->time( $activity_details->elapsed_time ) . '
' . $strava_som->get_time_label() . '
|
-
+ |
' . $strava_som->time( $activity_details->moving_time ) . '
' . $strava_som->get_time_label() . '
|
-
+ |
' . $strava_som->distance( $activity_details->distance ) . '
' . $strava_som->get_distance_label() . '
|