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 { ...@@ -100,8 +100,8 @@ dependencies {
100 api 'com.getkeepsafe.relinker:relinker:1.4.4' 100 api 'com.getkeepsafe.relinker:relinker:1.4.4'
101 101
102 //------------------------------ Calligraphy -----------------------------// 102 //------------------------------ Calligraphy -----------------------------//
103 - api 'io.github.inflationx:calligraphy3:3.1.1' 103 +// api 'io.github.inflationx:calligraphy3:3.1.1'
104 - api 'io.github.inflationx:viewpump:2.0.3' 104 +// api 'io.github.inflationx:viewpump:2.0.3'
105 105
106 //------------------------------ Retrofit -----------------------------// 106 //------------------------------ Retrofit -----------------------------//
107 implementation 'com.squareup.retrofit2:retrofit:2.9.0' 107 implementation 'com.squareup.retrofit2:retrofit:2.9.0'
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.AlertDialog; 3 import android.app.AlertDialog;
4 -import android.content.Context;
5 import android.content.pm.PackageManager; 4 import android.content.pm.PackageManager;
6 import android.os.Build; 5 import android.os.Build;
7 import android.os.Bundle; 6 import android.os.Bundle;
...@@ -19,7 +18,6 @@ import com.google.android.material.navigation.NavigationBarView; ...@@ -19,7 +18,6 @@ import com.google.android.material.navigation.NavigationBarView;
19 18
20 import java.util.ArrayList; 19 import java.util.ArrayList;
21 20
22 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
23 import ly.warp.sdk.R; 21 import ly.warp.sdk.R;
24 import ly.warp.sdk.fragments.HomeFragment; 22 import ly.warp.sdk.fragments.HomeFragment;
25 import ly.warp.sdk.fragments.LoyaltyFragment; 23 import ly.warp.sdk.fragments.LoyaltyFragment;
...@@ -111,11 +109,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -111,11 +109,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
111 } 109 }
112 110
113 @Override 111 @Override
114 - public void attachBaseContext(Context newBase) {
115 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
116 - }
117 -
118 - @Override
119 public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { 112 public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
120 super.onRequestPermissionsResult(requestCode, permissions, grantResults); 113 super.onRequestPermissionsResult(requestCode, permissions, grantResults);
121 if (requestCode == REQUEST_NOTIFICATION_PERMISSION) { 114 if (requestCode == REQUEST_NOTIFICATION_PERMISSION) {
......
...@@ -2,7 +2,6 @@ package ly.warp.sdk.activities; ...@@ -2,7 +2,6 @@ package ly.warp.sdk.activities;
2 2
3 import android.Manifest; 3 import android.Manifest;
4 import android.content.ActivityNotFoundException; 4 import android.content.ActivityNotFoundException;
5 -import android.content.Context;
6 import android.content.Intent; 5 import android.content.Intent;
7 import android.content.pm.PackageManager; 6 import android.content.pm.PackageManager;
8 import android.graphics.Bitmap; 7 import android.graphics.Bitmap;
...@@ -43,12 +42,12 @@ import com.google.maps.android.clustering.ClusterManager; ...@@ -43,12 +42,12 @@ import com.google.maps.android.clustering.ClusterManager;
43 42
44 import java.util.ArrayList; 43 import java.util.ArrayList;
45 44
46 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
47 import ly.warp.sdk.R; 45 import ly.warp.sdk.R;
48 import ly.warp.sdk.io.callbacks.CallbackReceiver; 46 import ly.warp.sdk.io.callbacks.CallbackReceiver;
49 import ly.warp.sdk.io.models.Coupon; 47 import ly.warp.sdk.io.models.Coupon;
50 import ly.warp.sdk.io.models.Merchant; 48 import ly.warp.sdk.io.models.Merchant;
51 import ly.warp.sdk.io.models.MerchantList; 49 import ly.warp.sdk.io.models.MerchantList;
50 +import ly.warp.sdk.utils.WarpUtils;
52 import ly.warp.sdk.utils.WarplyManagerHelper; 51 import ly.warp.sdk.utils.WarplyManagerHelper;
53 import ly.warp.sdk.utils.WarplyProperty; 52 import ly.warp.sdk.utils.WarplyProperty;
54 import ly.warp.sdk.utils.constants.WarpConstants; 53 import ly.warp.sdk.utils.constants.WarpConstants;
...@@ -79,6 +78,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -79,6 +78,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
79 private AlertDialog mAlertDialogNoShopsAvailable; 78 private AlertDialog mAlertDialogNoShopsAvailable;
80 private Merchant mMerchant, mMerchantParent; 79 private Merchant mMerchant, mMerchantParent;
81 private ArrayList<Merchant> mMerchantParentList = new ArrayList<>(); 80 private ArrayList<Merchant> mMerchantParentList = new ArrayList<>();
81 + private TextView mFontHeader;
82 82
83 // =========================================================== 83 // ===========================================================
84 // Methods for/from SuperClass/Interfaces 84 // Methods for/from SuperClass/Interfaces
...@@ -102,6 +102,8 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -102,6 +102,8 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
102 mMapView = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops); 102 mMapView = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops);
103 mMapView.getMapAsync(this); 103 mMapView.getMapAsync(this);
104 mIvBack.setOnClickListener(this); 104 mIvBack.setOnClickListener(this);
105 + mFontHeader = findViewById(R.id.textView3);
106 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
105 } 107 }
106 108
107 @Override 109 @Override
...@@ -117,11 +119,6 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -117,11 +119,6 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
117 } 119 }
118 } 120 }
119 121
120 - @Override
121 - protected void attachBaseContext(Context newBase) {
122 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
123 - }
124 -
125 // @Override 122 // @Override
126 // public void onRequestPermissionsResult( 123 // public void onRequestPermissionsResult(
127 // int requestCode, 124 // int requestCode,
...@@ -221,6 +218,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -221,6 +218,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
221 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss()); 218 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
222 219
223 TextView pinTitle = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_title); 220 TextView pinTitle = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_title);
221 + WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_bold, pinTitle);
224 if (mMerchantParentList != null && mMerchantParentList.size() > 0) { 222 if (mMerchantParentList != null && mMerchantParentList.size() > 0) {
225 for (Merchant parentMerch : mMerchantParentList) { 223 for (Merchant parentMerch : mMerchantParentList) {
226 if (parentMerch.getUuid().equals(merch.getParent())) { 224 if (parentMerch.getUuid().equals(merch.getParent())) {
...@@ -243,17 +241,24 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -243,17 +241,24 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
243 } 241 }
244 242
245 TextView pinName = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_name); 243 TextView pinName = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_name);
244 + WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinName);
246 pinName.setText(merch.getName()); 245 pinName.setText(merch.getName());
247 246
248 TextView pinDays = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_days); 247 TextView pinDays = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_days);
248 + WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_regular, pinDays);
249 pinDays.setText(merch.getSnippet()); //TODO: wrong getter 249 pinDays.setText(merch.getSnippet()); //TODO: wrong getter
250 250
251 TextView pinTel = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_tel); 251 TextView pinTel = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_tel);
252 + WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinTel);
252 pinTel.setText(merch.getTelephone()); 253 pinTel.setText(merch.getTelephone());
253 254
254 TextView pinAddress = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_address); 255 TextView pinAddress = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_address);
256 + WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinAddress);
255 pinAddress.setText(merch.getAddress()); 257 pinAddress.setText(merch.getAddress());
256 258
259 + TextView pinDirectionsText = (TextView) bottomSheetDialog.findViewById(R.id.tv_directions);
260 + WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinDirectionsText);
261 +
257 LinearLayout pinDirections = (LinearLayout) bottomSheetDialog.findViewById(R.id.ll_directions); 262 LinearLayout pinDirections = (LinearLayout) bottomSheetDialog.findViewById(R.id.ll_directions);
258 pinDirections.setOnClickListener(view -> { 263 pinDirections.setOnClickListener(view -> {
259 Uri gmmIntentUri = Uri.parse("google.navigation:q=" + merch.getLatitude() + "," + merch.getLongitude()/* + "&mode=w"*/); 264 Uri gmmIntentUri = Uri.parse("google.navigation:q=" + merch.getLatitude() + "," + merch.getLongitude()/* + "&mode=w"*/);
......
...@@ -2,7 +2,6 @@ package ly.warp.sdk.activities; ...@@ -2,7 +2,6 @@ package ly.warp.sdk.activities;
2 2
3 import android.Manifest; 3 import android.Manifest;
4 import android.content.ActivityNotFoundException; 4 import android.content.ActivityNotFoundException;
5 -import android.content.Context;
6 import android.content.Intent; 5 import android.content.Intent;
7 import android.content.pm.PackageManager; 6 import android.content.pm.PackageManager;
8 import android.graphics.Bitmap; 7 import android.graphics.Bitmap;
...@@ -42,12 +41,12 @@ import com.huawei.hms.maps.model.MarkerOptions; ...@@ -42,12 +41,12 @@ import com.huawei.hms.maps.model.MarkerOptions;
42 41
43 import java.util.ArrayList; 42 import java.util.ArrayList;
44 43
45 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
46 import ly.warp.sdk.R; 44 import ly.warp.sdk.R;
47 import ly.warp.sdk.io.callbacks.CallbackReceiver; 45 import ly.warp.sdk.io.callbacks.CallbackReceiver;
48 import ly.warp.sdk.io.models.Coupon; 46 import ly.warp.sdk.io.models.Coupon;
49 import ly.warp.sdk.io.models.Merchant; 47 import ly.warp.sdk.io.models.Merchant;
50 import ly.warp.sdk.io.models.MerchantList; 48 import ly.warp.sdk.io.models.MerchantList;
49 +import ly.warp.sdk.utils.WarpUtils;
51 import ly.warp.sdk.utils.WarplyManagerHelper; 50 import ly.warp.sdk.utils.WarplyManagerHelper;
52 import ly.warp.sdk.utils.WarplyProperty; 51 import ly.warp.sdk.utils.WarplyProperty;
53 import ly.warp.sdk.utils.constants.WarpConstants; 52 import ly.warp.sdk.utils.constants.WarpConstants;
...@@ -77,6 +76,7 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic ...@@ -77,6 +76,7 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
77 private AlertDialog mAlertDialogNoShopsAvailable; 76 private AlertDialog mAlertDialogNoShopsAvailable;
78 private Merchant mMerchant, mMerchantParent; 77 private Merchant mMerchant, mMerchantParent;
79 private ArrayList<Merchant> mMerchantParentList = new ArrayList<>(); 78 private ArrayList<Merchant> mMerchantParentList = new ArrayList<>();
79 + private TextView mFontHeader;
80 80
81 // =========================================================== 81 // ===========================================================
82 // Methods for/from SuperClass/Interfaces 82 // Methods for/from SuperClass/Interfaces
...@@ -101,6 +101,8 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic ...@@ -101,6 +101,8 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
101 mSupportMapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops_huawei); 101 mSupportMapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops_huawei);
102 mSupportMapFragment.getMapAsync(this); 102 mSupportMapFragment.getMapAsync(this);
103 mIvBack.setOnClickListener(this); 103 mIvBack.setOnClickListener(this);
104 + mFontHeader = findViewById(R.id.textView3);
105 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
104 } 106 }
105 107
106 @Override 108 @Override
...@@ -116,11 +118,6 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic ...@@ -116,11 +118,6 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
116 } 118 }
117 } 119 }
118 120
119 - @Override
120 - protected void attachBaseContext(Context newBase) {
121 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
122 - }
123 -
124 // @Override 121 // @Override
125 // public void onRequestPermissionsResult( 122 // public void onRequestPermissionsResult(
126 // int requestCode, 123 // int requestCode,
...@@ -222,6 +219,7 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic ...@@ -222,6 +219,7 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
222 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss()); 219 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
223 220
224 TextView pinTitle = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_title); 221 TextView pinTitle = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_title);
222 + WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_bold, pinTitle);
225 if (mMerchantParentList != null && mMerchantParentList.size() > 0) { 223 if (mMerchantParentList != null && mMerchantParentList.size() > 0) {
226 for (Merchant parentMerch : mMerchantParentList) { 224 for (Merchant parentMerch : mMerchantParentList) {
227 if (parentMerch.getUuid().equals(merch.getParent())) { 225 if (parentMerch.getUuid().equals(merch.getParent())) {
...@@ -244,17 +242,24 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic ...@@ -244,17 +242,24 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
244 } 242 }
245 243
246 TextView pinName = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_name); 244 TextView pinName = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_name);
245 + WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinName);
247 pinName.setText(merch.getName()); 246 pinName.setText(merch.getName());
248 247
249 TextView pinDays = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_days); 248 TextView pinDays = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_days);
249 + WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_regular, pinDays);
250 pinDays.setText(merch.getSnippet()); //TODO: wrong getter 250 pinDays.setText(merch.getSnippet()); //TODO: wrong getter
251 251
252 TextView pinTel = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_tel); 252 TextView pinTel = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_tel);
253 + WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinTel);
253 pinTel.setText(merch.getTelephone()); 254 pinTel.setText(merch.getTelephone());
254 255
255 TextView pinAddress = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_address); 256 TextView pinAddress = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_address);
257 + WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinAddress);
256 pinAddress.setText(merch.getAddress()); 258 pinAddress.setText(merch.getAddress());
257 259
260 + TextView pinDirectionsText = (TextView) bottomSheetDialog.findViewById(R.id.tv_directions);
261 + WarpUtils.renderCustomFont(ShopsHuaweiActivity.this, R.font.pf_square_sans_pro_medium, pinDirectionsText);
262 +
258 LinearLayout pinDirections = (LinearLayout) bottomSheetDialog.findViewById(R.id.ll_directions); 263 LinearLayout pinDirections = (LinearLayout) bottomSheetDialog.findViewById(R.id.ll_directions);
259 pinDirections.setOnClickListener(view -> { 264 pinDirections.setOnClickListener(view -> {
260 Uri hmmIntentUri = Uri.parse("petalmaps://navigation?daddr=" + merch.getLatitude() + "," + merch.getLongitude()); 265 Uri hmmIntentUri = Uri.parse("petalmaps://navigation?daddr=" + merch.getLatitude() + "," + merch.getLongitude());
......
...@@ -50,9 +50,9 @@ import org.json.JSONObject; ...@@ -50,9 +50,9 @@ import org.json.JSONObject;
50 import java.util.ArrayList; 50 import java.util.ArrayList;
51 import java.util.Arrays; 51 import java.util.Arrays;
52 52
53 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
54 import ly.warp.sdk.R; 53 import ly.warp.sdk.R;
55 import ly.warp.sdk.io.callbacks.CallbackReceiver; 54 import ly.warp.sdk.io.callbacks.CallbackReceiver;
55 +import ly.warp.sdk.utils.WarpUtils;
56 import ly.warp.sdk.utils.managers.WarplyManager; 56 import ly.warp.sdk.utils.managers.WarplyManager;
57 57
58 /** 58 /**
...@@ -73,7 +73,9 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -73,7 +73,9 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
73 private boolean mIsTripStarted = false; 73 private boolean mIsTripStarted = false;
74 private LinearLayout mLlTripButton, mLlTelematicsMain, mLlTelematicsHistory; 74 private LinearLayout mLlTripButton, mLlTelematicsMain, mLlTelematicsHistory;
75 private TextView mTvTripButton, mTvSensorData, mTvVelocity, mTvAvgVelocity, mTvRecordsSaved, 75 private TextView mTvTripButton, mTvSensorData, mTvVelocity, mTvAvgVelocity, mTvRecordsSaved,
76 - mTvOrientationCount, mTvTouchCount; 76 + mTvOrientationCount, mTvTouchCount, mFontHeader, mFontSensorLabel,
77 + mFontVelocityLabel, mFontAvgLabel, mFontOrientationLabel, mFontTouchLabel, mFontRecordLabel,
78 + mFontDrivingSumLabel, mFontDrivingSumSubtitleLabel, mFontHistoryButtonLabel;
77 private SensorManager mSensorManager; 79 private SensorManager mSensorManager;
78 private Sensor mSensor; 80 private Sensor mSensor;
79 private Handler mHandler, mTouchHandler; 81 private Handler mHandler, mTouchHandler;
...@@ -133,6 +135,28 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -133,6 +135,28 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
133 mRlMainScroll.setOnTouchListener(mScrollTouchListener); 135 mRlMainScroll.setOnTouchListener(mScrollTouchListener);
134 mLlTelematicsHistory = findViewById(R.id.ll_telematics_history); 136 mLlTelematicsHistory = findViewById(R.id.ll_telematics_history);
135 mLlTelematicsHistory.setOnClickListener(this); 137 mLlTelematicsHistory.setOnClickListener(this);
138 + mFontHeader = findViewById(R.id.textView3);
139 + mFontSensorLabel = findViewById(R.id.tv_sensor_data_label);
140 + mFontVelocityLabel = findViewById(R.id.tv_velocity_label);
141 + mFontAvgLabel = findViewById(R.id.tv_avg_label);
142 + mFontOrientationLabel = findViewById(R.id.tv_orientation_label);
143 + mFontTouchLabel = findViewById(R.id.tv_touch_label);
144 + mFontRecordLabel = findViewById(R.id.tv_records_label);
145 + mFontDrivingSumLabel = findViewById(R.id.tv_driving_sum);
146 + mFontDrivingSumSubtitleLabel = findViewById(R.id.tv_driving_sum_subtitle);
147 + mFontHistoryButtonLabel = findViewById(R.id.history_button_text);
148 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
149 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mFontSensorLabel,
150 + mFontVelocityLabel, mFontAvgLabel, mFontOrientationLabel, mFontTouchLabel,
151 + mFontRecordLabel);
152 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvSensorData,
153 + mTvVelocity, mTvAvgVelocity, mTvOrientationCount, mTvTouchCount, mTvRecordsSaved,
154 + mEtLimit, mEtSampleTime);
155 +
156 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mFontDrivingSumLabel);
157 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mFontDrivingSumSubtitleLabel);
158 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium,
159 + mFontHistoryButtonLabel, mTvTripButton);
136 160
137 locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); 161 locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
138 162
...@@ -248,11 +272,6 @@ public class TelematicsActivity extends Activity implements View.OnClickListener ...@@ -248,11 +272,6 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
248 } 272 }
249 273
250 @Override 274 @Override
251 - protected void attachBaseContext(Context newBase) {
252 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
253 - }
254 -
255 - @Override
256 public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { 275 public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
257 super.onRequestPermissionsResult(requestCode, permissions, grantResults); 276 super.onRequestPermissionsResult(requestCode, permissions, grantResults);
258 277
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.view.View; 6 import android.view.View;
8 import android.widget.ImageView; 7 import android.widget.ImageView;
9 import android.widget.LinearLayout; 8 import android.widget.LinearLayout;
9 +import android.widget.TextView;
10 10
11 import androidx.recyclerview.widget.ConcatAdapter; 11 import androidx.recyclerview.widget.ConcatAdapter;
12 import androidx.recyclerview.widget.LinearLayoutManager; 12 import androidx.recyclerview.widget.LinearLayoutManager;
...@@ -16,10 +16,10 @@ import com.google.android.material.snackbar.Snackbar; ...@@ -16,10 +16,10 @@ import com.google.android.material.snackbar.Snackbar;
16 16
17 import java.util.ArrayList; 17 import java.util.ArrayList;
18 18
19 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
20 import ly.warp.sdk.R; 19 import ly.warp.sdk.R;
21 import ly.warp.sdk.io.callbacks.CallbackReceiver; 20 import ly.warp.sdk.io.callbacks.CallbackReceiver;
22 import ly.warp.sdk.io.models.TelematicsHistory; 21 import ly.warp.sdk.io.models.TelematicsHistory;
22 +import ly.warp.sdk.utils.WarpUtils;
23 import ly.warp.sdk.utils.managers.WarplyManager; 23 import ly.warp.sdk.utils.managers.WarplyManager;
24 import ly.warp.sdk.views.adapters.TelematicsHistoryAdapter; 24 import ly.warp.sdk.views.adapters.TelematicsHistoryAdapter;
25 import ly.warp.sdk.views.adapters.TelematicsHistoryHeaderAdapter; 25 import ly.warp.sdk.views.adapters.TelematicsHistoryHeaderAdapter;
...@@ -44,6 +44,7 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL ...@@ -44,6 +44,7 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL
44 private TelematicsHistoryHeaderAdapter mAdapterTelematicsHistoryHeader; 44 private TelematicsHistoryHeaderAdapter mAdapterTelematicsHistoryHeader;
45 private boolean mTelematicsHistoryItemPressed = false; 45 private boolean mTelematicsHistoryItemPressed = false;
46 private ImageView mIvClose; 46 private ImageView mIvClose;
47 + private TextView mFontHeader;
47 48
48 49
49 // =========================================================== 50 // ===========================================================
...@@ -58,8 +59,10 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL ...@@ -58,8 +59,10 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL
58 mLlTelematicsHistoryMain = findViewById(R.id.ll_telematics_history_main); 59 mLlTelematicsHistoryMain = findViewById(R.id.ll_telematics_history_main);
59 mIvClose = findViewById(R.id.iv_telematics_history_close); 60 mIvClose = findViewById(R.id.iv_telematics_history_close);
60 mIvClose.setOnClickListener(this); 61 mIvClose.setOnClickListener(this);
62 + mFontHeader = findViewById(R.id.textView3);
61 63
62 WarplyManager.getTelematicsHistory(mTelematicsHistoryCallback); 64 WarplyManager.getTelematicsHistory(mTelematicsHistoryCallback);
65 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
63 } 66 }
64 67
65 @Override 68 @Override
...@@ -76,11 +79,6 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL ...@@ -76,11 +79,6 @@ public class TelematicsHistoryActivity extends Activity implements View.OnClickL
76 } 79 }
77 } 80 }
78 81
79 - @Override
80 - protected void attachBaseContext(Context newBase) {
81 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
82 - }
83 -
84 // =========================================================== 82 // ===========================================================
85 // Methods 83 // Methods
86 // =========================================================== 84 // ===========================================================
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.os.Bundle; 4 import android.os.Bundle;
6 import android.view.View; 5 import android.view.View;
7 import android.widget.ImageView; 6 import android.widget.ImageView;
...@@ -12,10 +11,10 @@ import androidx.cardview.widget.CardView; ...@@ -12,10 +11,10 @@ import androidx.cardview.widget.CardView;
12 11
13 import com.google.android.material.snackbar.Snackbar; 12 import com.google.android.material.snackbar.Snackbar;
14 13
15 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
16 import ly.warp.sdk.R; 14 import ly.warp.sdk.R;
17 import ly.warp.sdk.io.callbacks.CallbackReceiver; 15 import ly.warp.sdk.io.callbacks.CallbackReceiver;
18 import ly.warp.sdk.io.models.TripMetrics; 16 import ly.warp.sdk.io.models.TripMetrics;
17 +import ly.warp.sdk.utils.WarpUtils;
19 import ly.warp.sdk.utils.managers.WarplyManager; 18 import ly.warp.sdk.utils.managers.WarplyManager;
20 19
21 /** 20 /**
...@@ -37,6 +36,7 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL ...@@ -37,6 +36,7 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL
37 private TripMetrics mTripMetrics; 36 private TripMetrics mTripMetrics;
38 private CardView mCvAvgSpeed, mCvTrips, mCvAccScore, mCvFocusScore, mCvReadinessScore, 37 private CardView mCvAvgSpeed, mCvTrips, mCvAccScore, mCvFocusScore, mCvReadinessScore,
39 mCvSmoothnessScore, mCvTotalDistance; 38 mCvSmoothnessScore, mCvTotalDistance;
39 + private TextView mFontHeader, mFontSafeDrivingLabel, mFontRatingLabel;
40 40
41 41
42 // =========================================================== 42 // ===========================================================
...@@ -62,6 +62,12 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL ...@@ -62,6 +62,12 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL
62 mCvReadinessScore = findViewById(R.id.ly_readiness_score); 62 mCvReadinessScore = findViewById(R.id.ly_readiness_score);
63 mCvSmoothnessScore = findViewById(R.id.ly_smoothness_score); 63 mCvSmoothnessScore = findViewById(R.id.ly_smoothness_score);
64 mCvTotalDistance = findViewById(R.id.ly_total_distance); 64 mCvTotalDistance = findViewById(R.id.ly_total_distance);
65 + mFontHeader = findViewById(R.id.textView3);
66 + mFontSafeDrivingLabel = findViewById(R.id.safe_driving_label);
67 + mFontRatingLabel = findViewById(R.id.rating_label);
68 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
69 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium,
70 + mFontSafeDrivingLabel, mFontRatingLabel);
65 71
66 if (mTripId > -1) 72 if (mTripId > -1)
67 WarplyManager.getTripMetrics(mTripId, mTripMetricsCallback); 73 WarplyManager.getTripMetrics(mTripId, mTripMetricsCallback);
...@@ -88,49 +94,72 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL ...@@ -88,49 +94,72 @@ public class TelematicsMetricsActivity extends Activity implements View.OnClickL
88 } 94 }
89 } 95 }
90 96
91 - @Override
92 - protected void attachBaseContext(Context newBase) {
93 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
94 - }
95 -
96 // =========================================================== 97 // ===========================================================
97 // Methods 98 // Methods
98 // =========================================================== 99 // ===========================================================
99 100
100 private void initViews() { 101 private void initViews() {
101 if (mTripMetrics != null) { 102 if (mTripMetrics != null) {
103 + TextView mCvAvgSpeedTitleText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_title);
104 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvAvgSpeedTitleText);
102 TextView mCvAvgSpeedText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_title_value); 105 TextView mCvAvgSpeedText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_title_value);
106 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvAvgSpeedText);
103 TextView mCvAvgSpeedSubtitleText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_subtitle); 107 TextView mCvAvgSpeedSubtitleText = mCvAvgSpeed.findViewById(R.id.tv_telematics_metric_subtitle);
108 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvAvgSpeedSubtitleText);
104 mCvAvgSpeedText.setText(String.valueOf(mTripMetrics.getAvgSpeed())); 109 mCvAvgSpeedText.setText(String.valueOf(mTripMetrics.getAvgSpeed()));
105 mCvAvgSpeedSubtitleText.setText("Average Speed"); 110 mCvAvgSpeedSubtitleText.setText("Average Speed");
106 111
112 + TextView mCvTripsTitleText = mCvTrips.findViewById(R.id.tv_telematics_metric_title);
113 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvTripsTitleText);
107 TextView mCvTripsText = mCvTrips.findViewById(R.id.tv_telematics_metric_title_value); 114 TextView mCvTripsText = mCvTrips.findViewById(R.id.tv_telematics_metric_title_value);
115 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvTripsText);
108 TextView mCvTripsSubtitleText = mCvTrips.findViewById(R.id.tv_telematics_metric_subtitle); 116 TextView mCvTripsSubtitleText = mCvTrips.findViewById(R.id.tv_telematics_metric_subtitle);
117 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvTripsSubtitleText);
109 mCvTripsText.setText(String.valueOf(mTripMetrics.getNumOfTrips())); 118 mCvTripsText.setText(String.valueOf(mTripMetrics.getNumOfTrips()));
110 mCvTripsSubtitleText.setText("Trips"); 119 mCvTripsSubtitleText.setText("Trips");
111 120
121 + TextView mCvAccScoreTitleText = mCvAccScore.findViewById(R.id.tv_telematics_metric_title);
122 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvAccScoreTitleText);
112 TextView mCvAccScoreText = mCvAccScore.findViewById(R.id.tv_telematics_metric_title_value); 123 TextView mCvAccScoreText = mCvAccScore.findViewById(R.id.tv_telematics_metric_title_value);
124 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvAccScoreText);
113 TextView mCvAccScoreSubtitleText = mCvAccScore.findViewById(R.id.tv_telematics_metric_subtitle); 125 TextView mCvAccScoreSubtitleText = mCvAccScore.findViewById(R.id.tv_telematics_metric_subtitle);
126 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvAccScoreSubtitleText);
114 mCvAccScoreText.setText(String.valueOf(mTripMetrics.getOverallScore())); 127 mCvAccScoreText.setText(String.valueOf(mTripMetrics.getOverallScore()));
115 mCvAccScoreSubtitleText.setText("Acceleration Score"); 128 mCvAccScoreSubtitleText.setText("Acceleration Score");
116 129
130 + TextView mCvFocusScoreTitleText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_title);
131 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvFocusScoreTitleText);
117 TextView mCvFocusScoreText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_title_value); 132 TextView mCvFocusScoreText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_title_value);
133 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvFocusScoreText);
118 TextView mCvFocusScoreSubtitleText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_subtitle); 134 TextView mCvFocusScoreSubtitleText = mCvFocusScore.findViewById(R.id.tv_telematics_metric_subtitle);
135 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvFocusScoreSubtitleText);
119 mCvFocusScoreText.setText(String.valueOf(mTripMetrics.getOverallFocus())); 136 mCvFocusScoreText.setText(String.valueOf(mTripMetrics.getOverallFocus()));
120 mCvFocusScoreSubtitleText.setText("Focus Score"); 137 mCvFocusScoreSubtitleText.setText("Focus Score");
121 138
139 + TextView mCvReadinessScoreTitleText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_title);
140 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvReadinessScoreTitleText);
122 TextView mCvReadinessScoreText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_title_value); 141 TextView mCvReadinessScoreText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_title_value);
142 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvReadinessScoreText);
123 TextView mCvReadinessScoreSubtitleText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_subtitle); 143 TextView mCvReadinessScoreSubtitleText = mCvReadinessScore.findViewById(R.id.tv_telematics_metric_subtitle);
144 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvReadinessScoreSubtitleText);
124 mCvReadinessScoreText.setText(String.valueOf(mTripMetrics.getReadinessScore())); 145 mCvReadinessScoreText.setText(String.valueOf(mTripMetrics.getReadinessScore()));
125 mCvReadinessScoreSubtitleText.setText("Readiness Score"); 146 mCvReadinessScoreSubtitleText.setText("Readiness Score");
126 147
148 + TextView mCvSmoothnessScoreTitleText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_title);
149 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvSmoothnessScoreTitleText);
127 TextView mCvSmoothnessScoreText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_title_value); 150 TextView mCvSmoothnessScoreText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_title_value);
151 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvSmoothnessScoreText);
128 TextView mCvSmoothnessScoreSubtitleText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_subtitle); 152 TextView mCvSmoothnessScoreSubtitleText = mCvSmoothnessScore.findViewById(R.id.tv_telematics_metric_subtitle);
153 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvSmoothnessScoreSubtitleText);
129 mCvSmoothnessScoreText.setText(String.valueOf(mTripMetrics.getSmoothnessScore())); 154 mCvSmoothnessScoreText.setText(String.valueOf(mTripMetrics.getSmoothnessScore()));
130 mCvSmoothnessScoreSubtitleText.setText("Smoothness Score"); 155 mCvSmoothnessScoreSubtitleText.setText("Smoothness Score");
131 156
157 + TextView mCvTotalDistanceTitleText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_title);
158 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mCvTotalDistanceTitleText);
132 TextView mCvTotalDistanceText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_title_value); 159 TextView mCvTotalDistanceText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_title_value);
160 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_bold, mCvTotalDistanceText);
133 TextView mCvTotalDistanceSubtitleText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_subtitle); 161 TextView mCvTotalDistanceSubtitleText = mCvTotalDistance.findViewById(R.id.tv_telematics_metric_subtitle);
162 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_medium, mCvTotalDistanceSubtitleText);
134 mCvTotalDistanceText.setText(String.valueOf(mTripMetrics.getTotalKM())); 163 mCvTotalDistanceText.setText(String.valueOf(mTripMetrics.getTotalKM()));
135 mCvTotalDistanceSubtitleText.setText("Total Distance"); 164 mCvTotalDistanceSubtitleText.setText("Total Distance");
136 } 165 }
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.graphics.Bitmap; 5 import android.graphics.Bitmap;
7 import android.graphics.Color; 6 import android.graphics.Color;
...@@ -14,7 +13,6 @@ import android.widget.TextView; ...@@ -14,7 +13,6 @@ import android.widget.TextView;
14 13
15 import androidx.appcompat.app.AlertDialog; 14 import androidx.appcompat.app.AlertDialog;
16 import androidx.core.content.ContextCompat; 15 import androidx.core.content.ContextCompat;
17 -import androidx.core.text.HtmlCompat;
18 import androidx.recyclerview.widget.LinearLayoutManager; 16 import androidx.recyclerview.widget.LinearLayoutManager;
19 import androidx.recyclerview.widget.RecyclerView; 17 import androidx.recyclerview.widget.RecyclerView;
20 18
...@@ -26,19 +24,18 @@ import com.google.zxing.oned.EAN13Writer; ...@@ -26,19 +24,18 @@ import com.google.zxing.oned.EAN13Writer;
26 24
27 import org.greenrobot.eventbus.EventBus; 25 import org.greenrobot.eventbus.EventBus;
28 26
29 -import java.io.Serializable;
30 import java.text.ParseException; 27 import java.text.ParseException;
31 import java.text.SimpleDateFormat; 28 import java.text.SimpleDateFormat;
32 import java.util.Collections; 29 import java.util.Collections;
33 import java.util.Date; 30 import java.util.Date;
34 31
35 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
36 import ly.warp.sdk.R; 32 import ly.warp.sdk.R;
37 import ly.warp.sdk.io.callbacks.CallbackReceiver; 33 import ly.warp.sdk.io.callbacks.CallbackReceiver;
38 import ly.warp.sdk.io.models.Coupon; 34 import ly.warp.sdk.io.models.Coupon;
39 import ly.warp.sdk.io.models.CouponList; 35 import ly.warp.sdk.io.models.CouponList;
40 import ly.warp.sdk.io.models.RefreshUnifiedCouponsEventModel; 36 import ly.warp.sdk.io.models.RefreshUnifiedCouponsEventModel;
41 import ly.warp.sdk.io.models.UnifiedCoupon; 37 import ly.warp.sdk.io.models.UnifiedCoupon;
38 +import ly.warp.sdk.utils.WarpUtils;
42 import ly.warp.sdk.utils.WarplyManagerHelper; 39 import ly.warp.sdk.utils.WarplyManagerHelper;
43 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 40 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
44 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 41 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
...@@ -57,8 +54,9 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL ...@@ -57,8 +54,9 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
57 // =========================================================== 54 // ===========================================================
58 55
59 private ImageView mIvBack, mIvBarcode, mIvMarketExpand; 56 private ImageView mIvBack, mIvBarcode, mIvMarketExpand;
60 - private TextView mTvTerms, mTvCouponCode, mTvCouponDate, mTvMarketExpand, 57 + private TextView mTvTerms, mTvCouponCode, mTvCouponDate, mTvMarketExpand, mFontSMLabel,
61 - mTvTermsValue, mTvFullBarcode, mTvActiveValue; 58 + mTvTermsValue, mTvFullBarcode, mTvActiveValue, mFontHeader, mFontCouponLabel,
59 + mFontShopsLabel, mFontCancelLabel;
62 private LinearLayout mLlShops, mLlBarcodeContainer, mLlTerms, mLlMarketCoupons, mLlMarketExpand, 60 private LinearLayout mLlShops, mLlBarcodeContainer, mLlTerms, mLlMarketCoupons, mLlMarketExpand,
63 mLlCancelUnified; 61 mLlCancelUnified;
64 private UnifiedCoupon mCoupon; 62 private UnifiedCoupon mCoupon;
...@@ -105,6 +103,19 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL ...@@ -105,6 +103,19 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
105 mRecyclerCoupons = findViewById(R.id.rv_active_market_coupons); 103 mRecyclerCoupons = findViewById(R.id.rv_active_market_coupons);
106 mTvActiveValue = findViewById(R.id.textView14); 104 mTvActiveValue = findViewById(R.id.textView14);
107 mLlCancelUnified = findViewById(R.id.ll_cancel_coupon); 105 mLlCancelUnified = findViewById(R.id.ll_cancel_coupon);
106 + mFontHeader = findViewById(R.id.textView3);
107 + mFontSMLabel = findViewById(R.id.textView13);
108 + mFontCouponLabel = findViewById(R.id.textView15);
109 + mFontShopsLabel = findViewById(R.id.shops_label);
110 + mFontCancelLabel = findViewById(R.id.cancel_label);
111 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mFontSMLabel);
112 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvActiveValue, mTvCouponDate,
113 + mTvTermsValue);
114 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontCouponLabel, mTvCouponCode,
115 + mTvMarketExpand, mTvTerms);
116 + WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mTvFullBarcode);
117 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontShopsLabel, mFontCancelLabel);
118 +
108 mRecyclerCoupons.setNestedScrollingEnabled(false); 119 mRecyclerCoupons.setNestedScrollingEnabled(false);
109 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); 120 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
110 121
...@@ -173,11 +184,6 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL ...@@ -173,11 +184,6 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
173 } 184 }
174 } 185 }
175 186
176 - @Override
177 - protected void attachBaseContext(Context newBase) {
178 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
179 - }
180 -
181 // =========================================================== 187 // ===========================================================
182 // Methods 188 // Methods
183 // =========================================================== 189 // ===========================================================
......
...@@ -3,19 +3,12 @@ package ly.warp.sdk.utils; ...@@ -3,19 +3,12 @@ package ly.warp.sdk.utils;
3 import android.content.ContentProvider; 3 import android.content.ContentProvider;
4 import android.content.ContentValues; 4 import android.content.ContentValues;
5 import android.database.Cursor; 5 import android.database.Cursor;
6 -import android.graphics.Typeface;
7 import android.net.Uri; 6 import android.net.Uri;
8 7
9 import androidx.annotation.NonNull; 8 import androidx.annotation.NonNull;
10 import androidx.annotation.Nullable; 9 import androidx.annotation.Nullable;
11 import androidx.appcompat.app.AppCompatDelegate; 10 import androidx.appcompat.app.AppCompatDelegate;
12 11
13 -import io.github.inflationx.calligraphy3.CalligraphyConfig;
14 -import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
15 -import io.github.inflationx.calligraphy3.FontMapper;
16 -import io.github.inflationx.viewpump.ViewPump;
17 -import ly.warp.sdk.R;
18 -
19 /** 12 /**
20 * Created by Panagiotis Triantafyllou on 05/Αυγ/2022. 13 * Created by Panagiotis Triantafyllou on 05/Αυγ/2022.
21 */ 14 */
...@@ -24,19 +17,19 @@ public class WarplyProvider extends ContentProvider { ...@@ -24,19 +17,19 @@ public class WarplyProvider extends ContentProvider {
24 @Override 17 @Override
25 public boolean onCreate() { 18 public boolean onCreate() {
26 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); 19 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
27 - ViewPump.init(ViewPump.builder() 20 +// ViewPump.init(ViewPump.builder()
28 - .addInterceptor(new CalligraphyInterceptor( 21 +// .addInterceptor(new CalligraphyInterceptor(
29 - new CalligraphyConfig.Builder() 22 +// new CalligraphyConfig.Builder()
30 - .setDefaultFontPath("fonts/pf_square_sans_pro_regular.ttf") 23 +// .setDefaultFontPath("fonts/pf_square_sans_pro_regular.ttf")
31 - .setFontAttrId(R.attr.fontPath) 24 +// .setFontAttrId(R.attr.fontPath)
32 -// .setFontMapper(new FontMapper() { 25 +//// .setFontMapper(new FontMapper() {
33 -// @Override 26 +//// @Override
34 -// public String map(String font) { 27 +//// public String map(String font) {
35 -// return font; 28 +//// return font;
36 -// } 29 +//// }
37 -// }) 30 +//// })
38 - .build())) 31 +// .build()))
39 - .build()); 32 +// .build());
40 33
41 return true; 34 return true;
42 } 35 }
......
...@@ -18,6 +18,7 @@ import io.reactivex.Observable; ...@@ -18,6 +18,7 @@ import io.reactivex.Observable;
18 import io.reactivex.subjects.PublishSubject; 18 import io.reactivex.subjects.PublishSubject;
19 import ly.warp.sdk.R; 19 import ly.warp.sdk.R;
20 import ly.warp.sdk.io.models.TelematicsHistory; 20 import ly.warp.sdk.io.models.TelematicsHistory;
21 +import ly.warp.sdk.utils.WarpUtils;
21 22
22 public class TelematicsHistoryAdapter extends RecyclerView.Adapter<TelematicsHistoryAdapter.TelematicsViewHolder> { 23 public class TelematicsHistoryAdapter extends RecyclerView.Adapter<TelematicsHistoryAdapter.TelematicsViewHolder> {
23 24
...@@ -31,12 +32,17 @@ public class TelematicsHistoryAdapter extends RecyclerView.Adapter<TelematicsHis ...@@ -31,12 +32,17 @@ public class TelematicsHistoryAdapter extends RecyclerView.Adapter<TelematicsHis
31 } 32 }
32 33
33 public class TelematicsViewHolder extends RecyclerView.ViewHolder { 34 public class TelematicsViewHolder extends RecyclerView.ViewHolder {
34 - private TextView tvHistoryId, tvHistoryDate; 35 + private TextView tvHistoryId, tvHistoryDate, tvHistoryLabel;
35 36
36 public TelematicsViewHolder(View view) { 37 public TelematicsViewHolder(View view) {
37 super(view); 38 super(view);
39 + tvHistoryLabel = view.findViewById(R.id.tv_telematics_history_title);
38 tvHistoryId = view.findViewById(R.id.tv_telematics_history_value); 40 tvHistoryId = view.findViewById(R.id.tv_telematics_history_value);
39 tvHistoryDate = view.findViewById(R.id.tv_telematics_history_date_value); 41 tvHistoryDate = view.findViewById(R.id.tv_telematics_history_date_value);
42 +
43 + WarpUtils.renderCustomFont(mContext, R.font.pf_square_sans_pro_medium, tvHistoryLabel);
44 + WarpUtils.renderCustomFont(mContext, R.font.pf_square_sans_pro_regular, tvHistoryId,
45 + tvHistoryDate);
40 } 46 }
41 } 47 }
42 48
......
1 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 1 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:app="http://schemas.android.com/apk/res-auto" 2 xmlns:app="http://schemas.android.com/apk/res-auto"
3 - xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 3 android:layout_width="match_parent"
5 android:layout_height="match_parent" 4 android:layout_height="match_parent"
6 android:background="@android:color/white"> 5 android:background="@android:color/white">
...@@ -16,19 +15,19 @@ ...@@ -16,19 +15,19 @@
16 android:layout_width="48dp" 15 android:layout_width="48dp"
17 android:layout_height="48dp" 16 android:layout_height="48dp"
18 android:layout_marginStart="16dp" 17 android:layout_marginStart="16dp"
19 - android:src="@drawable/ic_back"
20 android:scaleType="centerInside" 18 android:scaleType="centerInside"
19 + android:src="@drawable/ic_back"
21 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
22 app:layout_constraintStart_toStartOf="parent" 21 app:layout_constraintStart_toStartOf="parent"
23 app:layout_constraintTop_toTopOf="parent" /> 22 app:layout_constraintTop_toTopOf="parent" />
24 23
25 <TextView 24 <TextView
25 + android:id="@+id/textView3"
26 android:layout_width="wrap_content" 26 android:layout_width="wrap_content"
27 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
28 android:text="@string/cos_coupon_shops_title" 28 android:text="@string/cos_coupon_shops_title"
29 android:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
30 android:textSize="19sp" 30 android:textSize="19sp"
31 - fontPath="fonts/BTCosmo-Bold.ttf"
32 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/BTCosmo-Bold.ttf" 26 + android:id="@+id/textView3"
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_shops_title" 29 android:text="@string/cos_coupon_shops_title"
...@@ -45,6 +45,6 @@ ...@@ -45,6 +45,6 @@
45 android:id="@+id/mv_shops_huawei" 45 android:id="@+id/mv_shops_huawei"
46 class="com.huawei.hms.maps.SupportMapFragment" 46 class="com.huawei.hms.maps.SupportMapFragment"
47 android:layout_width="match_parent" 47 android:layout_width="match_parent"
48 - android:layout_height="match_parent"/> 48 + android:layout_height="match_parent" />
49 </RelativeLayout> 49 </RelativeLayout>
50 </RelativeLayout> 50 </RelativeLayout>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
26 26
27 <TextView 27 <TextView
28 android:id="@+id/textView3" 28 android:id="@+id/textView3"
29 - fontPath="fonts/BTCosmo-Bold.ttf"
30 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
32 android:gravity="center" 31 android:gravity="center"
...@@ -59,7 +58,6 @@ ...@@ -59,7 +58,6 @@
59 58
60 <TextView 59 <TextView
61 android:id="@+id/tv_sensor_data_label" 60 android:id="@+id/tv_sensor_data_label"
62 - fontPath="fonts/PeridotPE-Regular.ttf"
63 android:layout_width="wrap_content" 61 android:layout_width="wrap_content"
64 android:layout_height="wrap_content" 62 android:layout_height="wrap_content"
65 android:layout_centerHorizontal="true" 63 android:layout_centerHorizontal="true"
...@@ -70,7 +68,6 @@ ...@@ -70,7 +68,6 @@
70 68
71 <TextView 69 <TextView
72 android:id="@+id/tv_sensor_data" 70 android:id="@+id/tv_sensor_data"
73 - fontPath="fonts/PeridotPE-Bold.ttf"
74 android:layout_width="wrap_content" 71 android:layout_width="wrap_content"
75 android:layout_height="wrap_content" 72 android:layout_height="wrap_content"
76 android:layout_below="@+id/tv_sensor_data_label" 73 android:layout_below="@+id/tv_sensor_data_label"
...@@ -81,7 +78,6 @@ ...@@ -81,7 +78,6 @@
81 78
82 <TextView 79 <TextView
83 android:id="@+id/tv_velocity_label" 80 android:id="@+id/tv_velocity_label"
84 - fontPath="fonts/PeridotPE-Regular.ttf"
85 android:layout_width="wrap_content" 81 android:layout_width="wrap_content"
86 android:layout_height="wrap_content" 82 android:layout_height="wrap_content"
87 android:layout_below="@+id/tv_sensor_data" 83 android:layout_below="@+id/tv_sensor_data"
...@@ -93,7 +89,6 @@ ...@@ -93,7 +89,6 @@
93 89
94 <TextView 90 <TextView
95 android:id="@+id/tv_velocity" 91 android:id="@+id/tv_velocity"
96 - fontPath="fonts/PeridotPE-Bold.ttf"
97 android:layout_width="wrap_content" 92 android:layout_width="wrap_content"
98 android:layout_height="wrap_content" 93 android:layout_height="wrap_content"
99 android:layout_below="@+id/tv_velocity_label" 94 android:layout_below="@+id/tv_velocity_label"
...@@ -104,7 +99,6 @@ ...@@ -104,7 +99,6 @@
104 99
105 <TextView 100 <TextView
106 android:id="@+id/tv_avg_label" 101 android:id="@+id/tv_avg_label"
107 - fontPath="fonts/PeridotPE-Regular.ttf"
108 android:layout_width="wrap_content" 102 android:layout_width="wrap_content"
109 android:layout_height="wrap_content" 103 android:layout_height="wrap_content"
110 android:layout_below="@+id/tv_velocity" 104 android:layout_below="@+id/tv_velocity"
...@@ -116,7 +110,6 @@ ...@@ -116,7 +110,6 @@
116 110
117 <TextView 111 <TextView
118 android:id="@+id/tv_avg" 112 android:id="@+id/tv_avg"
119 - fontPath="fonts/PeridotPE-Bold.ttf"
120 android:layout_width="wrap_content" 113 android:layout_width="wrap_content"
121 android:layout_height="wrap_content" 114 android:layout_height="wrap_content"
122 android:layout_below="@+id/tv_avg_label" 115 android:layout_below="@+id/tv_avg_label"
...@@ -127,7 +120,6 @@ ...@@ -127,7 +120,6 @@
127 120
128 <TextView 121 <TextView
129 android:id="@+id/tv_orientation_label" 122 android:id="@+id/tv_orientation_label"
130 - fontPath="fonts/PeridotPE-Regular.ttf"
131 android:layout_width="wrap_content" 123 android:layout_width="wrap_content"
132 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
133 android:layout_below="@+id/tv_avg" 125 android:layout_below="@+id/tv_avg"
...@@ -140,7 +132,6 @@ ...@@ -140,7 +132,6 @@
140 132
141 <TextView 133 <TextView
142 android:id="@+id/tv_orientation" 134 android:id="@+id/tv_orientation"
143 - fontPath="fonts/PeridotPE-Bold.ttf"
144 android:layout_width="wrap_content" 135 android:layout_width="wrap_content"
145 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
146 android:layout_below="@+id/tv_orientation_label" 137 android:layout_below="@+id/tv_orientation_label"
...@@ -153,7 +144,6 @@ ...@@ -153,7 +144,6 @@
153 144
154 <TextView 145 <TextView
155 android:id="@+id/tv_touch_label" 146 android:id="@+id/tv_touch_label"
156 - fontPath="fonts/PeridotPE-Regular.ttf"
157 android:layout_width="wrap_content" 147 android:layout_width="wrap_content"
158 android:layout_height="wrap_content" 148 android:layout_height="wrap_content"
159 android:layout_below="@+id/tv_avg" 149 android:layout_below="@+id/tv_avg"
...@@ -167,7 +157,6 @@ ...@@ -167,7 +157,6 @@
167 157
168 <TextView 158 <TextView
169 android:id="@+id/tv_touch" 159 android:id="@+id/tv_touch"
170 - fontPath="fonts/PeridotPE-Bold.ttf"
171 android:layout_width="wrap_content" 160 android:layout_width="wrap_content"
172 android:layout_height="wrap_content" 161 android:layout_height="wrap_content"
173 android:layout_below="@+id/tv_touch_label" 162 android:layout_below="@+id/tv_touch_label"
...@@ -180,7 +169,6 @@ ...@@ -180,7 +169,6 @@
180 169
181 <TextView 170 <TextView
182 android:id="@+id/tv_records_label" 171 android:id="@+id/tv_records_label"
183 - fontPath="fonts/PeridotPE-Regular.ttf"
184 android:layout_width="wrap_content" 172 android:layout_width="wrap_content"
185 android:layout_height="wrap_content" 173 android:layout_height="wrap_content"
186 android:layout_below="@+id/tv_orientation" 174 android:layout_below="@+id/tv_orientation"
...@@ -192,7 +180,6 @@ ...@@ -192,7 +180,6 @@
192 180
193 <TextView 181 <TextView
194 android:id="@+id/tv_records" 182 android:id="@+id/tv_records"
195 - fontPath="fonts/PeridotPE-Bold.ttf"
196 android:layout_width="wrap_content" 183 android:layout_width="wrap_content"
197 android:layout_height="wrap_content" 184 android:layout_height="wrap_content"
198 android:layout_below="@+id/tv_records_label" 185 android:layout_below="@+id/tv_records_label"
...@@ -203,7 +190,6 @@ ...@@ -203,7 +190,6 @@
203 190
204 <EditText 191 <EditText
205 android:id="@+id/et_acceleration" 192 android:id="@+id/et_acceleration"
206 - fontPath="fonts/PeridotPE-Bold.ttf"
207 android:layout_width="wrap_content" 193 android:layout_width="wrap_content"
208 android:layout_height="wrap_content" 194 android:layout_height="wrap_content"
209 android:layout_below="@+id/tv_records" 195 android:layout_below="@+id/tv_records"
...@@ -218,7 +204,6 @@ ...@@ -218,7 +204,6 @@
218 204
219 <EditText 205 <EditText
220 android:id="@+id/et_save" 206 android:id="@+id/et_save"
221 - fontPath="fonts/PeridotPE-Bold.ttf"
222 android:layout_width="wrap_content" 207 android:layout_width="wrap_content"
223 android:layout_height="wrap_content" 208 android:layout_height="wrap_content"
224 android:layout_below="@+id/tv_records" 209 android:layout_below="@+id/tv_records"
...@@ -264,7 +249,6 @@ ...@@ -264,7 +249,6 @@
264 249
265 <TextView 250 <TextView
266 android:id="@+id/tv_driving_sum" 251 android:id="@+id/tv_driving_sum"
267 - fontPath="fonts/pf_square_sans_pro_bold.ttf"
268 android:layout_width="0dp" 252 android:layout_width="0dp"
269 android:layout_height="wrap_content" 253 android:layout_height="wrap_content"
270 android:layout_marginTop="8dp" 254 android:layout_marginTop="8dp"
...@@ -277,7 +261,6 @@ ...@@ -277,7 +261,6 @@
277 261
278 <TextView 262 <TextView
279 android:id="@+id/tv_driving_sum_subtitle" 263 android:id="@+id/tv_driving_sum_subtitle"
280 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
281 android:layout_width="0dp" 264 android:layout_width="0dp"
282 android:layout_height="wrap_content" 265 android:layout_height="wrap_content"
283 android:layout_marginTop="8dp" 266 android:layout_marginTop="8dp"
...@@ -320,7 +303,7 @@ ...@@ -320,7 +303,7 @@
320 app:layout_constraintTop_toBottomOf="@+id/v_seperator"> 303 app:layout_constraintTop_toBottomOf="@+id/v_seperator">
321 304
322 <TextView 305 <TextView
323 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 306 + android:id="@+id/history_button_text"
324 android:layout_width="wrap_content" 307 android:layout_width="wrap_content"
325 android:layout_height="wrap_content" 308 android:layout_height="wrap_content"
326 android:gravity="center" 309 android:gravity="center"
...@@ -353,7 +336,6 @@ ...@@ -353,7 +336,6 @@
353 336
354 <TextView 337 <TextView
355 android:id="@+id/tv_trip_button" 338 android:id="@+id/tv_trip_button"
356 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
357 android:layout_width="wrap_content" 339 android:layout_width="wrap_content"
358 android:layout_height="wrap_content" 340 android:layout_height="wrap_content"
359 android:gravity="center" 341 android:gravity="center"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
26 26
27 <TextView 27 <TextView
28 android:id="@+id/textView3" 28 android:id="@+id/textView3"
29 - fontPath="fonts/BTCosmo-Bold.ttf"
30 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
32 android:gravity="center" 31 android:gravity="center"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
26 26
27 <TextView 27 <TextView
28 android:id="@+id/textView3" 28 android:id="@+id/textView3"
29 - fontPath="fonts/BTCosmo-Bold.ttf"
30 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
32 android:gravity="center" 31 android:gravity="center"
...@@ -50,7 +49,7 @@ ...@@ -50,7 +49,7 @@
50 android:orientation="vertical"> 49 android:orientation="vertical">
51 50
52 <TextView 51 <TextView
53 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 52 + android:id="@+id/safe_driving_label"
54 android:layout_width="wrap_content" 53 android:layout_width="wrap_content"
55 android:layout_height="wrap_content" 54 android:layout_height="wrap_content"
56 android:layout_gravity="center_horizontal" 55 android:layout_gravity="center_horizontal"
...@@ -150,8 +149,8 @@ ...@@ -150,8 +149,8 @@
150 layout="@layout/telematics_metric_item_layout" 149 layout="@layout/telematics_metric_item_layout"
151 android:layout_width="0dp" 150 android:layout_width="0dp"
152 android:layout_height="100dp" 151 android:layout_height="100dp"
153 - android:layout_marginTop="8dp"
154 android:layout_marginHorizontal="8dp" 152 android:layout_marginHorizontal="8dp"
153 + android:layout_marginTop="8dp"
155 android:layout_marginBottom="16dp" 154 android:layout_marginBottom="16dp"
156 app:layout_constraintBottom_toBottomOf="parent" 155 app:layout_constraintBottom_toBottomOf="parent"
157 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_75_percent" 156 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_75_percent"
...@@ -160,7 +159,7 @@ ...@@ -160,7 +159,7 @@
160 </androidx.constraintlayout.widget.ConstraintLayout> 159 </androidx.constraintlayout.widget.ConstraintLayout>
161 160
162 <TextView 161 <TextView
163 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 162 + android:id="@+id/rating_label"
164 android:layout_width="wrap_content" 163 android:layout_width="wrap_content"
165 android:layout_height="wrap_content" 164 android:layout_height="wrap_content"
166 android:layout_gravity="center_horizontal" 165 android:layout_gravity="center_horizontal"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/BTCosmo-Bold.ttf" 26 + android:id="@+id/textView3"
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_info_title" 29 android:text="@string/cos_coupon_info_title"
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
62 62
63 <TextView 63 <TextView
64 android:id="@+id/textView13" 64 android:id="@+id/textView13"
65 - fontPath="fonts/BTCosmo-Bold.ttf"
66 android:layout_width="match_parent" 65 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
68 android:layout_marginTop="32dp" 67 android:layout_marginTop="32dp"
...@@ -74,7 +73,6 @@ ...@@ -74,7 +73,6 @@
74 73
75 <TextView 74 <TextView
76 android:id="@+id/textView14" 75 android:id="@+id/textView14"
77 - fontPath="fonts/PeridotPE-Regular.ttf"
78 android:layout_width="match_parent" 76 android:layout_width="match_parent"
79 android:layout_height="wrap_content" 77 android:layout_height="wrap_content"
80 android:layout_marginTop="16dp" 78 android:layout_marginTop="16dp"
...@@ -86,7 +84,6 @@ ...@@ -86,7 +84,6 @@
86 84
87 <TextView 85 <TextView
88 android:id="@+id/textView15" 86 android:id="@+id/textView15"
89 - fontPath="fonts/PeridotPE-Bold.ttf"
90 android:layout_width="wrap_content" 87 android:layout_width="wrap_content"
91 android:layout_height="wrap_content" 88 android:layout_height="wrap_content"
92 android:layout_gravity="center" 89 android:layout_gravity="center"
...@@ -97,14 +94,13 @@ ...@@ -97,14 +94,13 @@
97 94
98 <TextView 95 <TextView
99 android:id="@+id/textView16" 96 android:id="@+id/textView16"
100 - fontPath="fonts/PeridotPE-Bold.ttf"
101 android:layout_width="match_parent" 97 android:layout_width="match_parent"
102 android:layout_height="50dp" 98 android:layout_height="50dp"
103 android:layout_marginHorizontal="32dp" 99 android:layout_marginHorizontal="32dp"
104 android:layout_marginTop="12dp" 100 android:layout_marginTop="12dp"
105 - android:includeFontPadding="false"
106 android:background="@drawable/banner_border_light_grey" 101 android:background="@drawable/banner_border_light_grey"
107 android:gravity="center" 102 android:gravity="center"
103 + android:includeFontPadding="false"
108 android:textColor="@color/cos_light_black" 104 android:textColor="@color/cos_light_black"
109 android:textIsSelectable="true" 105 android:textIsSelectable="true"
110 android:textSize="25sp" 106 android:textSize="25sp"
...@@ -129,8 +125,8 @@ ...@@ -129,8 +125,8 @@
129 <View 125 <View
130 android:id="@+id/view5" 126 android:id="@+id/view5"
131 android:layout_width="match_parent" 127 android:layout_width="match_parent"
132 - android:layout_marginHorizontal="32dp"
133 android:layout_height="0.8dp" 128 android:layout_height="0.8dp"
129 + android:layout_marginHorizontal="32dp"
134 android:background="#E6E6E6" /> 130 android:background="#E6E6E6" />
135 131
136 <ImageView 132 <ImageView
...@@ -143,7 +139,6 @@ ...@@ -143,7 +139,6 @@
143 139
144 <TextView 140 <TextView
145 android:id="@+id/tv_full_barcode" 141 android:id="@+id/tv_full_barcode"
146 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
147 android:layout_width="wrap_content" 142 android:layout_width="wrap_content"
148 android:layout_height="wrap_content" 143 android:layout_height="wrap_content"
149 android:layout_marginTop="12dp" 144 android:layout_marginTop="12dp"
...@@ -155,8 +150,8 @@ ...@@ -155,8 +150,8 @@
155 <View 150 <View
156 android:id="@+id/view4" 151 android:id="@+id/view4"
157 android:layout_width="match_parent" 152 android:layout_width="match_parent"
158 - android:layout_marginHorizontal="32dp"
159 android:layout_height="0.8dp" 153 android:layout_height="0.8dp"
154 + android:layout_marginHorizontal="32dp"
160 android:layout_marginTop="20dp" 155 android:layout_marginTop="20dp"
161 android:background="#E6E6E6" /> 156 android:background="#E6E6E6" />
162 </LinearLayout> 157 </LinearLayout>
...@@ -164,7 +159,6 @@ ...@@ -164,7 +159,6 @@
164 159
165 <TextView 160 <TextView
166 android:id="@+id/textView17" 161 android:id="@+id/textView17"
167 - fontPath="fonts/PeridotPE-Regular.ttf"
168 android:layout_width="wrap_content" 162 android:layout_width="wrap_content"
169 android:layout_height="wrap_content" 163 android:layout_height="wrap_content"
170 android:layout_gravity="center" 164 android:layout_gravity="center"
...@@ -184,7 +178,6 @@ ...@@ -184,7 +178,6 @@
184 178
185 <TextView 179 <TextView
186 android:id="@+id/tv_market_expand" 180 android:id="@+id/tv_market_expand"
187 - fontPath="fonts/PeridotPE-Bold.ttf"
188 android:layout_width="wrap_content" 181 android:layout_width="wrap_content"
189 android:layout_height="wrap_content" 182 android:layout_height="wrap_content"
190 android:text="@string/cos_hide_market_coupons" 183 android:text="@string/cos_hide_market_coupons"
...@@ -212,9 +205,9 @@ ...@@ -212,9 +205,9 @@
212 android:id="@+id/rv_active_market_coupons" 205 android:id="@+id/rv_active_market_coupons"
213 android:layout_width="match_parent" 206 android:layout_width="match_parent"
214 android:layout_height="wrap_content" 207 android:layout_height="wrap_content"
215 - android:paddingVertical="8dp"
216 android:layout_marginHorizontal="2dp" 208 android:layout_marginHorizontal="2dp"
217 - android:overScrollMode="never" /> 209 + android:overScrollMode="never"
210 + android:paddingVertical="8dp" />
218 </LinearLayout> 211 </LinearLayout>
219 212
220 <LinearLayout 213 <LinearLayout
...@@ -230,7 +223,7 @@ ...@@ -230,7 +223,7 @@
230 android:paddingVertical="8dp"> 223 android:paddingVertical="8dp">
231 224
232 <TextView 225 <TextView
233 - fontPath="fonts/PeridotPE-SemiBold.ttf" 226 + android:id="@+id/shops_label"
234 android:layout_width="wrap_content" 227 android:layout_width="wrap_content"
235 android:layout_height="wrap_content" 228 android:layout_height="wrap_content"
236 android:gravity="center" 229 android:gravity="center"
...@@ -253,7 +246,7 @@ ...@@ -253,7 +246,7 @@
253 android:paddingVertical="8dp"> 246 android:paddingVertical="8dp">
254 247
255 <TextView 248 <TextView
256 - fontPath="fonts/PeridotPE-SemiBold.ttf" 249 + android:id="@+id/cancel_label"
257 android:layout_width="wrap_content" 250 android:layout_width="wrap_content"
258 android:layout_height="wrap_content" 251 android:layout_height="wrap_content"
259 android:gravity="center" 252 android:gravity="center"
...@@ -281,7 +274,6 @@ ...@@ -281,7 +274,6 @@
281 274
282 <TextView 275 <TextView
283 android:id="@+id/tv_terms" 276 android:id="@+id/tv_terms"
284 - fontPath="fonts/PeridotPE-Bold.ttf"
285 android:layout_width="wrap_content" 277 android:layout_width="wrap_content"
286 android:layout_height="wrap_content" 278 android:layout_height="wrap_content"
287 android:text="@string/cos_coupon_terms_title" 279 android:text="@string/cos_coupon_terms_title"
...@@ -299,7 +291,6 @@ ...@@ -299,7 +291,6 @@
299 291
300 <TextView 292 <TextView
301 android:id="@+id/tv_terms_value" 293 android:id="@+id/tv_terms_value"
302 - fontPath="fonts/PeridotPE-Regular.ttf"
303 android:layout_width="wrap_content" 294 android:layout_width="wrap_content"
304 android:layout_height="wrap_content" 295 android:layout_height="wrap_content"
305 android:layout_below="@+id/ll_terms_inner" 296 android:layout_below="@+id/ll_terms_inner"
...@@ -309,7 +300,7 @@ ...@@ -309,7 +300,7 @@
309 android:textColor="@color/cos_light_black" 300 android:textColor="@color/cos_light_black"
310 android:textSize="14sp" 301 android:textSize="14sp"
311 android:visibility="gone" 302 android:visibility="gone"
312 - tools:visibility="visible"/> 303 + tools:visibility="visible" />
313 </RelativeLayout> 304 </RelativeLayout>
314 </LinearLayout> 305 </LinearLayout>
315 </androidx.core.widget.NestedScrollView> 306 </androidx.core.widget.NestedScrollView>
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
18 18
19 <TextView 19 <TextView
20 android:id="@+id/tv_pin_title" 20 android:id="@+id/tv_pin_title"
21 - fontPath="fonts/pf_square_sans_pro_bold.ttf"
22 android:layout_width="wrap_content" 21 android:layout_width="wrap_content"
23 android:layout_height="wrap_content" 22 android:layout_height="wrap_content"
24 android:layout_alignParentStart="true" 23 android:layout_alignParentStart="true"
...@@ -56,7 +55,6 @@ ...@@ -56,7 +55,6 @@
56 55
57 <TextView 56 <TextView
58 android:id="@+id/tv_pin_name" 57 android:id="@+id/tv_pin_name"
59 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
60 android:layout_width="wrap_content" 58 android:layout_width="wrap_content"
61 android:layout_height="wrap_content" 59 android:layout_height="wrap_content"
62 android:textColor="@color/grey" 60 android:textColor="@color/grey"
...@@ -65,7 +63,6 @@ ...@@ -65,7 +63,6 @@
65 63
66 <TextView 64 <TextView
67 android:id="@+id/tv_pin_days" 65 android:id="@+id/tv_pin_days"
68 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
69 android:layout_width="wrap_content" 66 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 67 android:layout_height="wrap_content"
71 android:textColor="@color/cos_grey8" 68 android:textColor="@color/cos_grey8"
...@@ -95,7 +92,6 @@ ...@@ -95,7 +92,6 @@
95 92
96 <TextView 93 <TextView
97 android:id="@+id/tv_pin_tel" 94 android:id="@+id/tv_pin_tel"
98 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
99 android:layout_width="wrap_content" 95 android:layout_width="wrap_content"
100 android:layout_height="wrap_content" 96 android:layout_height="wrap_content"
101 android:layout_marginStart="12dp" 97 android:layout_marginStart="12dp"
...@@ -131,7 +127,6 @@ ...@@ -131,7 +127,6 @@
131 127
132 <TextView 128 <TextView
133 android:id="@+id/tv_pin_address" 129 android:id="@+id/tv_pin_address"
134 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
135 android:layout_width="184dp" 130 android:layout_width="184dp"
136 android:layout_height="wrap_content" 131 android:layout_height="wrap_content"
137 android:layout_marginStart="12dp" 132 android:layout_marginStart="12dp"
...@@ -159,7 +154,7 @@ ...@@ -159,7 +154,7 @@
159 android:src="@drawable/ic_pin_compass" /> 154 android:src="@drawable/ic_pin_compass" />
160 155
161 <TextView 156 <TextView
162 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 157 + android:id="@+id/tv_directions"
163 android:layout_width="wrap_content" 158 android:layout_width="wrap_content"
164 android:layout_height="wrap_content" 159 android:layout_height="wrap_content"
165 android:layout_marginStart="8dp" 160 android:layout_marginStart="8dp"
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
7 7
8 <TextView 8 <TextView
9 android:id="@+id/tv_code_copy" 9 android:id="@+id/tv_code_copy"
10 - fontPath="fonts/PeridotPE-Bold.ttf"
11 android:layout_width="wrap_content" 10 android:layout_width="wrap_content"
12 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
13 android:background="@android:color/transparent" 12 android:background="@android:color/transparent"
...@@ -17,7 +16,6 @@ ...@@ -17,7 +16,6 @@
17 16
18 <TextView 17 <TextView
19 android:id="@+id/tv_code_comma" 18 android:id="@+id/tv_code_comma"
20 - fontPath="fonts/PeridotPE-Bold.ttf"
21 android:layout_width="wrap_content" 19 android:layout_width="wrap_content"
22 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
23 android:background="@android:color/transparent" 21 android:background="@android:color/transparent"
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
16 16
17 <TextView 17 <TextView
18 android:id="@+id/tv_expired_tab" 18 android:id="@+id/tv_expired_tab"
19 - fontPath="fonts/PeridotPE-Bold.ttf"
20 android:layout_width="wrap_content" 19 android:layout_width="wrap_content"
21 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
22 android:text="@string/cos_redeemed_coupons_tab" 21 android:text="@string/cos_redeemed_coupons_tab"
...@@ -38,7 +37,6 @@ ...@@ -38,7 +37,6 @@
38 37
39 <TextView 38 <TextView
40 android:id="@+id/tv_shared_tab" 39 android:id="@+id/tv_shared_tab"
41 - fontPath="fonts/PeridotPE-SemiBold.ttf"
42 android:layout_width="wrap_content" 40 android:layout_width="wrap_content"
43 android:layout_height="wrap_content" 41 android:layout_height="wrap_content"
44 android:text="@string/cos_shared_gifts_tab" 42 android:text="@string/cos_shared_gifts_tab"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
26 26
27 <TextView 27 <TextView
28 android:id="@+id/tv_telematics_history_title" 28 android:id="@+id/tv_telematics_history_title"
29 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
30 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
32 android:text="TRIP ID" 31 android:text="TRIP ID"
...@@ -35,7 +34,6 @@ ...@@ -35,7 +34,6 @@
35 34
36 <TextView 35 <TextView
37 android:id="@+id/tv_telematics_history_value" 36 android:id="@+id/tv_telematics_history_value"
38 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
39 android:layout_width="wrap_content" 37 android:layout_width="wrap_content"
40 android:layout_height="wrap_content" 38 android:layout_height="wrap_content"
41 android:textColor="@color/grey" 39 android:textColor="@color/grey"
...@@ -45,7 +43,6 @@ ...@@ -45,7 +43,6 @@
45 43
46 <TextView 44 <TextView
47 android:id="@+id/tv_telematics_history_date_value" 45 android:id="@+id/tv_telematics_history_date_value"
48 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
49 android:layout_width="wrap_content" 46 android:layout_width="wrap_content"
50 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
51 android:layout_marginEnd="32dp" 48 android:layout_marginEnd="32dp"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
25 25
26 <TextView 26 <TextView
27 android:id="@+id/tv_telematics_metric_title_value" 27 android:id="@+id/tv_telematics_metric_title_value"
28 - fontPath="fonts/pf_square_sans_pro_bold.ttf"
29 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
31 android:textColor="@color/grey" 30 android:textColor="@color/grey"
...@@ -34,7 +33,6 @@ ...@@ -34,7 +33,6 @@
34 33
35 <TextView 34 <TextView
36 android:id="@+id/tv_telematics_metric_title" 35 android:id="@+id/tv_telematics_metric_title"
37 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
38 android:layout_width="wrap_content" 36 android:layout_width="wrap_content"
39 android:layout_height="wrap_content" 37 android:layout_height="wrap_content"
40 android:textColor="@color/grey" 38 android:textColor="@color/grey"
...@@ -44,7 +42,6 @@ ...@@ -44,7 +42,6 @@
44 42
45 <TextView 43 <TextView
46 android:id="@+id/tv_telematics_metric_subtitle" 44 android:id="@+id/tv_telematics_metric_subtitle"
47 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
48 android:layout_width="wrap_content" 45 android:layout_width="wrap_content"
49 android:layout_height="wrap_content" 46 android:layout_height="wrap_content"
50 android:layout_marginBottom="16dp" 47 android:layout_marginBottom="16dp"
......