Commit 969f425

Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches from a previous diff being applied after a view reset (parity with iOS) - Add BOLD_ITALIC typeface case before individual italic/bold checks so tokens with both flags render correctly - Implement pull-to-refresh support (refreshing prop + onPullToRefresh event) using SwipeRefreshLayout, matching iOS behavior - Skip image-only paste path when clipboard items also contain text, preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425

4 files changed

Lines changed: 34 additions & 3 deletions

File tree

‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
}

‎apps/mobile/modules/t3-review-diff/android/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
implementation project(':expo-modules-core')
19+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}

‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
view.setInitialRowIndex(initialRowIndex)
4646
}
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
view.setRefreshing(refreshing)
49+
}
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
)
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->

‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
}
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
emitVisibleFile(first)
6772
}
6873

69-
addView(
74+
swipeRefreshLayout.addView(
7075
canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
)
78+
swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
addView(
80+
swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
)
83+
}
84+
85+
funsetRefreshing(value:Boolean) {
86+
swipeRefreshLayout.isRefreshing = value
7387
}
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
}
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
)
173188
post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
}
234+
dragAxis =DragAxis.VERTICAL
235+
} else {
236+
dragAxis =DragAxis.HORIZONTAL
237+
}
215238
}
216239
}
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
textPaint.textSize = style.codeFontSizePx
840863
textPaint.color = token.color ?: theme.text
841864
textPaint.typeface =when {
865+
token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 969f425
Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches
from a previous diff being applied after a view reset (parity with iOS)
- Add BOLD_ITALIC typeface case before individual italic/bold checks so
tokens with both flags render correctly
- Implement pull-to-refresh support (refreshing prop + onPullToRefresh event)
using SwipeRefreshLayout, matching iOS behavior
- Skip image-only paste path when clipboard items also contain text,
preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425
4 files changed
Lines changed: 34 additions & 3 deletions
File tree
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
 clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
 item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
 }
‎apps/mobile/modules/t3-review-diff/android/build.gradle‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
 implementation project(':expo-modules-core')
19+
 implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
 view.setInitialRowIndex(initialRowIndex)
4646
 }
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
 view.setRefreshing(refreshing)
49+
 }
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
 )
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
 }
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
 emitVisibleFile(first)
6772
 }
6873

69-
 addView(
74+
swipeRefreshLayout.addView(
7075
 canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
 )
78+
 swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
 addView(
80+
 swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
 )
83+
 }
84+
85+
funsetRefreshing(value:Boolean) {
86+
 swipeRefreshLayout.isRefreshing = value
7387
 }
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
 }
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
 payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
 payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
 )
173188
 post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
 canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
 dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
 }
234+
 dragAxis =DragAxis.VERTICAL
235+
 } else {
236+
 dragAxis =DragAxis.HORIZONTAL
237+
 }
215238
 }
216239
 }
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
 textPaint.textSize = style.codeFontSizePx
840863
 textPaint.color = token.color ?: theme.text
841864
 textPaint.typeface =when {
865+
 token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
 token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
 token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 969f425
Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches
from a previous diff being applied after a view reset (parity with iOS)
- Add BOLD_ITALIC typeface case before individual italic/bold checks so
tokens with both flags render correctly
- Implement pull-to-refresh support (refreshing prop + onPullToRefresh event)
using SwipeRefreshLayout, matching iOS behavior
- Skip image-only paste path when clipboard items also contain text,
preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425
4 files changed
Lines changed: 34 additions & 3 deletions
File tree
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
 clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
 item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
 }
‎apps/mobile/modules/t3-review-diff/android/build.gradle‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
 implementation project(':expo-modules-core')
19+
 implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
 view.setInitialRowIndex(initialRowIndex)
4646
 }
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
 view.setRefreshing(refreshing)
49+
 }
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
 )
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
 }
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
 emitVisibleFile(first)
6772
 }
6873

69-
 addView(
74+
swipeRefreshLayout.addView(
7075
 canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
 )
78+
 swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
 addView(
80+
 swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
 )
83+
 }
84+
85+
funsetRefreshing(value:Boolean) {
86+
 swipeRefreshLayout.isRefreshing = value
7387
 }
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
 }
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
 payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
 payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
 )
173188
 post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
 canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
 dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
 }
234+
 dragAxis =DragAxis.VERTICAL
