Skip to content

Commit 9c65636

Browse files
committed
re-arranged setting of theme before setContentView() within activity for it to properly work
1 parent 071d097 commit 9c65636

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ public class RavePayActivity extends AppCompatActivity {
109109
@Override
110110
protected void onCreate(Bundle savedInstanceState) {
111111
super.onCreate(savedInstanceState);
112-
setContentView(R.layout.rave_sdk_activity_rave_pay);
113-
root = findViewById(R.id.rave_pay_activity_rootview);
114112

115113
try {
116114
ravePayInitializer = Parcels.unwrap(getIntent().getParcelableExtra(RAVE_PARAMS));
@@ -120,10 +118,6 @@ protected void onCreate(Bundle savedInstanceState) {
120118
}
121119
buildGraph();
122120

123-
Event event = new ScreenLaunchEvent("Payment Activity").getEvent();
124-
event.setPublicKey(ravePayInitializer.getPublicKey());
125-
eventLogger.logEvent(event);
126-
127121
theme = ravePayInitializer.getTheme();
128122

129123
if (theme != 0) {
@@ -134,6 +128,13 @@ protected void onCreate(Bundle savedInstanceState) {
134128
}
135129
}
136130

131+
setContentView(R.layout.rave_sdk_activity_rave_pay);
132+
133+
root = findViewById(R.id.rave_pay_activity_rootview);
134+
135+
Event event = new ScreenLaunchEvent("Payment Activity").getEvent();
136+
event.setPublicKey(ravePayInitializer.getPublicKey());
137+
eventLogger.logEvent(event);
137138

138139
setupMainContent();
139140

rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ public class SavedCardsActivity extends AppCompatActivity {
1414
@Override
1515
protected void onCreate(Bundle savedInstanceState) {
1616
super.onCreate(savedInstanceState);
17-
setContentView(R.layout.rave_sdk_activity_futher_verification);
1817
if (getIntent() != null & getIntent().getIntExtra("theme", 0) != 0) {
1918
setTheme(getIntent().getIntExtra("theme", 0));
2019
}
20+
setContentView(R.layout.rave_sdk_activity_futher_verification);
2121

2222
if (findViewById(R.id.frame_container) != null) {
2323
if (savedInstanceState != null) {

rave_android/src/main/java/com/flutterwave/raveandroid/verification/VerificationActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public class VerificationActivity extends AppCompatActivity {
3737
@Override
3838
protected void onCreate(Bundle savedInstanceState) {
3939
super.onCreate(savedInstanceState);
40-
setContentView(R.layout.rave_sdk_activity_futher_verification);
41-
buildGraph();
4240
if (getIntent() != null & getIntent().getIntExtra("theme", 0) != 0) {
4341
setTheme(getIntent().getIntExtra("theme", 0));
4442
}
43+
setContentView(R.layout.rave_sdk_activity_futher_verification);
44+
buildGraph();
4545
if (findViewById(R.id.frame_container) != null) {
4646
if (savedInstanceState != null) {
4747
return;

0 commit comments

Comments
 (0)