-
Notifications
You must be signed in to change notification settings - Fork 3
Add Android app code #5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
567ce96
style: Format with Prettier (#3)
dcalhoun 02e9d69
Add Android app code
jkmassel 20e8be2
Re-arrange the projects
jkmassel 1d53e89
Fix iOS issue
jkmassel fb964ca
Use a Makefile instead of Scripts
jkmassel 64ff83f
Don’t store build products in the repo
jkmassel 34db643
Ignore Android tooling directories
jkmassel 24beb10
Fix a deprecation warning on Android
jkmassel ff4ba1d
Fix iOS code signing
jkmassel e85c400
Remove duplicate file
jkmassel f1f2e94
Add macOS support
jkmassel 4f4b577
Remove the input accessory view on iOS
jkmassel 42d6549
Update README for makefile
jkmassel a495d17
Some more references
jkmassel e3ccfe2
Add `fmt`
jkmassel b3870d1
Avoid lint warnings
jkmassel 3b1d64f
Remove debug log
jkmassel c8d774a
Remove index.html
jkmassel 02fad4d
Fix some lint issues
jkmassel 431940e
Style fixes
jkmassel 81cd51a
Update ReactApp/src/components/Editor.jsx
jkmassel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| plugins { | ||
| alias(libs.plugins.android.application) | ||
| alias(libs.plugins.jetbrains.kotlin.android) | ||
| } | ||
|
|
||
| android { | ||
| namespace = "com.example.gutenbergkit" | ||
| compileSdk = 34 | ||
|
|
||
| defaultConfig { | ||
| applicationId = "com.example.gutenbergkit" | ||
| minSdk = 22 | ||
| targetSdk = 34 | ||
| versionCode = 1 | ||
| versionName = "1.0" | ||
|
|
||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| isMinifyEnabled = false | ||
| proguardFiles( | ||
| getDefaultProguardFile("proguard-android-optimize.txt"), | ||
| "proguard-rules.pro" | ||
| ) | ||
| } | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
| kotlinOptions { | ||
| jvmTarget = "1.8" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
||
| implementation(libs.androidx.core.ktx) | ||
| implementation(libs.androidx.appcompat) | ||
| implementation(libs.material) | ||
| implementation(libs.androidx.activity) | ||
| implementation(libs.androidx.constraintlayout) | ||
| testImplementation(libs.junit) | ||
| androidTestImplementation(libs.androidx.junit) | ||
| androidTestImplementation(libs.androidx.espresso.core) | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Add project specific ProGuard rules here. | ||
| # You can control the set of applied configuration files using the | ||
| # proguardFiles setting in build.gradle. | ||
| # | ||
| # For more details, see | ||
| # http://developer.android.com/guide/developing/tools/proguard.html | ||
|
|
||
| # If your project uses WebView with JS, uncomment the following | ||
| # and specify the fully qualified class name to the JavaScript interface | ||
| # class: | ||
| #-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
| # public *; | ||
| #} | ||
|
|
||
| # Uncomment this to preserve the line number information for | ||
| # debugging stack traces. | ||
| #-keepattributes SourceFile,LineNumberTable | ||
|
|
||
| # If you keep the line number information, uncomment this to | ||
| # hide the original source file name. | ||
| #-renamesourcefileattribute SourceFile |
24 changes: 24 additions & 0 deletions
24
Demo-Android/app/src/androidTest/java/com/example/gutenbergkit/ExampleInstrumentedTest.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.example.gutenbergkit | ||
|
|
||
| import androidx.test.platform.app.InstrumentationRegistry | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
|
|
||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| import org.junit.Assert.* | ||
|
|
||
| /** | ||
| * Instrumented test, which will execute on an Android device. | ||
| * | ||
| * See [testing documentation](http://d.android.com/tools/testing). | ||
| */ | ||
| @RunWith(AndroidJUnit4::class) | ||
| class ExampleInstrumentedTest { | ||
| @Test | ||
| fun useAppContext() { | ||
| // Context of the app under test. | ||
| val appContext = InstrumentationRegistry.getInstrumentation().targetContext | ||
| assertEquals("com.example.gutenbergkit", appContext.packageName) | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools"> | ||
|
|
||
| <application | ||
| android:allowBackup="true" | ||
| android:usesCleartextTraffic="true" | ||
| android:dataExtractionRules="@xml/data_extraction_rules" | ||
| android:fullBackupContent="@xml/backup_rules" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:roundIcon="@mipmap/ic_launcher_round" | ||
| android:supportsRtl="true" | ||
| android:theme="@style/Theme.GutenbergKit" | ||
| tools:targetApi="31"> | ||
| <activity | ||
| android:name=".MainActivity" | ||
| android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
| <uses-permission android:name="android.permission.INTERNET"/> | ||
| </manifest> |
112 changes: 112 additions & 0 deletions
112
Demo-Android/app/src/main/java/com/example/gutenbergkit/GutenbergView.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| package com.example.gutenbergkit | ||
|
|
||
| import android.content.Context | ||
| import android.os.Handler | ||
| import android.os.Looper | ||
| import android.util.AttributeSet | ||
| import android.util.Log | ||
| import android.webkit.ConsoleMessage | ||
| import android.webkit.JavascriptInterface | ||
| import android.webkit.WebChromeClient | ||
| import android.webkit.WebResourceError | ||
| import android.webkit.WebResourceRequest | ||
| import android.webkit.WebView | ||
| import android.webkit.WebViewClient | ||
|
|
||
|
|
||
| class GutenbergView : WebView { | ||
|
|
||
| private var isEditorLoaded = false | ||
| private var didFireEditorLoaded = false | ||
|
|
||
| var editorDidBecomeAvailable: ((GutenbergView) -> Unit)? = null | ||
|
|
||
| constructor(context: Context) : super(context) | ||
| constructor(context: Context, attrs: AttributeSet) : super(context, attrs) | ||
| constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super( | ||
| context, | ||
| attrs, | ||
| defStyle | ||
| ) | ||
|
|
||
| fun start() { | ||
| this.settings.allowFileAccess = true | ||
| this.settings.allowUniversalAccessFromFileURLs = true | ||
| this.settings.javaScriptCanOpenWindowsAutomatically = true | ||
| this.settings.javaScriptEnabled = true | ||
| this.addJavascriptInterface(this, "editorDelegate") | ||
|
|
||
| this.webViewClient = object : WebViewClient() { | ||
| override fun onReceivedError( | ||
| view: WebView?, | ||
| request: WebResourceRequest?, | ||
| error: WebResourceError? | ||
| ) { | ||
| Log.e("GutenbergView", error.toString()) | ||
| super.onReceivedError(view, request, error) | ||
| } | ||
| } | ||
|
|
||
| this.webChromeClient = object : WebChromeClient() { | ||
| override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean { | ||
| if (consoleMessage != null) { | ||
| Log.i("GutenbergView", consoleMessage.message()) | ||
| } else { | ||
| Log.i("GutenbergView", "null message") | ||
| } | ||
| return super.onConsoleMessage(consoleMessage) | ||
| } | ||
| } | ||
|
|
||
| // Production mode – load the assets from the app bundle – you'll need to copy | ||
| // this value out of the `dist` directory after building GutenbergKit | ||
| this.loadUrl("file:///android_asset/index.html") | ||
|
|
||
| // Dev mode – you can connect the app to a local dev server and have it refresh as | ||
| // changes are made. To start the server, run `make dev-server` in the project root | ||
| // directory. | ||
| // | ||
| // You'll need to set this to the IP address of your local machine | ||
| // | ||
| // this.loadUrl("http://192.168.5.248:5173/") | ||
|
Comment on lines
+61
to
+71
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Long term, I suppose we might mirror iOS' setup where a |
||
|
|
||
| Log.i("GutenbergView", "Startup Complete") | ||
| } | ||
|
|
||
| fun setContent(newContent: String) { | ||
| Log.i("GutenbergView", "Setting content to $newContent") | ||
|
|
||
| if(!isEditorLoaded) { | ||
| Log.e("GutenbergView", "You can't change the editor content until it has loaded") | ||
| return | ||
| } | ||
|
|
||
| this.evaluateJavascript("editor.setContent('$newContent');", null) | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| fun onEditorLoaded() { | ||
| Log.i("GutenbergView", "EditorLoaded received in native code") | ||
| isEditorLoaded = true | ||
| Handler(Looper.getMainLooper()).post { | ||
| if(!didFireEditorLoaded) { | ||
| this.editorDidBecomeAvailable?.let { it(this) } | ||
| this.didFireEditorLoaded = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| fun onBlocksChanged(isEmpty: Boolean) { | ||
| if(isEmpty) { | ||
| Log.i("GutenbergView", "BlocksChanged (empty)") | ||
| } else { | ||
| Log.i("GutenbergView", "BlocksChanged (not empty)") | ||
| } | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| fun showBlockPicker() { | ||
| Log.i("GutenbergView", "BlockPickerShouldShow") | ||
| } | ||
| } | ||
34 changes: 34 additions & 0 deletions
34
Demo-Android/app/src/main/java/com/example/gutenbergkit/MainActivity.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.example.gutenbergkit | ||
|
|
||
| import android.os.Bundle | ||
| import android.util.Log | ||
| import android.webkit.WebView | ||
| import androidx.activity.enableEdgeToEdge | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.core.view.ViewCompat | ||
| import androidx.core.view.WindowInsetsCompat | ||
|
|
||
|
|
||
| class MainActivity : AppCompatActivity() { | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| enableEdgeToEdge() | ||
| setContentView(R.layout.activity_main) | ||
| ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> | ||
| val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) | ||
| v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) | ||
| insets | ||
| } | ||
|
|
||
| WebView.setWebContentsDebuggingEnabled(true) | ||
|
|
||
| Log.i("GutenbergView", "onCreate") | ||
|
|
||
| val gbView = findViewById<GutenbergView>(R.id.gutenbergView) | ||
| gbView.editorDidBecomeAvailable = { editor -> | ||
| editor.setContent("<!-- wp:paragraph --><p>This is the new content</p><!-- /wp:paragraph -->") | ||
| } | ||
| gbView.start() | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
Demo-Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:aapt="http://schemas.android.com/aapt" | ||
| android:width="108dp" | ||
| android:height="108dp" | ||
| android:viewportWidth="108" | ||
| android:viewportHeight="108"> | ||
| <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z"> | ||
| <aapt:attr name="android:fillColor"> | ||
| <gradient | ||
| android:endX="85.84757" | ||
| android:endY="92.4963" | ||
| android:startX="42.9492" | ||
| android:startY="49.59793" | ||
| android:type="linear"> | ||
| <item | ||
| android:color="#44000000" | ||
| android:offset="0.0" /> | ||
| <item | ||
| android:color="#00000000" | ||
| android:offset="1.0" /> | ||
| </gradient> | ||
| </aapt:attr> | ||
| </path> | ||
| <path | ||
| android:fillColor="#FFFFFF" | ||
| android:fillType="nonZero" | ||
| android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" | ||
| android:strokeWidth="1" | ||
| android:strokeColor="#00000000" /> | ||
| </vector> |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this comment still true now that a
Makefileexists that copies the built assets?