235+
 } else {
236+
 dragAxis =DragAxis.HORIZONTAL
237+
 }
215238
 }
216239
 }
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
 textPaint.textSize = style.codeFontSizePx
840863
 textPaint.color = token.color ?: theme.text
841864
 textPaint.typeface =when {
865+
 token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
 token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
 token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 969f425
Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches
from a previous diff being applied after a view reset (parity with iOS)
- Add BOLD_ITALIC typeface case before individual italic/bold checks so
tokens with both flags render correctly
- Implement pull-to-refresh support (refreshing prop + onPullToRefresh event)
using SwipeRefreshLayout, matching iOS behavior
- Skip image-only paste path when clipboard items also contain text,
preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425
4 files changed
Lines changed: 34 additions & 3 deletions
File tree
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
 clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
 item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
 }
‎apps/mobile/modules/t3-review-diff/android/build.gradle‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
 implementation project(':expo-modules-core')
19+
 implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
 view.setInitialRowIndex(initialRowIndex)
4646
 }
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
 view.setRefreshing(refreshing)
49+
 }
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
 )
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
 }
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
 emitVisibleFile(first)
6772
 }
6873

69-
 addView(
74+
swipeRefreshLayout.addView(
7075
 canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
 )
78+
 swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
 addView(
80+
 swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
 )
83+
 }
84+
85+
funsetRefreshing(value:Boolean) {
86+
 swipeRefreshLayout.isRefreshing = value
7387
 }
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
 }
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
 payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
 payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
 )
173188
 post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
 canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
 dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
 }
234+
 dragAxis =DragAxis.VERTICAL
235+
 } else {
236+
 dragAxis =DragAxis.HORIZONTAL
237+
 }
215238
 }
216239
 }
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
 textPaint.textSize = style.codeFontSizePx
840863
 textPaint.color = token.color ?: theme.text
841864
 textPaint.typeface =when {
865+
 token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
 token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
 token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 969f425
Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches
from a previous diff being applied after a view reset (parity with iOS)
- Add BOLD_ITALIC typeface case before individual italic/bold checks so
tokens with both flags render correctly
- Implement pull-to-refresh support (refreshing prop + onPullToRefresh event)
using SwipeRefreshLayout, matching iOS behavior
- Skip image-only paste path when clipboard items also contain text,
preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425
4 files changed
Lines changed: 34 additions & 3 deletions
File tree
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
 clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
 item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
 }
‎apps/mobile/modules/t3-review-diff/android/build.gradle‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
 implementation project(':expo-modules-core')
19+
 implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
 view.setInitialRowIndex(initialRowIndex)
4646
 }
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
 view.setRefreshing(refreshing)
49+
 }
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
 )
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
 }
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
 emitVisibleFile(first)
6772
 }
6873

69-
 addView(
74+
swipeRefreshLayout.addView(
7075
 canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
 )
78+
 swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
 addView(
80+
 swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
 )
83+
 }
84+
85+
funsetRefreshing(value:Boolean) {
86+
 swipeRefreshLayout.isRefreshing = value
7387
 }
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
 }
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
 payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
 payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
 )
173188
 post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
 canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
 dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
 }
234+
 dragAxis =DragAxis.VERTICAL
235+
 } else {
236+
 dragAxis =DragAxis.HORIZONTAL
237+
 }
215238
 }
216239
 }
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
 textPaint.textSize = style.codeFontSizePx
840863
 textPaint.color = token.color ?: theme.text
841864
 textPaint.typeface =when {
865+
 token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
 token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
 token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 969f425
Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches
from a previous diff being applied after a view reset (parity with iOS)
- Add BOLD_ITALIC typeface case before individual italic/bold checks so
tokens with both flags render correctly
- Implement pull-to-refresh support (refreshing prop + onPullToRefresh event)
using SwipeRefreshLayout, matching iOS behavior
- Skip image-only paste path when clipboard items also contain text,
preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425
4 files changed
Lines changed: 34 additions & 3 deletions
File tree
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
 clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
 item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
 }
‎apps/mobile/modules/t3-review-diff/android/build.gradle‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
 implementation project(':expo-modules-core')
19+
 implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
 view.setInitialRowIndex(initialRowIndex)
4646
 }
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
 view.setRefreshing(refreshing)
49+
 }
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
 )
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
 }
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
 emitVisibleFile(first)
