Merge pull request #65 from MihaiCristianCondrea/codex/refactor-supportviewmodel-callbacks-and-methods

Refactor support view model callbacks

Author: MihaiCristianCondrea

app/src/main/java/com/d4rk/androidtutorials/java/data/model/AdLoadParams.java

@@ -11,7 +11,6 @@
 import com.android.billingclient.api.PendingPurchasesParams;
 import com.android.billingclient.api.ProductDetails;
 import com.android.billingclient.api.QueryProductDetailsParams;
-import com.d4rk.androidtutorials.java.data.model.AdLoadParams;
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository.BillingFlowLauncher;
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository.OnProductDetailsListener;
 import com.google.android.gms.ads.AdRequest;
@@ -121,44 +120,40 @@ public void queryProductDetails(List<String> productIds, OnProductDetailsListene
     /**
      * Launch the billing flow for a particular product.
      */
-    public void initiatePurchase(String productId, BillingFlowLauncher launcher) {
+    public BillingFlowLauncher initiatePurchase(String productId) {
         ProductDetails details = productDetailsMap.get(productId);
-        if (details != null && billingClient != null && launcher != null) {
-            // Note: In a real app, you would select a specific offer. For simplicity,
-            // we're assuming there's only one or we're using the base plan.
-            // For subscriptions, this would be ProductDetails.getSubscriptionOfferDetails()
+        if (details != null && billingClient != null) {
             String offerToken = "";
             if (details.getOneTimePurchaseOfferDetails() != null) {
                 offerToken = details.getOneTimePurchaseOfferDetails().getOfferToken();
             }
 
-            assert offerToken != null;
+            String finalOfferToken = offerToken;
             List<BillingFlowParams.ProductDetailsParams> productDetailsParamsList =
                     Collections.singletonList(
                             BillingFlowParams.ProductDetailsParams.newBuilder()
                                     .setProductDetails(details)
-                                    .setOfferToken(offerToken)
+                                    .setOfferToken(finalOfferToken)
                                     .build()
                     );
 
             BillingFlowParams flowParams = BillingFlowParams.newBuilder()
                     .setProductDetailsParamsList(productDetailsParamsList)
                     .build();
 
-            launcher.launch(billingClient, flowParams);
+            return activity -> billingClient.launchBillingFlow(activity, flowParams);
         }
+        return null;
     }
 
 
     /**
      * Initialize Mobile Ads (usually done once in your app, but
      * can be done here if needed for the support screen).
      */
-    public void initMobileAds(AdLoadParams params) {
+    public AdRequest initMobileAds() {
         MobileAds.initialize(context);
-        if (params != null && params.getAdLoader() != null) {
-            params.getAdLoader().load(new AdRequest.Builder().build());
-        }
+        return new AdRequest.Builder().build();
     }
 
 }

app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultSupportRepository.java

@@ -1,22 +1,21 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
-import com.android.billingclient.api.BillingClient;
-import com.android.billingclient.api.BillingFlowParams;
+import android.app.Activity;
+import com.google.android.gms.ads.AdRequest;
 import com.android.billingclient.api.ProductDetails;
-import com.d4rk.androidtutorials.java.data.model.AdLoadParams;
 import java.util.List;
 
 public interface SupportRepository {
     void initBillingClient(Runnable onConnected);
     void queryProductDetails(List<String> productIds, OnProductDetailsListener listener);
-    void initiatePurchase(String productId, BillingFlowLauncher launcher);
-    void initMobileAds(AdLoadParams params);
+    BillingFlowLauncher initiatePurchase(String productId);
+    AdRequest initMobileAds();
 
     interface OnProductDetailsListener {
         void onProductDetailsRetrieved(List<ProductDetails> productDetailsList);
     }
 
     interface BillingFlowLauncher {
-        void launch(BillingClient billingClient, BillingFlowParams params);
+        void launch(Activity activity);
     }
 }

app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java

@@ -1,7 +1,7 @@
 package com.d4rk.androidtutorials.java.domain.support;
 
-import com.d4rk.androidtutorials.java.data.model.AdLoadParams;
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
+import com.google.android.gms.ads.AdRequest;
 
 /** Initializes Google Mobile Ads. */
 public class InitMobileAdsUseCase {
@@ -11,7 +11,7 @@ public InitMobileAdsUseCase(SupportRepository repository) {
         this.repository = repository;
     }
 
-    public void invoke(AdLoadParams params) {
-        repository.initMobileAds(params);
+    public AdRequest invoke() {
+        return repository.initMobileAds();
     }
 }

app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitMobileAdsUseCase.java

@@ -10,7 +10,7 @@ public InitiatePurchaseUseCase(SupportRepository repository) {
         this.repository = repository;
     }
 
-    public void invoke(String productId, SupportRepository.BillingFlowLauncher launcher) {
-        repository.initiatePurchase(productId, launcher);
+    public SupportRepository.BillingFlowLauncher invoke(String productId) {
+        return repository.initiatePurchase(productId);
     }
 }

app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitiatePurchaseUseCase.java

@@ -11,9 +11,10 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import com.android.billingclient.api.ProductDetails;
-import com.d4rk.androidtutorials.java.data.model.AdLoadParams;
+import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 import com.d4rk.androidtutorials.java.databinding.ActivitySupportBinding;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
+import com.google.android.gms.ads.AdRequest;
 
 import java.util.List;
 
@@ -42,7 +43,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         supportViewModel = new ViewModelProvider(this).get(SupportViewModel.class);
 
-        supportViewModel.initMobileAds(new AdLoadParams(adRequest -> binding.largeBannerAd.loadAd(adRequest)));
+        AdRequest adRequest = supportViewModel.initMobileAds();
+        binding.largeBannerAd.loadAd(adRequest);
 
         binding.buttonWebAd.setOnClickListener(v ->
                 startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://bit.ly/3p8bpjj"))));
@@ -73,8 +75,10 @@ private void queryProductDetails() {
     }
 
     private void initiatePurchase(String productId) {
-        supportViewModel.initiatePurchase(productId,
-                (billingClient, params) -> billingClient.launchBillingFlow(this, params));
+        SupportRepository.BillingFlowLauncher launcher = supportViewModel.initiatePurchase(productId);
+        if (launcher != null) {
+            launcher.launch(this);
+        }
     }
 
     @Override

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportActivity.java

@@ -2,12 +2,12 @@
 
 import androidx.lifecycle.ViewModel;
 
-import com.d4rk.androidtutorials.java.data.model.AdLoadParams;
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 import com.d4rk.androidtutorials.java.domain.support.InitBillingClientUseCase;
 import com.d4rk.androidtutorials.java.domain.support.QueryProductDetailsUseCase;
 import com.d4rk.androidtutorials.java.domain.support.InitiatePurchaseUseCase;
 import com.d4rk.androidtutorials.java.domain.support.InitMobileAdsUseCase;
+import com.google.android.gms.ads.AdRequest;
 
 import dagger.hilt.android.lifecycle.HiltViewModel;
 import javax.inject.Inject;
@@ -42,11 +42,11 @@ public void queryProductDetails(List<String> productIds,
         queryProductDetailsUseCase.invoke(productIds, listener);
     }
 
-    public void initiatePurchase(String productId, SupportRepository.BillingFlowLauncher launcher) {
-        initiatePurchaseUseCase.invoke(productId, launcher);
+    public SupportRepository.BillingFlowLauncher initiatePurchase(String productId) {
+        return initiatePurchaseUseCase.invoke(productId);
     }
 
-    public void initMobileAds(AdLoadParams params) {
-        initMobileAdsUseCase.invoke(params);
+    public AdRequest initMobileAds() {
+        return initMobileAdsUseCase.invoke();
     }
 }