Skip to content

Commit 919d120

Browse files
authored
Fix editor activities for edge-to-edge (#21733)
* Exclude post, comment and notification editors from edge-to-edge to avoid keyboard overlap * Exclude ReaderCommentListActivity from edge-to-edge to avoid keyboard overlap
1 parent 191e444 commit 919d120

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

WordPress/src/main/AndroidManifest.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
android:label="@string/edit_comment"/>
257257
<activity
258258
android:name=".ui.comments.CommentsDetailActivity"
259-
android:theme="@style/WordPress.NoActionBar"
259+
android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
260260
android:windowSoftInputMode="adjustResize"
261261
android:label="@string/comments"/>
262262
<activity
@@ -270,7 +270,7 @@
270270
android:name=".ui.posts.EditPostActivity"
271271
android:configChanges="screenLayout|orientation|screenSize
272272
|keyboard|keyboardHidden|smallestScreenSize"
273-
android:theme="@style/WordPress.NoActionBar"
273+
android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
274274
android:windowSoftInputMode="stateHidden|adjustResize"
275275
android:exported="false">
276276
<meta-data
@@ -605,7 +605,7 @@
605605
<activity
606606
android:name=".ui.reader.ReaderCommentListActivity"
607607
android:label="@string/reader_title_comments"
608-
android:theme="@style/WordPress.NoActionBar"
608+
android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
609609
android:windowSoftInputMode="adjustResize|stateHidden" />
610610
<activity
611611
android:name=".ui.reader.NoSiteToReblogActivity"
@@ -712,7 +712,7 @@
712712
<!-- Notifications activities -->
713713
<activity
714714
android:name=".ui.notifications.NotificationsDetailActivity"
715-
android:theme="@style/WordPress.NoActionBar" />
715+
android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge" />
716716

717717
<!--People Management-->
718718
<activity

WordPress/src/main/java/org/wordpress/android/ui/main/BaseAppCompatActivity.kt

+10-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ import org.wordpress.android.ui.main.feedbackform.FeedbackFormActivity
2121
import org.wordpress.android.ui.media.MediaPreviewActivity
2222
import org.wordpress.android.ui.mysite.menu.MenuActivity
2323
import org.wordpress.android.ui.mysite.personalization.PersonalizationActivity
24+
import org.wordpress.android.ui.notifications.NotificationsDetailActivity
25+
import org.wordpress.android.ui.posts.EditPostActivity
2426
import org.wordpress.android.ui.posts.sharemessage.EditJetpackSocialShareMessageActivity
2527
import org.wordpress.android.ui.prefs.ExperimentalFeaturesActivity
28+
import org.wordpress.android.ui.reader.ReaderCommentListActivity
2629
import org.wordpress.android.ui.selfhostedusers.SelfHostedUsersActivity
2730
import org.wordpress.android.ui.sitemonitor.SiteMonitorParentActivity
2831

@@ -86,5 +89,11 @@ private val excludedActivities = listOf(
8689
PurchaseDomainActivity::class.java.name,
8790
SelfHostedUsersActivity::class.java.name,
8891
SiteMonitorParentActivity::class.java.name,
89-
SupportWebViewActivity::class.java.name
92+
SupportWebViewActivity::class.java.name,
93+
94+
// these are excluded and use the NoEdgeToEdge style to avoid the keyboard overlapping
95+
// their editors
96+
EditPostActivity::class.java.name,
97+
NotificationsDetailActivity::class.java.name,
98+
ReaderCommentListActivity::class.java.name
9099
)

0 commit comments

Comments
 (0)