6772
 }
6873

69-
 addView(
74+
swipeRefreshLayout.addView(
7075
 canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
 )
78+
 swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
 addView(
80+
 swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
 )
83+
 }
84+
85+
funsetRefreshing(value:Boolean) {
86+
 swipeRefreshLayout.isRefreshing = value
7387
 }
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
 }
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
 payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
 payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
 )
173188
 post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
 canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
 dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
 }
234+
 dragAxis =DragAxis.VERTICAL
235+
 } else {
236+
 dragAxis =DragAxis.HORIZONTAL
237+
 }
215238
 }
216239
 }
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
 textPaint.textSize = style.codeFontSizePx
840863
 textPaint.color = token.color ?: theme.text
841864
 textPaint.typeface =when {
865+
 token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
 token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
 token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 969f425
Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches
from a previous diff being applied after a view reset (parity with iOS)
- Add BOLD_ITALIC typeface case before individual italic/bold checks so
tokens with both flags render correctly
- Implement pull-to-refresh support (refreshing prop + onPullToRefresh event)
using SwipeRefreshLayout, matching iOS behavior
- Skip image-only paste path when clipboard items also contain text,
preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425
4 files changed
Lines changed: 34 additions & 3 deletions
File tree
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
 clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
 item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
 }
‎apps/mobile/modules/t3-review-diff/android/build.gradle‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
 implementation project(':expo-modules-core')
19+
 implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
 view.setInitialRowIndex(initialRowIndex)
4646
 }
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
 view.setRefreshing(refreshing)
49+
 }
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
 )
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
 }
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
 emitVisibleFile(first)
6772
 }
6873

69-
 addView(
74+
swipeRefreshLayout.addView(
7075
 canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
 )
78+
 swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
 addView(
80+
 swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
 )
83+
 }
84+
85+
funsetRefreshing(value:Boolean) {
86+
 swipeRefreshLayout.isRefreshing = value
7387
 }
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
 }
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
 payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
 payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
 )
173188
 post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
 canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
 dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
 }
234+
 dragAxis =DragAxis.VERTICAL
235+
 } else {
236+
 dragAxis =DragAxis.HORIZONTAL
237+
 }
215238
 }
216239
 }
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
 textPaint.textSize = style.codeFontSizePx
840863
 textPaint.color = token.color ?: theme.text
