Skip to content

Commit 4a57cd6

Browse files
feat: Add support for the fontFilePathMap
1 parent 2487f70 commit 4a57cd6

6 files changed

Lines changed: 47 additions & 0 deletions

File tree

android-core/proguard.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@
206206
-keep class com.mparticle.rokt.CacheConfig { *; }
207207
-keep class com.mparticle.rokt.RoktEmbeddedView { *; }
208208
-keep class com.mparticle.rokt.RoktLayoutDimensionCallBack { *; }
209+
-keep class com.mparticle.rokt.RoktOptions { *; }
209210

210211
# Preserve annotation classes
211212
-keep class androidx.annotation.NonNull { *; }

android-core/src/main/java/com/mparticle/MParticleOptions.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.mparticle.internal.SideloadedKit;
1616
import com.mparticle.networking.NetworkOptions;
1717
import com.mparticle.networking.NetworkOptionsManager;
18+
import com.mparticle.rokt.RoktOptions;
1819

1920
import org.json.JSONException;
2021
import org.json.JSONObject;
@@ -51,6 +52,7 @@ public class MParticleOptions {
5152
private NetworkOptions mNetworkOptions;
5253
private String mDataplanId;
5354
private Integer mDataplanVersion;
55+
private RoktOptions mRoktOptions;
5456
private MParticle.OperatingSystem mOperatingSystem = MParticle.OperatingSystem.ANDROID;
5557
private DataplanOptions mDataplanOptions;
5658
private Map<Class, List<Configuration>> mConfigurations = new HashMap();
@@ -143,6 +145,7 @@ public MParticleOptions(@NonNull Builder builder) {
143145
this.mOperatingSystem = builder.operatingSystem;
144146
}
145147
this.mNetworkOptions = NetworkOptionsManager.validateAndResolve(builder.networkOptions);
148+
this.mRoktOptions = builder.roktOptions;
146149
this.mDataplanId = builder.dataplanId;
147150
this.mDataplanVersion = builder.dataplanVersion;
148151
this.mDataplanOptions = builder.dataplanOptions;
@@ -335,6 +338,11 @@ public NetworkOptions getNetworkOptions() {
335338
return mNetworkOptions;
336339
}
337340

341+
@NonNull
342+
public RoktOptions getRoktOptions() {
343+
return mRoktOptions;
344+
}
345+
338346
@Nullable
339347
public String getDataplanId() {
340348
return mDataplanId;
@@ -409,6 +417,7 @@ public static class Builder {
409417
private Integer dataplanVersion;
410418
private MParticle.OperatingSystem operatingSystem;
411419
private DataplanOptions dataplanOptions;
420+
private RoktOptions roktOptions;
412421
private Map<Class, List<Configuration>> configurations = new HashMap();
413422
private boolean isAppDebuggable;
414423
private List<SideloadedKit> sideloadedKits = new ArrayList<>();
@@ -751,6 +760,12 @@ public Builder dataplanOptions(DataplanOptions dataplanOptions) {
751760
return this;
752761
}
753762

763+
@NonNull
764+
public Builder roktOptions(@NonNull RoktOptions roktOptions) {
765+
this.roktOptions = roktOptions;
766+
return this;
767+
}
768+
754769
/**
755770
* Register a {@link com.mparticle.Configuration}n. Various implementations of Configuration can modify the behavior of
756771
* the SDK at runtime.

android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.mparticle.internal.listeners.InternalListenerManager;
2929
import com.mparticle.rokt.RoktConfig;
3030
import com.mparticle.rokt.RoktEmbeddedView;
31+
import com.mparticle.rokt.RoktOptions;
3132

3233
import org.json.JSONArray;
3334

@@ -515,6 +516,15 @@ public void updateDataplan(@Nullable MParticleOptions.DataplanOptions dataplanOp
515516
}
516517

517518
@NonNull
519+
@Override
520+
@NonNull
521+
public RoktOptions getRoktOptions() {
522+
if (mKitManager != null) {
523+
return mKitManager.getRoktOptions();
524+
}
525+
return mOptions != null ? mOptions.getRoktOptions() : new RoktOptions();
526+
}
527+
518528
@Override
519529
public Map<Integer, KitStatus> getKitStatus() {
520530
if (mKitManager != null) {

android-core/src/main/java/com/mparticle/internal/KitManager.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.mparticle.identity.MParticleUser;
2525
import com.mparticle.rokt.RoktConfig;
2626
import com.mparticle.rokt.RoktEmbeddedView;
27+
import com.mparticle.rokt.RoktOptions;
2728

2829
import org.json.JSONArray;
2930

@@ -90,6 +91,9 @@ public interface KitManager {
9091

9192
void updateDataplan(@NonNull MParticleOptions.DataplanOptions dataplanOptions);
9293

94+
@NonNull
95+
RoktOptions getRoktOptions();
96+
9397
@NonNull
9498
Map<Integer, KitStatus> getKitStatus();
9599

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.mparticle.rokt
2+
3+
class RoktOptions @JvmOverloads constructor(
4+
val fontFilePathMap: Map<String, String> = emptyMap(),
5+
val fontPostScriptNames: Set<String> = emptySet()
6+
)

android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import com.mparticle.kits.mappings.CustomMapping;
5151
import com.mparticle.rokt.RoktConfig;
5252
import com.mparticle.rokt.RoktEmbeddedView;
53+
import com.mparticle.rokt.RoktOptions;
5354

5455
import org.json.JSONArray;
5556
import org.json.JSONException;
@@ -86,6 +87,7 @@ public class KitManagerImpl implements KitManager, AttributionListener, UserAttr
8687
KitIntegrationFactory mKitIntegrationFactory;
8788
private DataplanFilter mDataplanFilter = DataplanFilterImpl.EMPTY;
8889
private KitOptions mKitOptions;
90+
private RoktOptions mRoktOptions;
8991
private volatile List<KitConfiguration> kitConfigurations = new ArrayList<>();
9092

9193
private static final String RESERVED_KEY_LTV = "$Amount";
@@ -104,6 +106,9 @@ public KitManagerImpl(Context context, ReportingManager reportingManager, CoreCa
104106
mReportingManager = reportingManager;
105107
mCoreCallbacks = coreCallbacks;
106108
mKitIntegrationFactory = new KitIntegrationFactory(options);
109+
if (options != null) {
110+
mRoktOptions = options.getRoktOptions();
111+
}
107112
MParticle instance = MParticle.getInstance();
108113
if (instance != null) {
109114
instance.Identity().addIdentityStateListener(this);
@@ -204,6 +209,12 @@ public void updateDataplan(@Nullable MParticleOptions.DataplanOptions dataplanOp
204209
}
205210
}
206211

212+
@Override
213+
@NonNull
214+
public RoktOptions getRoktOptions() {
215+
return mRoktOptions != null ? mRoktOptions : new RoktOptions();
216+
}
217+
207218
/**
208219
* Update the current list of active kits based on server (or cached) configuration.
209220
* <p>

0 commit comments

Comments
 (0)