Created
July 22, 2020 18:51
-
-
Save mzorz/bfd6505d1f5a9aab1729d2d721ac700a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml | |
index 61ada70374..1353516248 100644 | |
--- a/WordPress/src/main/AndroidManifest.xml | |
+++ b/WordPress/src/main/AndroidManifest.xml | |
@@ -94,7 +94,8 @@ | |
<activity | |
android:name=".ui.main.WPMainActivity" | |
android:theme="@style/WordPress.NoActionBar" | |
- android:label="" /> | |
+ android:label="" | |
+ android:windowSoftInputMode="adjustResize"/> | |
<!-- Account activities --> | |
<activity | |
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java | |
index a2bd8d0a0a..d55931981f 100644 | |
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java | |
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java | |
@@ -43,6 +43,7 @@ import org.wordpress.android.fluxc.generated.SiteActionBuilder; | |
import org.wordpress.android.fluxc.model.AccountModel; | |
import org.wordpress.android.fluxc.model.PostModel; | |
import org.wordpress.android.fluxc.model.SiteModel; | |
+import org.wordpress.android.fluxc.model.post.PostStatus; | |
import org.wordpress.android.fluxc.network.rest.wpcom.site.PrivateAtomicCookie; | |
import org.wordpress.android.fluxc.store.AccountStore; | |
import org.wordpress.android.fluxc.store.AccountStore.AuthenticationErrorType; | |
@@ -95,8 +96,12 @@ import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogNegativeCli | |
import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogOnDismissByOutsideTouchInterface; | |
import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogPositiveClickInterface; | |
import org.wordpress.android.ui.posts.EditPostActivity; | |
+import org.wordpress.android.ui.posts.EditPostRepository; | |
+import org.wordpress.android.ui.posts.EditPostSettingsFragment.EditPostActivityHook; | |
+import org.wordpress.android.ui.posts.PrepublishingBottomSheetFragment; | |
import org.wordpress.android.ui.posts.PromoDialog; | |
import org.wordpress.android.ui.posts.PromoDialog.PromoDialogClickInterface; | |
+import org.wordpress.android.ui.posts.prepublishing.PrepublishingBottomSheetListener; | |
import org.wordpress.android.ui.prefs.AppPrefs; | |
import org.wordpress.android.ui.prefs.AppSettingsFragment; | |
import org.wordpress.android.ui.prefs.SiteSettingsFragment; | |
@@ -147,6 +152,8 @@ public class WPMainActivity extends LocaleAwareActivity implements | |
BasicDialogPositiveClickInterface, | |
BasicDialogNegativeClickInterface, | |
BasicDialogOnDismissByOutsideTouchInterface, | |
+ EditPostActivityHook, | |
+ PrepublishingBottomSheetListener, | |
PromoDialogClickInterface { | |
public static final String ARG_CONTINUE_JETPACK_CONNECT = "ARG_CONTINUE_JETPACK_CONNECT"; | |
public static final String ARG_CREATE_SITE = "ARG_CREATE_SITE"; | |
@@ -200,6 +207,20 @@ public class WPMainActivity extends LocaleAwareActivity implements | |
@Inject UploadUtilsWrapper mUploadUtilsWrapper; | |
@Inject ViewModelProvider.Factory mViewModelFactory; | |
@Inject PrivateAtomicCookie mPrivateAtomicCookie; | |
+ @Inject EditPostRepository mEditPostRepository; | |
+ | |
+ @Override public void onSubmitButtonClicked(boolean publishPost) { | |
+ // N/A | |
+ ToastUtils.showToast(this, "NOTHING TO DO"); | |
+ } | |
+ | |
+ @Override public EditPostRepository getEditPostRepository() { | |
+ return mEditPostRepository; | |
+ } | |
+ | |
+ @Override public SiteModel getSite() { | |
+ return mSelectedSite; | |
+ } | |
/* | |
* fragments implement this if their contents can be scrolled, called when user | |
@@ -428,7 +449,23 @@ public class WPMainActivity extends LocaleAwareActivity implements | |
}); | |
mFloatingActionButton.setOnClickListener(v -> { | |
- mViewModel.onFabClicked(hasFullAccessToContent()); | |
+ // Create a new post | |
+ mEditPostRepository.set(() -> { | |
+ PostModel post = mPostStore.instantiatePostModel(mSelectedSite, false, null, null); | |
+ post.setStatus(PostStatus.DRAFT.toString()); | |
+ return post; | |
+ }); | |
+ mEditPostRepository.savePostSnapshot(); | |
+ | |
+ Fragment fragment = getSupportFragmentManager().findFragmentByTag( | |
+ PrepublishingBottomSheetFragment.TAG); | |
+ if (fragment == null) { | |
+ PrepublishingBottomSheetFragment prepublishingFragment = | |
+ PrepublishingBottomSheetFragment.newInstance(mSelectedSite, false, true); | |
+ prepublishingFragment.show(getSupportFragmentManager(), PrepublishingBottomSheetFragment.TAG); | |
+ } | |
+// | |
+// mViewModel.onFabClicked(hasFullAccessToContent()); | |
}); | |
mFloatingActionButton.setOnLongClickListener(v -> { | |
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java | |
index 593c49694c..b9f270b697 100644 | |
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java | |
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java | |
@@ -1780,7 +1780,7 @@ public class EditPostActivity extends LocaleAwareActivity implements | |
PrepublishingBottomSheetFragment.TAG); | |
if (fragment == null) { | |
PrepublishingBottomSheetFragment prepublishingFragment = | |
- PrepublishingBottomSheetFragment.newInstance(getSite(), mIsPage, false); | |
+ PrepublishingBottomSheetFragment.newInstance(getSite(), mIsPage, true); | |
prepublishingFragment.show(getSupportFragmentManager(), PrepublishingBottomSheetFragment.TAG); | |
} | |
}; | |
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt | |
index c0c88115dc..20fd6fef5e 100644 | |
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt | |
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt | |
@@ -63,8 +63,8 @@ class PrepublishingBottomSheetFragment : WPBottomSheetDialogFragment(), | |
savedInstanceState: Bundle? | |
): View? { | |
val view = inflater.inflate(R.layout.post_prepublishing_bottom_sheet, container) | |
- keyboardResizeViewUtil = KeyboardResizeViewUtil(requireActivity(), view) | |
- keyboardResizeViewUtil.enable() | |
+// keyboardResizeViewUtil = KeyboardResizeViewUtil(requireActivity(), view) | |
+// keyboardResizeViewUtil.enable() | |
return view | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment