removed rave app

Author: biodunalfet

raveandroid/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
     package="com.flutterwave.raveandroid">
 
     <application
-        android:name=".RaveApp"
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">

raveandroid/src/main/java/com/flutterwave/raveandroid/RaveApp.java

@@ -55,12 +55,12 @@ public class RavePayActivity extends AppCompatActivity {
     public static int RESULT_ERROR = 222;
     public static int RESULT_CANCELLED = 333;
 
+    public AppComponent getAppComponent() {
+        return appComponent;
+    }
+
     AppComponent appComponent;
-    static AppComponent appComponent2;
 
-    public static void setGraph(AppComponent appComponent) {
-        appComponent2 = appComponent;
-    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -178,7 +178,6 @@ private void buildGraph() {
                 .networkModule(new NetworkModule(baseUrl))
                 .build();
 
-        ((RaveApp) getApplication()).setAppComponent(appComponent);
 
     }
 

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

@@ -27,7 +27,6 @@
 import com.flutterwave.raveandroid.OTPFragment;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.R;
-import com.flutterwave.raveandroid.RaveApp;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
@@ -106,7 +105,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     private void injectComponents() {
 
         if (getActivity() != null) {
-            ((RaveApp) getActivity().getApplication()).getAppComponent()
+            ((RavePayActivity) getActivity()).getAppComponent()
                     .plus(new AccountModule(this))
                     .inject(this);
         }

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java

@@ -17,7 +17,6 @@
 import android.widget.Toast;
 
 import com.flutterwave.raveandroid.R;
-import com.flutterwave.raveandroid.RaveApp;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.VerificationActivity;
@@ -67,7 +66,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     private void injectComponents() {
 
         if (getActivity() != null) {
-            ((RaveApp) getActivity().getApplication()).getAppComponent()
+            ((RavePayActivity) getActivity()).getAppComponent()
                     .plus(new AchModule(this))
                     .inject(this);
         }

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java

@@ -21,7 +21,6 @@
 
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.R;
-import com.flutterwave.raveandroid.RaveApp;
 import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
@@ -90,7 +89,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     private void injectComponents() {
 
         if (getActivity() != null) {
-            ((RaveApp) getActivity().getApplication()).getAppComponent()
+            ((RavePayActivity) getActivity()).getAppComponent()
                     .plus(new BankTransferModule(this))
                     .inject(this);
         }

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

@@ -29,7 +29,6 @@
 import com.flutterwave.raveandroid.PayloadBuilder;
 import com.flutterwave.raveandroid.PinFragment;
 import com.flutterwave.raveandroid.R;
-import com.flutterwave.raveandroid.RaveApp;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
@@ -120,7 +119,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     private void injectComponents() {
 
         if (getActivity() != null) {
-            ((RaveApp) getActivity().getApplication()).getAppComponent()
+            ((RavePayActivity) getActivity()).getAppComponent()
                     .plus(new CardModule(this))
                     .inject(this);
         }

raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java

@@ -1,6 +1,5 @@
 package com.flutterwave.raveandroid.di.components;
 
-import com.flutterwave.raveandroid.RaveApp;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.data.NetworkRequestImpl;
 import com.flutterwave.raveandroid.di.modules.AccountModule;
@@ -25,8 +24,6 @@ public interface AppComponent {
 
     NetworkRequestImpl networkImpl();
 
-    void inject(RaveApp raveApp);
-
     void inject(RavePayActivity ravePayActivity);
 
     MpesaComponent plus(MpesaModule mpesaModule);

raveandroid/src/main/java/com/flutterwave/raveandroid/di/components/AppComponent.java

@@ -1,6 +1,5 @@
 package com.flutterwave.raveandroid.di.modules;
 
-import com.flutterwave.raveandroid.RaveApp;
 import com.flutterwave.raveandroid.data.ApiService;
 import com.google.gson.Gson;
 
@@ -22,8 +21,7 @@ public class NetworkModule {
 
     @Inject
     String baseUrl;
-    @Inject
-    RaveApp raveApp;
+
     private Retrofit retrofit;
     private ApiService apiService;
 

raveandroid/src/main/java/com/flutterwave/raveandroid/di/modules/NetworkModule.java

@@ -23,7 +23,6 @@
 
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.R;
-import com.flutterwave.raveandroid.RaveApp;
 import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayActivity;
 import com.flutterwave.raveandroid.RavePayInitializer;
@@ -85,7 +84,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     private void injectComponents() {
 
         if (getActivity() != null) {
-            ((RaveApp) getActivity().getApplication()).getAppComponent()
+            ((RavePayActivity) getActivity()).getAppComponent()
                     .plus(new GhanaModule(this))
                     .inject(this);
         }