Skip to content

Commit 9238654

Browse files
committed
Upload file
1 parent f6e4b59 commit 9238654

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

common/src/main/java/com/omarea/overscroll/OverScrollDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ private boolean onTouchEventInternal(MotionEvent event) {
526526
case MotionEvent.ACTION_CANCEL: {
527527
if (mOffsetY != 0f) {
528528
// Sping back to 0
529-
final int startScrollY = Math.round(mOffsetY * 1.4f);
529+
final int startScrollY = Math.round(mOffsetY * 1.2f);
530530
// mScroller.startScroll(0, startScrollY, 0, -startScrollY,
531531
// SPRING_BACK_DURATION);
532532
// mPath.reset();

krscript/src/main/java/com/omarea/krscript/ui/DialogLogFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class DialogLogFragment : androidx.fragment.app.DialogFragment() {
7070
openExecutor(node)?.let { shellHandler ->
7171
ShellExecutor().execute(activity, node, script, onExit, params, shellHandler)
7272
}
73-
} ?: dismissAllowingStateLoss()
73+
} ?: closeView()
7474
}
7575

7676
private fun openExecutor(nodeInfo: RunnableNode): ShellHandlerBase {
@@ -81,7 +81,7 @@ class DialogLogFragment : androidx.fragment.app.DialogFragment() {
8181
binding?.btnHide?.setOnClickListener {
8282
uiVisible = false
8383
wakeLock?.release()
84-
dismissAllowingStateLoss()
84+
closeView()
8585
}
8686

8787
binding?.btnCancel?.setOnClickListener {
@@ -95,7 +95,7 @@ class DialogLogFragment : androidx.fragment.app.DialogFragment() {
9595

9696
binding?.btnExit?.setOnClickListener {
9797
isCancelable = true
98-
dismissAllowingStateLoss()
98+
closeView()
9999
}
100100

101101
binding?.btnCopy?.setOnClickListener {
@@ -145,7 +145,7 @@ class DialogLogFragment : androidx.fragment.app.DialogFragment() {
145145

146146
override fun onSuccess() {
147147
if (nodeInfo.autoOff) {
148-
dismissAllowingStateLoss()
148+
closeView()
149149
}
150150
}
151151

@@ -243,9 +243,9 @@ class DialogLogFragment : androidx.fragment.app.DialogFragment() {
243243
}
244244

245245
override fun onExit(msg: Any?) {
246+
if (!hasError) actionEventHandler.onSuccess()
246247
updateLog(context?.getString(R.string.kr_shell_completed), endColor)
247248
actionEventHandler.onCompleted()
248-
if (!hasError) actionEventHandler.onSuccess()
249249
}
250250

251251
override fun updateLog(msg: SpannableString?) {

0 commit comments

Comments
 (0)