NTV-406: Remove old ProjectActivity and clean feature flag (#1543)

app/src/main/AndroidManifest.xml

@@ -39,7 +39,7 @@
             android:theme="@style/ActivityFeedActivity" />
         <activity
             android:name=".ui.activities.CampaignDetailsActivity"
-            android:parentActivityName=".ui.activities.ProjectActivity" />
+            android:parentActivityName=".ui.activities.ProjectPageActivity" />
         <activity
             android:name=".ui.activities.ChangeEmailActivity"
             android:theme="@style/SettingsActivity" />
@@ -185,6 +185,7 @@
             android:exported="true"
             android:configChanges="screenSize|orientation"
             android:windowSoftInputMode="adjustResize"
+            android:launchMode="singleInstance"
             tools:ignore="LockedOrientationActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -202,30 +203,12 @@
             android:name=".ui.activities.ProjectNotificationSettingsActivity"
             android:parentActivityName=".ui.activities.SettingsActivity"
             android:theme="@style/SettingsActivity" />
-        <activity
-            android:name=".ui.activities.ProjectActivity"
-            android:parentActivityName=".ui.activities.DiscoveryActivity"
-            android:theme="@style/ProjectActivity"
-            android:exported="true"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="*.kickstarter.com"
-                    android:pathPrefix="/projects/"
-                    android:scheme="ksr" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".ui.activities.ProjectSocialActivity"
-            android:parentActivityName=".ui.activities.ProjectActivity" />
+            android:parentActivityName=".ui.activities.ProjectPageActivity" />
         <activity
             android:name=".ui.activities.ProjectUpdatesActivity"
-            android:parentActivityName=".ui.activities.ProjectActivity" />
+            android:parentActivityName=".ui.activities.ProjectPageActivity" />
         <activity
             android:name=".ui.activities.SearchActivity"
             android:parentActivityName=".ui.activities.DiscoveryActivity"
@@ -255,12 +238,12 @@
         <activity
             android:name=".ui.activities.VideoActivity"
             android:configChanges="keyboardHidden|screenSize"
-            android:parentActivityName=".ui.activities.ProjectActivity"
+            android:parentActivityName=".ui.activities.ProjectPageActivity"
             android:screenOrientation="sensorLandscape"
             android:theme="@style/VideoPlayerActivity" />
         <activity
             android:name=".ui.activities.BackingActivity"
-            android:parentActivityName=".ui.activities.ProjectActivity"
+            android:parentActivityName=".ui.activities.ProjectPageActivity"
             android:theme="@style/BackingActivity" />
         <activity
             android:name="com.facebook.FacebookActivity"

app/src/main/java/com/kickstarter/libs/PushNotifications.java

@@ -19,7 +19,6 @@
 import androidx.core.content.ContextCompat;
 
 import com.kickstarter.R;
-import com.kickstarter.libs.models.OptimizelyFeature;
 import com.kickstarter.libs.qualifiers.ApplicationContext;
 import com.kickstarter.libs.transformations.CircleTransformation;
 import com.kickstarter.libs.transformations.CropSquareTransformation;
@@ -36,7 +35,6 @@
 import com.kickstarter.ui.IntentKey;
 import com.kickstarter.ui.activities.ActivityFeedActivity;
 import com.kickstarter.ui.activities.MessagesActivity;
-import com.kickstarter.ui.activities.ProjectActivity;
 import com.kickstarter.ui.activities.ProjectPageActivity;
 import com.kickstarter.ui.activities.SurveyResponseActivity;
 import com.kickstarter.ui.activities.UpdateActivity;
@@ -382,7 +380,7 @@ private void displayNotificationFromUpdateActivity(final @NonNull PushNotificati
   private @NonNull PendingIntent projectUpdateContentIntent(final @NonNull PushNotificationEnvelope envelope,
     final @NonNull Update update, final @NonNull String projectParam) {
 
-    final Intent projectIntent = IntentExtKt.getProjectIntent(new Intent(), this.context, this.experimentsClientType.isFeatureEnabled(OptimizelyFeature.Key.PROJECT_PAGE_V2))
+    final Intent projectIntent = IntentExtKt.getProjectIntent(new Intent(), this.context)
       .putExtra(IntentKey.PROJECT_PARAM, projectParam)
       .putExtra(IntentKey.REF_TAG, RefTag.push());
 
@@ -494,7 +492,7 @@ private void displayNotificationFromUpdateActivity(final @NonNull PushNotificati
   }
 
   private @NonNull Intent projectIntent(final @NonNull PushNotificationEnvelope envelope, final @NonNull String projectParam) {
-    final Intent intent = new Intent(this.context, this.experimentsClientType.isFeatureEnabled(OptimizelyFeature.Key.PROJECT_PAGE_V2) ? ProjectPageActivity.class : ProjectActivity.class);
+    final Intent intent = new Intent(this.context, ProjectPageActivity.class);
     return intent
       .putExtra(IntentKey.PROJECT_PARAM, projectParam)
       .putExtra(IntentKey.PUSH_NOTIFICATION_ENVELOPE, envelope)

app/src/main/java/com/kickstarter/libs/models/OptimizelyFeature.kt

@@ -3,7 +3,6 @@ package com.kickstarter.libs.models
 class OptimizelyFeature {
     enum class Key(val key: String) {
         LIGHTS_ON("android_lights_on"),
-        PROJECT_PAGE_V2("android_project_page_v2"),
         ANDROID_STORY_TAB("android_story_tab")
     }
 }

app/src/main/java/com/kickstarter/libs/utils/extensions/IntentExt.kt

@@ -9,15 +9,14 @@ import com.kickstarter.ui.activities.CampaignDetailsActivity
 import com.kickstarter.ui.activities.CommentsActivity
 import com.kickstarter.ui.activities.CreatorBioActivity
 import com.kickstarter.ui.activities.CreatorDashboardActivity
-import com.kickstarter.ui.activities.ProjectActivity
 import com.kickstarter.ui.activities.ProjectPageActivity
 import com.kickstarter.ui.activities.ProjectUpdatesActivity
 import com.kickstarter.ui.activities.UpdateActivity
 import com.kickstarter.ui.activities.VideoActivity
 import com.kickstarter.ui.data.ProjectData
 
-fun Intent.getProjectIntent(context: Context, isFfEnabled: Boolean): Intent {
-    return this.setClass(context, if (isFfEnabled) ProjectPageActivity::class.java else ProjectActivity::class.java)
+fun Intent.getProjectIntent(context: Context): Intent {
+    return this.setClass(context, ProjectPageActivity::class.java)
 }
 
 /**

app/src/main/java/com/kickstarter/models/Project.kt

@@ -101,8 +101,8 @@ class Project private constructor(
     fun stateChangedAt() = this.stateChangedAt
     fun staticUsdRate() = this.staticUsdRate
     fun usdExchangeRate() = this.usdExchangeRate
-    fun unreadMessagesCount() = this.unreadMessagesCount
-    fun unseenActivityCount() = this.unseenActivityCount
+    fun unreadMessagesCount() = this.unreadMessagesCount ?: 0
+    fun unseenActivityCount() = this.unseenActivityCount ?: 0
     fun updatesCount() = this.updatesCount
     fun updatedAt() = this.updatedAt
     fun urls() = this.urls

app/src/main/java/com/kickstarter/ui/activities/ActivityFeedActivity.kt

@@ -89,12 +89,12 @@ class ActivityFeedActivity : BaseActivity<ActivityFeedViewModel.ViewModel>() {
         viewModel.outputs.goToProject()
             .compose(bindToLifecycle())
             .compose(Transformers.observeForUI())
-            .subscribe { startProjectActivity(it.first, it.second) }
+            .subscribe { startProjectActivity(it) }
 
         viewModel.outputs.startFixPledge()
             .compose(bindToLifecycle())
             .compose(Transformers.observeForUI())
-            .subscribe { startFixPledge(it.first, it.second) }
+            .subscribe { startFixPledge(it) }
 
         viewModel.outputs.startUpdateActivity()
             .compose(bindToLifecycle())
@@ -150,16 +150,16 @@ class ActivityFeedActivity : BaseActivity<ActivityFeedViewModel.ViewModel>() {
         startActivityForResult(intent, ActivityRequestCodes.LOGIN_FLOW)
     }
 
-    private fun startFixPledge(projectSlug: String, isProjectPageEnabled: Boolean) {
-        val intent = Intent().getProjectIntent(this, isProjectPageEnabled)
+    private fun startFixPledge(projectSlug: String) {
+        val intent = Intent().getProjectIntent(this)
             .putExtra(IntentKey.PROJECT_PARAM, projectSlug)
             .putExtra(IntentKey.EXPAND_PLEDGE_SHEET, true)
             .putExtra(IntentKey.REF_TAG, RefTag.activity())
         startActivityWithTransition(intent, R.anim.slide_in_right, R.anim.fade_out_slide_out_left)
     }
 
-    private fun startProjectActivity(project: Project, isProjectPageEnabled: Boolean) {
-        val intent = Intent().getProjectIntent(this, isProjectPageEnabled)
+    private fun startProjectActivity(project: Project) {
+        val intent = Intent().getProjectIntent(this)
             .putExtra(IntentKey.PROJECT, project)
             .putExtra(IntentKey.REF_TAG, RefTag.activity())
         startActivityWithTransition(intent, R.anim.slide_in_right, R.anim.fade_out_slide_out_left)

app/src/main/java/com/kickstarter/ui/activities/DeepLinkActivity.kt

@@ -42,7 +42,7 @@ class DeepLinkActivity : BaseActivity<DeepLinkViewModel.ViewModel?>() {
         viewModel.outputs.startProjectActivityToSave()
             .compose(bindToLifecycle())
             .compose(Transformers.observeForUI())
-            .subscribe { startProjectActivityForSave(it.first, it.second) }
+            .subscribe { startProjectActivityForSave(it) }
 
         viewModel.outputs.startProjectActivityForComment()
             .compose(bindToLifecycle())
@@ -75,7 +75,7 @@ class DeepLinkActivity : BaseActivity<DeepLinkViewModel.ViewModel?>() {
     }
 
     private fun projectIntent(uri: Uri): Intent {
-        val projectIntent = Intent(this, ProjectActivity::class.java)
+        val projectIntent = Intent().getProjectIntent(this)
             .setData(uri)
         val ref = refTag(uri.toString())
         if (ref != null) {
@@ -94,8 +94,8 @@ class DeepLinkActivity : BaseActivity<DeepLinkViewModel.ViewModel?>() {
         finish()
     }
 
-    private fun startProjectActivityForSave(uri: Uri, isFfEnabled: Boolean) {
-        val projectIntent = Intent().getProjectIntent(this, isFfEnabled)
+    private fun startProjectActivityForSave(uri: Uri) {
+        val projectIntent = Intent().getProjectIntent(this)
             .setData(uri)
             .putExtra(IntentKey.DEEP_LINK_SCREEN_PROJECT_SAVE, true)
 

app/src/main/java/com/kickstarter/ui/activities/ProfileActivity.kt

@@ -117,7 +117,7 @@ class ProfileActivity : BaseActivity<ProfileViewModel.ViewModel>() {
         this.viewModel.outputs.startProjectActivity()
             .compose(bindToLifecycle())
             .compose(observeForUI())
-            .subscribe { this.startProjectActivity(it.first, it.second) }
+            .subscribe { this.startProjectActivity(it) }
 
         this.viewModel.outputs.userNameTextViewText()
             .compose(bindToLifecycle())
@@ -161,8 +161,8 @@ class ProfileActivity : BaseActivity<ProfileViewModel.ViewModel>() {
         startActivityWithTransition(intent, R.anim.slide_in_right, R.anim.fade_out_slide_out_left)
     }
 
-    private fun startProjectActivity(project: Project, isProjectPageEnabled: Boolean) {
-        val intent = Intent().getProjectIntent(this, isProjectPageEnabled)
+    private fun startProjectActivity(project: Project) {
+        val intent = Intent().getProjectIntent(this)
             .putExtra(IntentKey.PROJECT, project)
         startActivityWithTransition(intent, R.anim.slide_in_right, R.anim.fade_out_slide_out_left)
     }