Convert GutenbergKitEditorFragment from Java to Kotlin#22086
Merged
Convert GutenbergKitEditorFragment from Java to Kotlin#22086
GutenbergKitEditorFragment from Java to Kotlin#22086Conversation
Collaborator
Generated by 🚫 Danger |
Contributor
|
| App Name |  WordPress |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22086-a293fb3 | |
| Commit | a293fb3 | |
| Direct Download | wordpress-prototype-build-pr22086-a293fb3.apk |
Contributor
|
| App Name |  Jetpack |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22086-a293fb3 | |
| Commit | a293fb3 | |
| Direct Download | jetpack-prototype-build-pr22086-a293fb3.apk |
Base automatically changed from
move-gutenberg-kit-fragment-to-wordpress-module
to
trunk
August 1, 2025 14:01
dcalhoun
requested changes
Aug 1, 2025
Member
There was a problem hiding this comment.
These are significant stability and comprehensibility improvements. Thank you for completing this! 🙇🏻♂️
I stepped through each commit individually. Each of the commits a very logical and sound. Thank you for organizing the commit history so well.
I tested the experimental editor by performing documented test cases. As noted in an inline comment, the remote editor fails to load. We need to address that before merging this work.
Comment on lines
+207
to
+209
| mEditorDragAndDropListener = requireActivityImplements<EditorDragAndDropListener>(activity) | ||
| mEditorImagePreviewListener = requireActivityImplements<EditorImagePreviewListener>(activity) | ||
| mEditorEditMediaListener = requireActivityImplements<EditorEditMediaListener>(activity) |
Member
There was a problem hiding this comment.
It will take additional investigation to confirm, but these are likely unused by GutenbergKit. In a future PR, we could potentially remove them (or implement them, if necessary). Similar to the numerous callbacks denoted with // Unused, no-op retained for the shared interface with Gutenberg.
To be clear: no action requested here now for this PR.
Contributor
Author
There was a problem hiding this comment.
That's good feedback. I'll see what I can clean up from these in a subsequent PR.
WordPress/src/main/java/org/wordpress/android/ui/posts/editor/GutenbergKitEditorFragment.kt
Outdated
Show resolved
Hide resolved
…ragment Fix compilation errors and warnings introduced during Java to Kotlin conversion: Changes: - Fix incorrect onAttach method signature (use Context instead of deprecated Activity) - Correct GutenbergView listener setter method calls instead of property access - Fix type signatures for getTitleAndContent return types (non-null vs nullable) - Update ContentChangeListener interface method name (onContentChanged vs onChange) - Fix EditorConfiguration builder with proper type casting and null safety - Add proper @deprecated and @Suppress annotations for deprecated methods - Fix nullable receiver warning with safe call operator for findViewById - Add InterruptedException logging for better debugging - Improve Kotlin idioms: property access, null safety, array handling - Maintain exact functional compatibility with original Java implementation
Eliminate dangerous \!\! operators that could cause crashes: Changes: - Replace mGutenbergView\!\! access with safe calls (?.) or early returns - Use local variable caching in onCreateView to avoid repeated null assertions - Wrap unsafe access patterns with safe let blocks in onActivityResult and onDestroy - Add proper null handling in getTitleAndContent method - Convert onConfigurationChanged to use safe call operator - Update all editor interaction methods (undo, redo, setContent, etc.) to use safe calls This significantly reduces crash risk while maintaining exact functional behavior. All methods now handle null GutenbergView gracefully without throwing NPE.
Move all GutenbergView setup logic into the .also block for better cohesion: Changes: - Consolidate view setup, listener configuration, and callbacks in single .also block - Eliminate local gutenbergView variable and repeated references - Keep all GutenbergView initialization logic together - Improve code readability and reduce variable scope This creates a more cohesive initialization pattern where all view setup happens in one place immediately after view creation.
Move setEditorProgressBarVisibility(true) outside the .also block: Changes: - Keep only GutenbergView-specific setup inside .also block - Move fragment-level UI logic (progress bar visibility) outside - Maintain proper separation of concerns between view setup and fragment state The .also block should only contain operations directly related to configuring the GutenbergView instance, not broader fragment UI management.
Improve code readability by adopting Kotlin naming conventions for all properties: - mGutenbergView → gutenbergView - mHtmlModeEnabled → isHtmlModeEnabled (boolean with 'is' prefix) - mEditorStarted → isEditorStarted - mEditorDidMount → isEditorDidMount - mRootView → rootView - mHistoryChangeListener → historyChangeListener - mFeaturedImageChangeListener → featuredImageChangeListener - mOpenMediaLibraryListener → openMediaLibraryListener - mOnLogJsExceptionListener → onLogJsExceptionListener - mTextWatcher → textWatcher - mSettings → settings (companion object property) Changes: - Eliminated Hungarian notation throughout the class - Used 'is' prefix for boolean properties following Kotlin conventions - Improved null safety with safe call operators where applicable - Fixed companion object property assignment to avoid naming conflicts - Maintained functional compatibility with existing interface contracts
Reduce code duplication and improve maintainability through pattern simplification: Null Check Improvements: - Replace repetitive if-null checks with idiomatic let functions - Use method references for cleaner listener assignments - Eliminate redundant null assertions with safe calls Cast Pattern Improvements: - Extract repetitive try-catch cast patterns into reusable helper function - Add generic requireActivityImplements<T> method with reified types - Improve error messages with automatic interface name detection Configuration Building: - Extract complex EditorConfiguration building into separate method - Improve readability by isolating configuration logic - Use more idiomatic Kotlin patterns (let, firstOrNull, etc.) - Better variable naming and organization Changes: - historyChangeListener?.let(gutenbergView::setHistoryChangeListener) - featuredImageChangeListener?.let(gutenbergView::setFeaturedImageChangeListener) - openMediaLibraryListener?.let(gutenbergView::setOpenMediaLibraryListener) - onLogJsExceptionListener?.let(gutenbergView::setLogJsExceptionListener) - Added requireActivityImplements<T> generic helper method - Extracted buildEditorConfiguration() method - Improved string interpolation and collection operations
Replace unsafe casting patterns with type-safe extension functions to eliminate @Suppress("UNCHECKED_CAST") annotations throughout the codebase. Key improvements: - Added reified generic extension functions for Map<String, Any?> access - getSetting<T>(key): Type-safe nullable accessor - getSettingOrDefault<T>(key, default): Type-safe with fallback values - getStringArray(key): Specialized accessor for string arrays with null filtering - getWebViewGlobals(key): Specialized accessor for WebViewGlobal lists buildEditorConfiguration() refactoring: - Eliminated all unsafe casting with @Suppress annotations - Used scope function 'run' for cleaner variable organization - Improved null safety with proper default values - Enhanced readability with type-safe accessors Benefits: - Compile-time type safety instead of runtime casting - Cleaner code without suppression annotations - Better error handling and null safety - More maintainable and refactor-friendly settings access
Remove explicit unused parameter declaration from lambda expression for cleaner, more idiomatic Kotlin code.
Before: { _: GutenbergView? -> ... }
After: { ... }
This follows Kotlin best practices where unused parameters should be omitted rather than explicitly marked with underscore.
Transform traditional for-loop into functional map operation for more idiomatic Kotlin code. Improvements: - Replace ArrayList initialization and manual loop with direct map operation - Use destructuring declaration (url, mediaFile) for cleaner parameter access - Eliminate mutable list in favor of immutable transformation - Reduce code from 15 lines to 6 lines while maintaining identical functionality - Remove unused metadata Bundle creation (videoPressGuid was not being used) This follows functional programming principles by transforming data rather than mutating collections.
Replace eager collection operations with lazy sequence processing for better performance when filtering nullable string arrays. Performance improvement: - Use asSequence() for lazy evaluation instead of immediate collection creation - Chain filterNotNull() -> toList() -> toTypedArray() operations lazily - Reduces intermediate collection allocations for large arrays - Maintains identical functionality while improving memory efficiency This follows Kotlin best practices for collection processing when multiple transformations are chained together.
Create reusable extension function to simplify view visibility operations and improve code readability. Extension function benefits: - setVisibleOrGone(Boolean): Combines visibility logic into single method call - Handles nullable View receivers safely with ?. operator - Eliminates repetitive if-else visibility assignments - Follows Kotlin idiom of extending platform classes with domain-specific operations Usage improvement: Before: view?.visibility = if (shown) View.VISIBLE else View.GONE After: view.setVisibleOrGone(shown) This makes UI state management more expressive and reduces boilerplate code.
Resolves multiple Detekt rule violations to improve code maintainability and readability while preserving existing functionality. Changes: - Extract nested logic from onActivityResult into helper functions - Reduce return statements in getTitleAndContent from 3 to 2 - Fix line length violations by splitting long function declarations - Maintain original behavior for file chooser handling and error cases
Co-authored-by: David Calhoun <github@davidcalhoun.me>
oguzkocer
force-pushed
the
convert-gutenberg-kit-fragment-to-kotlin
branch
from
ab161e3 to
a293fb3
Compare
Contributor
Author
|
@dcalhoun The force push is due to the rebase as squash merge strategy requires subsequent PRs to be rebased once the base PR is merged. In future PRs, I'll make sure to ping you if I make any major changes in the code during a force push. I try to avoid them as much as possible after I ping someone for review, but if I break that for whatever reason, I'll be sure to communicate it. |
|
dcalhoun
approved these changes
Aug 1, 2025
Member
dcalhoun
left a comment
dcalhoun
left a comment
There was a problem hiding this comment.
The latest changes tested well for me. 🚀
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Complete conversion of
GutenbergKitEditorFragmentfrom Java to idiomatic Kotlin with systematic improvements while preserving functional compatibility.Key Improvements
Safety & Reliability
!!operators and unsafe null assertionsCode Quality & Maintainability
Performance