open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
07457c21 1 parent 02cbcf69

custom fonts google implementation

Inline Side-by-side
Showing 21 changed files with 148 additions and 139 deletions
......@@ -100,8 +100,8 @@ dependencies {
api 'com.getkeepsafe.relinker:relinker:1.4.4'
//------------------------------ Calligraphy -----------------------------//
api 'io.github.inflationx:calligraphy3:3.1.1'
api 'io.github.inflationx:viewpump:2.0.3'
// api 'io.github.inflationx:calligraphy3:3.1.1'
// api 'io.github.inflationx:viewpump:2.0.3'
//------------------------------ Retrofit -----------------------------//
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
......
package ly.warp.sdk.activities;
import android.app.AlertDialog;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
......@@ -19,7 +18,6 @@ import com.google.android.material.navigation.NavigationBarView;
import java.util.ArrayList;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.fragments.HomeFragment;
import ly.warp.sdk.fragments.LoyaltyFragment;
......@@ -111,11 +109,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
}
@Override
public void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == REQUEST_NOTIFICATION_PERMISSION) {
......
......@@ -2,7 +2,6 @@ package ly.warp.sdk.activities;
import android.Manifest;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
......@@ -43,12 +42,12 @@ import com.google.maps.android.clustering.ClusterManager;
import java.util.ArrayList;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.Merchant;
import ly.warp.sdk.io.models.MerchantList;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.WarplyProperty;
import ly.warp.sdk.utils.constants.WarpConstants;
......@@ -79,6 +78,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
private AlertDialog mAlertDialogNoShopsAvailable;
private Merchant mMerchant, mMerchantParent;
private ArrayList<Merchant> mMerchantParentList = new ArrayList<>();
private TextView mFontHeader;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -102,6 +102,8 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
mMapView = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops);
mMapView.getMapAsync(this);
mIvBack.setOnClickListener(this);
mFontHeader = findViewById(R.id.textView3);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
}
@Override
......@@ -117,11 +119,6 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// @Override
// public void onRequestPermissionsResult(
// int requestCode,
......@@ -221,6 +218,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
TextView pinTitle = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_title);
WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_bold, pinTitle);
if (mMerchantParentList != null && mMerchantParentList.size() > 0) {
for (Merchant parentMerch : mMerchantParentList) {
if (parentMerch.getUuid().equals(merch.getParent())) {
......@@ -243,17 +241,24 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
}
TextView pinName = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_name);
WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinName);
pinName.setText(merch.getName());
TextView pinDays = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_days);
WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_regular, pinDays);
pinDays.setText(merch.getSnippet()); //TODO: wrong getter
TextView pinTel = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_tel);
WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinTel);
pinTel.setText(merch.getTelephone());
TextView pinAddress = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_address);
WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinAddress);
pinAddress.setText(merch.getAddress());
TextView pinDirectionsText = (TextView) bottomSheetDialog.findViewById(R.id.tv_directions);
WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinDirectionsText);
LinearLayout pinDirections = (LinearLayout) bottomSheetDialog.findViewById(R.id.ll_directions);
pinDirections.setOnClickListener(view -> {
Uri gmmIntentUri = Uri.parse("google.navigation:q=" + merch.getLatitude() + "," + merch.getLongitude()/* + "&mode=w"*/);
......
......@@ -2,7 +2,6 @@ package ly.warp.sdk.activities;
import android.Manifest;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
......@@ -42,12 +41,12 @@ import com.huawei.hms.maps.model.MarkerOptions;
import java.util.ArrayList;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.Merchant;
import ly.warp.sdk.io.models.MerchantList;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.WarplyProperty;
import ly.warp.sdk.utils.constants.WarpConstants;
......@@ -77,6 +76,7 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
private AlertDialog mAlertDialogNoShopsAvailable;
private Merchant mMerchant, mMerchantParent;
private ArrayList<Merchant> mMerchantParentList = new ArrayList<>();
private TextView mFontHeader;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -101,6 +101,8 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
mSupportMapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops_huawei);
mSupportMapFragment.getMapAsync(this);
mIvBack.setOnClickListener(this);
mFontHeader = findViewById(R.id.textView3);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
}
@Override
......@@ -116,11 +118,6 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// @Override
// public void onRequestPermissionsResult(
// int requestCode,
......@@ -222,6 +219,7 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
TextView pinTitle = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_title);
WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_bold, pinTitle);
if (mMerchantParentList != null && mMerchantParentList.size() > 0) {
for (Merchant parentMerch : mMerchantParentList) {
if (parentMerch.getUuid().equals(merch.getParent())) {
......@@ -244,17 +242,24 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
}
TextView pinName = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_name);
WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinName);
pinName.setText(merch.getName());
TextView pinDays = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_days);
WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_regular, pinDays);
pinDays.setText(merch.getSnippet()); //TODO: wrong getter
TextView pinTel = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_tel);
WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinTel);
pinTel.setText(merch.getTelephone());
TextView pinAddress = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_address);
WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinAddress);
pinAddress.setText(merch.getAddress());
TextView pinDirectionsText = (TextView) bottomSheetDialog.findViewById(R.id.tv_directions);
WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinDirectionsText);
LinearLayout pinDirections = (LinearLayout) bottomSheetDialog.findViewById(R.id.ll_directions);
pinDirections.setOnClickListener(view -> {
Uri hmmIntentUri = Uri.parse("petalmaps://navigation?daddr=" + merch.getLatitude() + "," + merch.getLongitude());
......
......@@ -50,9 +50,9 @@ import org.json.JSONObject;
import java.util.ArrayList;
import java.util.Arrays;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.managers.WarplyManager;
/**
......@@ -73,7 +73,9 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
private boolean mIsTripStarted = false;
private LinearLayout mLlTripButton, mLlTelematicsMain, mLlTelematicsHistory;
private TextView mTvTripButton, mTvSensorData, mTvVelocity, mTvAvgVelocity, mTvRecordsSaved,
mTvOrientationCount, mTvTouchCount;
mTvOrientationCount, mTvTouchCount, mFontHeader, mFontSensorLabel,
mFontVelocityLabel, mFontAvgLabel, mFontOrientationLabel, mFontTouchLabel, mFontRecordLabel,
mFontDrivingSumLabel, mFontDrivingSumSubtitleLabel, mFontHistoryButtonLabel;
private SensorManager mSensorManager;
private Sensor mSensor;
private Handler mHandler, mTouchHandler;
......@@ -133,6 +135,28 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
mRlMainScroll.setOnTouchListener(mScrollTouchListener);
mLlTelematicsHistory = findViewById(R.id.ll_telematics_history);
mLlTelematicsHistory.setOnClickListener(this);
mFontHeader = findViewById(R.id.textView3);
mFontSensorLabel = findViewById(R.id.tv_sensor_data_label);
mFontVelocityLabel = findViewById(R.id.tv_velocity_label);
mFontAvgLabel = findViewById(R.id.tv_avg_label);
mFontOrientationLabel = findViewById(R.id.tv_orientation_label);
mFontTouchLabel = findViewById(R.id.tv_touch_label);
mFontRecordLabel = findViewById(R.id.tv_records_label);
mFontDrivingSumLabel = findViewById(R.id.tv_driving_sum);
mFontDrivingSumSubtitleLabel = findViewById(R.id.tv_driving_sum_subtitle);
mFontHistoryButtonLabel = findViewById(R.id.history_button_text);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mFontSensorLabel,
mFontVelocityLabel, mFontAvgLabel, mFontOrientationLabel, mFontTouchLabel,
mFontRecordLabel);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvSensorData,
mTvVelocity, mTvAvgVelocity, mTvOrientationCount, mTvTouchCount, mTvRecordsSaved,
mEtLimit, mEtSampleTime);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mFontDrivingSumLabel);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mFontDrivingSumSubtitleLabel);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium,
mFontHistoryButtonLabel, mTvTripButton);
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
......@@ -248,11 +272,6 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.recyclerview.widget.ConcatAdapter;
import androidx.recyclerview.widget.LinearLayoutManager;
......@@ -16,10 +16,10 @@ import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.TelematicsHistory;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.managers.WarplyManager;
import ly.warp.sdk.views.adapters.TelematicsHistoryAdapter;
import ly.warp.sdk.views.adapters.TelematicsHistoryHeaderAdapter;
......@@ -44,6 +44,7 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL
private TelematicsHistoryHeaderAdapter mAdapterTelematicsHistoryHeader;
private boolean mTelematicsHistoryItemPressed = false;
private ImageView mIvClose;
private TextView mFontHeader;
// ===========================================================
......@@ -58,8 +59,10 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL
mLlTelematicsHistoryMain = findViewById(R.id.ll_telematics_history_main);
mIvClose = findViewById(R.id.iv_telematics_history_close);
mIvClose.setOnClickListener(this);
mFontHeader = findViewById(R.id.textView3);
WarplyManager.getTelematicsHistory(mTelematicsHistoryCallback);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
}
@Override
......@@ -76,11 +79,6 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
......@@ -12,10 +11,10 @@ import androidx.cardview.widget.CardView;
import com.google.android.material.snackbar.Snackbar;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.TripMetrics;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.managers.WarplyManager;
/**
......@@ -37,6 +36,7 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL
private TripMetrics mTripMetrics;
private CardView mCvAvgSpeed, mCvTrips, mCvAccScore, mCvFocusScore, mCvReadinessScore,
mCvSmoothnessScore, mCvTotalDistance;
private TextView mFontHeader, mFontSafeDrivingLabel, mFontRatingLabel;
// ===========================================================
......@@ -62,6 +62,12 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL
mCvReadinessScore = findViewById(R.id.ly_readiness_score);
mCvSmoothnessScore = findViewById(R.id.ly_smoothness_score);
mCvTotalDistance = findViewById(R.id.ly_total_distance);
mFontHeader = findViewById(R.id.textView3);
mFontSafeDrivingLabel = findViewById(R.id.safe_driving_label);
mFontRatingLabel = findViewById(R.id.rating_label);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium,
mFontSafeDrivingLabel, mFontRatingLabel);
if (mTripId > -1)
WarplyManager.getTripMetrics(mTripId, mTripMetricsCallback);
......@@ -88,49 +94,72 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
private void initViews() {
if (mTripMetrics != null) {
TextView mCvAvgSpeedTitleText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_title);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvAvgSpeedTitleText);
TextView mCvAvgSpeedText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_title_value);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvAvgSpeedText);
TextView mCvAvgSpeedSubtitleText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_subtitle);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvAvgSpeedSubtitleText);
mCvAvgSpeedText.setText(String.valueOf(mTripMetrics.getAvgSpeed()));
mCvAvgSpeedSubtitleText.setText("Average Speed");
TextView mCvTripsTitleText = mCvTrips.findViewById(R.id.tv_telematics_metric_title);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvTripsTitleText);
TextView mCvTripsText = mCvTrips.findViewById(R.id.tv_telematics_metric_title_value);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvTripsText);
TextView mCvTripsSubtitleText = mCvTrips.findViewById(R.id.tv_telematics_metric_subtitle);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvTripsSubtitleText);
mCvTripsText.setText(String.valueOf(mTripMetrics.getNumOfTrips()));
mCvTripsSubtitleText.setText("Trips");
TextView mCvAccScoreTitleText = mCvAccScore.findViewById(R.id.tv_telematics_metric_title);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvAccScoreTitleText);
TextView mCvAccScoreText = mCvAccScore.findViewById(R.id.tv_telematics_metric_title_value);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvAccScoreText);
TextView mCvAccScoreSubtitleText = mCvAccScore.findViewById(R.id.tv_telematics_metric_subtitle);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvAccScoreSubtitleText);
mCvAccScoreText.setText(String.valueOf(mTripMetrics.getOverallScore()));
mCvAccScoreSubtitleText.setText("Acceleration Score");
TextView mCvFocusScoreTitleText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_title);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvFocusScoreTitleText);
TextView mCvFocusScoreText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_title_value);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvFocusScoreText);
TextView mCvFocusScoreSubtitleText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_subtitle);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvFocusScoreSubtitleText);
mCvFocusScoreText.setText(String.valueOf(mTripMetrics.getOverallFocus()));
mCvFocusScoreSubtitleText.setText("Focus Score");
TextView mCvReadinessScoreTitleText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_title);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvReadinessScoreTitleText);
TextView mCvReadinessScoreText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_title_value);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvReadinessScoreText);
TextView mCvReadinessScoreSubtitleText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_subtitle);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvReadinessScoreSubtitleText);
mCvReadinessScoreText.setText(String.valueOf(mTripMetrics.getReadinessScore()));
mCvReadinessScoreSubtitleText.setText("Readiness Score");
TextView mCvSmoothnessScoreTitleText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_title);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvSmoothnessScoreTitleText);
TextView mCvSmoothnessScoreText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_title_value);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvSmoothnessScoreText);
TextView mCvSmoothnessScoreSubtitleText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_subtitle);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvSmoothnessScoreSubtitleText);
mCvSmoothnessScoreText.setText(String.valueOf(mTripMetrics.getSmoothnessScore()));
mCvSmoothnessScoreSubtitleText.setText("Smoothness Score");
TextView mCvTotalDistanceTitleText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_title);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvTotalDistanceTitleText);
TextView mCvTotalDistanceText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_title_value);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvTotalDistanceText);
TextView mCvTotalDistanceSubtitleText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_subtitle);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvTotalDistanceSubtitleText);
mCvTotalDistanceText.setText(String.valueOf(mTripMetrics.getTotalKM()));
mCvTotalDistanceSubtitleText.setText("Total Distance");
}
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
......@@ -14,7 +13,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.core.text.HtmlCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
......@@ -26,19 +24,18 @@ import com.google.zxing.oned.EAN13Writer;
import org.greenrobot.eventbus.EventBus;
import java.io.Serializable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.io.models.RefreshUnifiedCouponsEventModel;
import ly.warp.sdk.io.models.UnifiedCoupon;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
......@@ -57,8 +54,9 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
// ===========================================================
private ImageView mIvBack, mIvBarcode, mIvMarketExpand;
private TextView mTvTerms, mTvCouponCode, mTvCouponDate, mTvMarketExpand,
mTvTermsValue, mTvFullBarcode, mTvActiveValue;
private TextView mTvTerms, mTvCouponCode, mTvCouponDate, mTvMarketExpand, mFontSMLabel,
mTvTermsValue, mTvFullBarcode, mTvActiveValue, mFontHeader, mFontCouponLabel,
mFontShopsLabel, mFontCancelLabel;
private LinearLayout mLlShops, mLlBarcodeContainer, mLlTerms, mLlMarketCoupons, mLlMarketExpand,
mLlCancelUnified;
private UnifiedCoupon mCoupon;
......@@ -105,6 +103,19 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
mRecyclerCoupons = findViewById(R.id.rv_active_market_coupons);
mTvActiveValue = findViewById(R.id.textView14);
mLlCancelUnified = findViewById(R.id.ll_cancel_coupon);
mFontHeader = findViewById(R.id.textView3);
mFontSMLabel = findViewById(R.id.textView13);
mFontCouponLabel = findViewById(R.id.textView15);
mFontShopsLabel = findViewById(R.id.shops_label);
mFontCancelLabel = findViewById(R.id.cancel_label);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mFontSMLabel);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvActiveValue, mTvCouponDate,
mTvTermsValue);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontCouponLabel, mTvCouponCode,
mTvMarketExpand, mTvTerms);
WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mTvFullBarcode);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontShopsLabel, mFontCancelLabel);
mRecyclerCoupons.setNestedScrollingEnabled(false);
mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
......@@ -173,11 +184,6 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......
......@@ -3,19 +3,12 @@ package ly.warp.sdk.utils;
import android.content.ContentProvider;
import android.content.ContentValues;
import android.database.Cursor;
import android.graphics.Typeface;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatDelegate;
import io.github.inflationx.calligraphy3.CalligraphyConfig;
import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
import io.github.inflationx.calligraphy3.FontMapper;
import io.github.inflationx.viewpump.ViewPump;
import ly.warp.sdk.R;
/**
* Created by Panagiotis Triantafyllou on 05/Αυγ/2022.
*/
......@@ -24,19 +17,19 @@ public class WarplyProvider extends ContentProvider {
@Override
public boolean onCreate() {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/pf_square_sans_pro_regular.ttf")
.setFontAttrId(R.attr.fontPath)
// .setFontMapper(new FontMapper() {
// @Override
// public String map(String font) {
// return font;
// }
// })
.build()))
.build());
// ViewPump.init(ViewPump.builder()
// .addInterceptor(new CalligraphyInterceptor(
// new CalligraphyConfig.Builder()
// .setDefaultFontPath("fonts/pf_square_sans_pro_regular.ttf")
// .setFontAttrId(R.attr.fontPath)
//// .setFontMapper(new FontMapper() {
//// @Override
//// public String map(String font) {
//// return font;
//// }
//// })
// .build()))
// .build());
return true;
}
......
......@@ -18,6 +18,7 @@ import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.TelematicsHistory;
import ly.warp.sdk.utils.WarpUtils;
public class TelematicsHistoryAdapter extends RecyclerView.Adapter<TelematicsHistoryAdapter.TelematicsViewHolder> {
......@@ -31,12 +32,17 @@ public class TelematicsHistoryAdapter extends RecyclerView.Adapter<TelematicsHis
}
public class TelematicsViewHolder extends RecyclerView.ViewHolder {
private TextView tvHistoryId, tvHistoryDate;
private TextView tvHistoryId, tvHistoryDate, tvHistoryLabel;
public TelematicsViewHolder(View view) {
super(view);
tvHistoryLabel = view.findViewById(R.id.tv_telematics_history_title);
tvHistoryId = view.findViewById(R.id.tv_telematics_history_value);
tvHistoryDate = view.findViewById(R.id.tv_telematics_history_date_value);
WarpUtils.renderCustomFont(mContext, R.font.pf_square_sans_pro_medium, tvHistoryLabel);
WarpUtils.renderCustomFont(mContext, R.font.pf_square_sans_pro_regular, tvHistoryId,
tvHistoryDate);
}
}
......
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
......@@ -16,19 +15,19 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_back"
android:scaleType="centerInside"
android:src="@drawable/ic_back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_shops_title"
android:textColor="@color/cos_light_black"
android:textSize="19sp"
fontPath="fonts/BTCosmo-Bold.ttf"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
......@@ -23,7 +23,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_shops_title"
......@@ -45,6 +45,6 @@
android:id="@+id/mv_shops_huawei"
class="com.huawei.hms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</RelativeLayout>
</RelativeLayout>
......
......@@ -26,7 +26,6 @@
<TextView
android:id="@+id/textView3"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -59,7 +58,6 @@
<TextView
android:id="@+id/tv_sensor_data_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
......@@ -70,7 +68,6 @@
<TextView
android:id="@+id/tv_sensor_data"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_sensor_data_label"
......@@ -81,7 +78,6 @@
<TextView
android:id="@+id/tv_velocity_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_sensor_data"
......@@ -93,7 +89,6 @@
<TextView
android:id="@+id/tv_velocity"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_velocity_label"
......@@ -104,7 +99,6 @@
<TextView
android:id="@+id/tv_avg_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_velocity"
......@@ -116,7 +110,6 @@
<TextView
android:id="@+id/tv_avg"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_avg_label"
......@@ -127,7 +120,6 @@
<TextView
android:id="@+id/tv_orientation_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_avg"
......@@ -140,7 +132,6 @@
<TextView
android:id="@+id/tv_orientation"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_orientation_label"
......@@ -153,7 +144,6 @@
<TextView
android:id="@+id/tv_touch_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_avg"
......@@ -167,7 +157,6 @@
<TextView
android:id="@+id/tv_touch"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_touch_label"
......@@ -180,7 +169,6 @@
<TextView
android:id="@+id/tv_records_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_orientation"
......@@ -192,7 +180,6 @@
<TextView
android:id="@+id/tv_records"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_records_label"
......@@ -203,7 +190,6 @@
<EditText
android:id="@+id/et_acceleration"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_records"
......@@ -218,7 +204,6 @@
<EditText
android:id="@+id/et_save"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_records"
......@@ -264,7 +249,6 @@
<TextView
android:id="@+id/tv_driving_sum"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
......@@ -277,7 +261,6 @@
<TextView
android:id="@+id/tv_driving_sum_subtitle"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
......@@ -320,7 +303,7 @@
app:layout_constraintTop_toBottomOf="@+id/v_seperator">
<TextView
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:id="@+id/history_button_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -353,7 +336,6 @@
<TextView
android:id="@+id/tv_trip_button"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......
......@@ -26,7 +26,6 @@
<TextView
android:id="@+id/textView3"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......
......@@ -26,7 +26,6 @@
<TextView
android:id="@+id/textView3"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -50,7 +49,7 @@
android:orientation="vertical">
<TextView
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:id="@+id/safe_driving_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......@@ -150,8 +149,8 @@
layout="@layout/telematics_metric_item_layout"
android:layout_width="0dp"
android:layout_height="100dp"
android:layout_marginTop="8dp"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_75_percent"
......@@ -160,7 +159,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:id="@+id/rating_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......
......@@ -23,7 +23,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_info_title"
......@@ -62,7 +62,6 @@
<TextView
android:id="@+id/textView13"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
......@@ -74,7 +73,6 @@
<TextView
android:id="@+id/textView14"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
......@@ -86,7 +84,6 @@
<TextView
android:id="@+id/textView15"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -97,14 +94,13 @@
<TextView
android:id="@+id/textView16"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="12dp"
android:includeFontPadding="false"
android:background="@drawable/banner_border_light_grey"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/cos_light_black"
android:textIsSelectable="true"
android:textSize="25sp"
......@@ -129,8 +125,8 @@
<View
android:id="@+id/view5"
android:layout_width="match_parent"
android:layout_marginHorizontal="32dp"
android:layout_height="0.8dp"
android:layout_marginHorizontal="32dp"
android:background="#E6E6E6" />
<ImageView
......@@ -143,7 +139,6 @@
<TextView
android:id="@+id/tv_full_barcode"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
......@@ -155,8 +150,8 @@
<View
android:id="@+id/view4"
android:layout_width="match_parent"
android:layout_marginHorizontal="32dp"
android:layout_height="0.8dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="20dp"
android:background="#E6E6E6" />
</LinearLayout>
......@@ -164,7 +159,6 @@
<TextView
android:id="@+id/textView17"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -184,7 +178,6 @@
<TextView
android:id="@+id/tv_market_expand"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_hide_market_coupons"
......@@ -212,9 +205,9 @@
android:id="@+id/rv_active_market_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="8dp"
android:layout_marginHorizontal="2dp"
android:overScrollMode="never" />
android:overScrollMode="never"
android:paddingVertical="8dp" />
</LinearLayout>
<LinearLayout
......@@ -230,7 +223,7 @@
android:paddingVertical="8dp">
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/shops_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -253,7 +246,7 @@
android:paddingVertical="8dp">
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/cancel_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -281,7 +274,6 @@
<TextView
android:id="@+id/tv_terms"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_terms_title"
......@@ -299,7 +291,6 @@
<TextView
android:id="@+id/tv_terms_value"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_terms_inner"
......@@ -309,7 +300,7 @@
android:textColor="@color/cos_light_black"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
......
......@@ -18,7 +18,6 @@
<TextView
android:id="@+id/tv_pin_title"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
......@@ -56,7 +55,6 @@
<TextView
android:id="@+id/tv_pin_name"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/grey"
......@@ -65,7 +63,6 @@
<TextView
android:id="@+id/tv_pin_days"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_grey8"
......@@ -95,7 +92,6 @@
<TextView
android:id="@+id/tv_pin_tel"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
......@@ -131,7 +127,6 @@
<TextView
android:id="@+id/tv_pin_address"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="184dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
......@@ -159,7 +154,7 @@
android:src="@drawable/ic_pin_compass" />
<TextView
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:id="@+id/tv_directions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......
......@@ -7,7 +7,6 @@
<TextView
android:id="@+id/tv_code_copy"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
......@@ -17,7 +16,6 @@
<TextView
android:id="@+id/tv_code_comma"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
......
......@@ -16,7 +16,6 @@
<TextView
android:id="@+id/tv_expired_tab"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_redeemed_coupons_tab"
......@@ -38,7 +37,6 @@
<TextView
android:id="@+id/tv_shared_tab"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_shared_gifts_tab"
......
......@@ -26,7 +26,6 @@
<TextView
android:id="@+id/tv_telematics_history_title"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TRIP ID"
......@@ -35,7 +34,6 @@
<TextView
android:id="@+id/tv_telematics_history_value"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/grey"
......@@ -45,7 +43,6 @@
<TextView
android:id="@+id/tv_telematics_history_date_value"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="32dp"
......
......@@ -25,7 +25,6 @@
<TextView
android:id="@+id/tv_telematics_metric_title_value"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/grey"
......@@ -34,7 +33,6 @@
<TextView
android:id="@+id/tv_telematics_metric_title"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/grey"
......@@ -44,7 +42,6 @@
<TextView
android:id="@+id/tv_telematics_metric_subtitle"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
......