841864
 textPaint.typeface =when {
865+
 token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
 token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
 token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 969f425
Browse files
cursoragentcursoragent
committed
fix(android): fix stale token patches, bold-italic rendering, pull-to-refresh, and paste behavior
- Add contentResetKey guard to setTokensPatchJson to prevent stale patches
from a previous diff being applied after a view reset (parity with iOS)
- Add BOLD_ITALIC typeface case before individual italic/bold checks so
tokens with both flags render correctly
- Implement pull-to-refresh support (refreshing prop + onPullToRefresh event)
using SwipeRefreshLayout, matching iOS behavior
- Skip image-only paste path when clipboard items also contain text,
preventing mixed clipboard content from silently dropping text
1 parent 2b34778 commit 969f425
4 files changed
Lines changed: 34 additions & 3 deletions
File tree
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ private class SelectionAwareEditText(context: Context) : EditText(context) {
437437
val imageUris = buildList {
438438
if (clip !=null) {
439439
for (index in0 until clip.itemCount) {
440-
 clip.getItemAt(index).uri?.let { uri ->
440+
val item = clip.getItemAt(index)
441+
if (!item.text.isNullOrEmpty()) continue
442+
 item.uri?.let { uri ->
441443
val mimeType = context.contentResolver.getType(uri)
442444
if (mimeType?.startsWith("image/") ==true) add(uri.toString())
443445
 }
‎apps/mobile/modules/t3-review-diff/android/build.gradle‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ android {
1616

1717
dependencies {
1818
 implementation project(':expo-modules-core')
19+
 implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
1920
}
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class T3ReviewDiffModule : Module() {
4444
Prop("initialRowIndex") { view:T3ReviewDiffView, initialRowIndex:Double->
4545
 view.setInitialRowIndex(initialRowIndex)
4646
 }
47+
Prop("refreshing") { view:T3ReviewDiffView, refreshing:Boolean->
48+
 view.setRefreshing(refreshing)
49+
 }
4750

4851
Events(
4952
"onDebug",
@@ -52,6 +55,7 @@ class T3ReviewDiffModule : Module() {
5255
"onToggleViewedFile",
5356
"onPressLine",
5457
"onToggleComment",
58+
"onPullToRefresh",
5559
 )
5660

5761
AsyncFunction("scrollToFile") { view:T3ReviewDiffView, fileId:String, animated:Boolean->
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
importandroid.view.ViewGroup
1313
importandroid.view.ViewConfiguration
1414
importandroid.widget.OverScroller
15+
importandroidx.swiperefreshlayout.widget.SwipeRefreshLayout
1516
importexpo.modules.kotlin.AppContext
1617
importexpo.modules.kotlin.viewevent.EventDispatcher
1718
importexpo.modules.kotlin.views.ExpoView
@@ -24,12 +25,16 @@ import kotlin.math.min
2425

2526
classT3ReviewDiffView(context:Context, appContext:AppContext) : ExpoView(context, appContext) {
2627
privateval canvasView =DiffCanvasView(context)
28+
privateval swipeRefreshLayout =object:SwipeRefreshLayout(context) {
29+
overridefuncanChildScrollUp(): Boolean= canvasView.verticalOffset() >0
30+
 }
2731
privateval onDebug by EventDispatcher()
2832
privateval onVisibleFileChange by EventDispatcher()
2933
privateval onToggleFile by EventDispatcher()
3034
privateval onToggleViewedFile by EventDispatcher()
3135
privateval onPressLine by EventDispatcher()
3236
privateval onToggleComment by EventDispatcher()
37+
privateval onPullToRefresh by EventDispatcher()
3338
privatevar rows:List<DiffRow> = emptyList()
3439
privatevar visibleRows:List<DiffRow> = emptyList()
3540
privatevar collapsedFileIds:Set<String> = emptySet()
@@ -66,10 +71,19 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
6671
 emitVisibleFile(first)
6772
 }
6873

69-
 addView(
74+
swipeRefreshLayout.addView(
7075
 canvasView,
7176
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
7277
 )
78+
 swipeRefreshLayout.setOnRefreshListener { onPullToRefresh(emptyMap()) }
79+
 addView(
80+
 swipeRefreshLayout,
81+
LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
82+
 )
83+
 }
84+
85+
funsetRefreshing(value:Boolean) {
86+
 swipeRefreshLayout.isRefreshing = value
7387
 }
7488

7589
funsetTokensResetKey(value:String) {
@@ -163,6 +177,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
163177
 }
164178

165179
funsetTokensPatchJson(value:String) {
180+
val capturedContentResetKey = contentResetKey
166181
 payloadDecodeExecutor.execute {
167182
try {
168183
val payload =JSONObject(value)
@@ -171,6 +186,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
171186
 payload.optJSONObject("tokensByRowId") ?:JSONObject(),
172187
 )
173188
 post {
189+
if (capturedContentResetKey != contentResetKey) return@post
174190
if (resetKey.isNotEmpty() && resetKey != tokensResetKey) return@post
175191
if (decodedTokens.isNotEmpty()) {
176192
 canvasView.tokensByRowId = canvasView.tokensByRowId + decodedTokens
@@ -211,7 +227,14 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
211227
val deltaX = event.x - lastTouchX
212228
val deltaY = event.y - lastTouchY
213229
if (max(abs(deltaX), abs(deltaY)) > touchSlop) {
214-
 dragAxis =if (abs(deltaY) >= abs(deltaX)) DragAxis.VERTICALelseDragAxis.HORIZONTAL
230+
if (abs(deltaY) >= abs(deltaX)) {
231+
if (deltaY >0&& canvasView.verticalOffset() ==0) {
232+
returnfalse
233+
 }
234+
 dragAxis =DragAxis.VERTICAL
235+
 } else {
236+
 dragAxis =DragAxis.HORIZONTAL
237+
 }
215238
 }
216239
 }
217240
return dragAxis !=null
@@ -839,6 +862,7 @@ private class DiffCanvasView(context: Context) : View(context) {
839862
 textPaint.textSize = style.codeFontSizePx
840863
 textPaint.color = token.color ?: theme.text
841864
 textPaint.typeface =when {
865+
 token.fontStyle and3==3->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
842866
 token.fontStyle and1!=0->Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
843867
 token.fontStyle and2!=0->Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
844868
else->Typeface.MONOSPACE
0 commit comments
Comments
 (0)