announcement inbox close when action button is tapped

Author: imac

app/build.gradle

@@ -37,7 +37,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 34
         versionCode 65
-        versionName "2024.07.13"
+        versionName "2024.07.14"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/oneflow/analytics/adapter/OFAnnouncementListAdapter.java

@@ -26,6 +26,7 @@
 import com.oneflow.analytics.controller.OFEventController;
 import com.oneflow.analytics.customwidgets.OFCustomTextView;
 import com.oneflow.analytics.customwidgets.OFCustomTextViewBold;
+import com.oneflow.analytics.fragment.OFAnnouncementFragment;
 import com.oneflow.analytics.model.announcement.OFAnnouncementIndex;
 import com.oneflow.analytics.model.announcement.OFAnnouncementTheme;
 import com.oneflow.analytics.model.announcement.OFGetAnnouncementDetailResponse;
@@ -41,6 +42,7 @@ public class OFAnnouncementListAdapter extends RecyclerView.Adapter<OFAnnounceme
     private View.OnClickListener gch;
     private Context mContext;
     private OFOneFlowSHP shp;
+    private OFAnnouncementFragment ofAnnouncementFragment;
 
     @Override
     public void onBindViewHolder(MyViewHolder holder, final int position) {
@@ -100,6 +102,9 @@ public void onClick(View view) {
                         Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(action));
                         browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         mContext.getApplicationContext().startActivity(browserIntent);
+                        if(ofAnnouncementFragment != null){
+                            ofAnnouncementFragment.finishActivity();
+                        }
                     }
                 }
             });
@@ -126,6 +131,9 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
                     Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(action));
                     browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     mContext.getApplicationContext().startActivity(browserIntent);
+                    if(ofAnnouncementFragment != null){
+                        ofAnnouncementFragment.finishActivity();
+                    }
                 }
                 return true;
             }
@@ -257,6 +265,10 @@ public OFAnnouncementListAdapter(Context context, ArrayList<OFGetAnnouncementDet
         shp = OFOneFlowSHP.getInstance(mContext);
     }
 
+    public void setFragment(OFAnnouncementFragment ofAnnouncementFragment){
+        this.ofAnnouncementFragment = ofAnnouncementFragment;
+    }
+
     public void notifyMyList(ArrayList<OFGetAnnouncementDetailResponse> arrayList) {
         this.itemsList = arrayList;
         this.notifyDataSetChanged();

app/src/main/java/com/oneflow/analytics/fragment/OFAnnouncementFragment.java

@@ -1,5 +1,6 @@
 package com.oneflow.analytics.fragment;
 
+import android.content.Context;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -15,6 +16,8 @@
 import android.widget.TableRow;
 
 import com.google.gson.Gson;
+import com.oneflow.analytics.OFAnnouncementActivityFullScreen;
+import com.oneflow.analytics.OFAnnouncementActivityModel;
 import com.oneflow.analytics.R;
 import com.oneflow.analytics.adapter.OFAnnouncementListAdapter;
 import com.oneflow.analytics.adapter.OFSurveyOptionsAdapter;
@@ -40,6 +43,8 @@ public class OFAnnouncementFragment extends Fragment implements OFMyResponseHand
 
     OFCustomTextViewBold tvEmpty;
 
+    Context mContext;
+
     ArrayList<String> idArray;
 
     public static OFAnnouncementFragment newInstance(ArrayList<String> idArray, OFSDKSettingsTheme sdkTheme, String themeColor) {
@@ -64,6 +69,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_announcement, container, false);
 
+        mContext = getActivity();
+
         announcementRecyclerView = (RecyclerView) view.findViewById(R.id.announcement_list);
         progressBar = (ProgressBar) view.findViewById(R.id.progress_circular);
         tvEmpty = view.findViewById(R.id.tvEmpty);
@@ -88,6 +95,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         return view;
     }
 
+    public void finishActivity(){
+        if(mContext instanceof OFAnnouncementActivityFullScreen){
+            ((OFAnnouncementActivityFullScreen) mContext).finish();
+        }
+    }
+
     @Override
     public void onResponseReceived(OFConstants.ApiHitType hitType, Object obj, Long reserve, String reserved, Object obj2, Object obj3) {
         switch (hitType) {
@@ -114,6 +127,7 @@ public void onResponseReceived(OFConstants.ApiHitType hitType, Object obj, Long
 
                             LinearLayoutManager mLayoutManager = new LinearLayoutManager(getActivity());
                             announcementListAdapter = new OFAnnouncementListAdapter(getActivity(),getAnnouncementDetailResponses);
+                            announcementListAdapter.setFragment(this);
 
                             announcementRecyclerView.setLayoutManager(mLayoutManager);
                             announcementRecyclerView.setItemAnimator(new DefaultItemAnimator());

app/src/main/java/com/oneflow/analytics/utils/OFConstants.java

@@ -20,8 +20,8 @@
 
 public interface OFConstants {
 
-    String currentVersion = "2024.07.13";//2023.07.14;
-    String MODE = "prod";//"dev";//"beta";//
+    String currentVersion = "2024.07.14";//2023.07.14;
+    String MODE = "dev";//"prod";//"beta";//
 
     String PLATFORM = "Android";
     String CACHE_FILE_NAME = "logic-engine.js";