Merge pull request #267 from naz013/feature/REM-910_Re-design_add_bir…

…thday_screen

REM-910 - Move Birthday edit and Preview to the Fragment

app/src/main/AndroidManifest.xml

@@ -332,29 +332,6 @@
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".birthdays.create.AddBirthdayActivity"
-            android:exported="true"
-            android:label="@string/add_birthday"
-            android:windowSoftInputMode="stateUnchanged">
-            <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:scheme="file" />
-                <data android:host="*" />
-                <data android:mimeType="*/*" />
-                <data android:pathPattern=".*\\.bi2" />
-                <data android:pathPattern=".*\\..*\\.bi2" />
-                <data android:pathPattern=".*\\..*\\..*\\.bi2" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.bi2" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.bi2" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.bi2" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.bi2" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".notes.preview.ImagePreviewActivity"
             android:exported="false" />
@@ -383,9 +360,6 @@
         <activity
             android:name=".reminder.preview.ReminderPreviewActivity"
             android:exported="false" />
-        <activity
-            android:name=".birthdays.preview.BirthdayPreviewActivity"
-            android:exported="false" />
         <activity
             android:name=".googletasks.preview.GoogleTaskPreviewActivity"
             android:exported="false" />

app/src/main/java/com/elementary/tasks/birthdays/BirthdayResolver.kt

@@ -2,23 +2,21 @@ package com.elementary.tasks.birthdays
 
 import android.view.View
 import com.elementary.tasks.R
-import com.elementary.tasks.birthdays.create.AddBirthdayActivity
-import com.elementary.tasks.birthdays.preview.BirthdayPreviewActivity
 import com.elementary.tasks.core.data.ui.birthday.UiBirthdayList
 import com.elementary.tasks.core.utils.ListActions
 import com.github.naz013.ui.common.Dialogues
-import com.github.naz013.common.intent.IntentKeys
-import com.github.naz013.ui.common.login.LoginApi
 
 class BirthdayResolver(
   private val dialogAction: () -> Dialogues,
-  private val deleteAction: (birthday: UiBirthdayList) -> Unit
+  private val deleteAction: (birthday: UiBirthdayList) -> Unit,
+  private val birthdayEditAction: (birthday: UiBirthdayList) -> Unit,
+  private val birthdayOpenAction: (birthday: UiBirthdayList) -> Unit
 ) {
 
   fun resolveAction(view: View, birthday: UiBirthdayList, listActions: ListActions) {
     when (listActions) {
-      ListActions.EDIT -> editBirthday(view, birthday)
-      ListActions.OPEN -> openBirthday(view, birthday)
+      ListActions.EDIT -> editBirthday(birthday)
+      ListActions.OPEN -> openBirthday(birthday)
       ListActions.MORE -> showMore(view, birthday)
       else -> {
       }
@@ -30,7 +28,7 @@ class BirthdayResolver(
     val items = arrayOf(context.getString(R.string.edit), context.getString(R.string.delete))
     Dialogues.showPopup(view, { item ->
       if (item == 0) {
-        editBirthday(view, birthday)
+        editBirthday(birthday)
       } else if (item == 1) {
         askConfirmation(view, items[item]) {
           if (it) deleteAction.invoke(birthday)
@@ -43,15 +41,11 @@ class BirthdayResolver(
     dialogAction.invoke().askConfirmation(view.context, title, onAction)
   }
 
-  private fun openBirthday(view: View, birthday: UiBirthdayList) {
-    LoginApi.openLogged(view.context, BirthdayPreviewActivity::class.java) {
-      putExtra(IntentKeys.INTENT_ID, birthday.uuId)
-    }
+  private fun openBirthday(birthday: UiBirthdayList) {
+    birthdayOpenAction(birthday)
   }
 
-  private fun editBirthday(view: View, birthday: UiBirthdayList) {
-    LoginApi.openLogged(view.context, AddBirthdayActivity::class.java) {
-      putExtra(IntentKeys.INTENT_ID, birthday.uuId)
-    }
+  private fun editBirthday(birthday: UiBirthdayList) {
+    birthdayEditAction(birthday)
   }
 }