/

Rider21 · Mar 8, 2024 · 6324050 · 6324050
1 parent 591d259
commit 6324050
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/screens/WebviewScreen/WebviewScreen.tsx b/src/screens/WebviewScreen/WebviewScreen.tsx
@@ -36,7 +36,7 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
     if (!e.loading) {
       setTitle(e.title);
     }
-    setLoading(e.loading)
+    setLoading(e.loading);
     setCurrentUrl(e.url);
     setCanGoBack(e.canGoBack);
     setCanGoForward(e.canGoForward);
@@ -75,7 +75,7 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
       <Appbar
         title={title}
         theme={theme}
-        loading={loading && progress !== 1}
+        loading={loading}
         currentUrl={currentUrl}
         canGoBack={canGoBack}
         canGoForward={canGoForward}
@@ -89,7 +89,7 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
       <ProgressBar
         color={theme.primary}
         progress={progress}
-        visible={loading && progress !== 1}
+        visible={loading}
       />
       <WebView
         userAgent={getUserAgent()}

diff --git a/src/screens/WebviewScreen/components/Appbar.tsx b/src/screens/WebviewScreen/components/Appbar.tsx
@@ -59,11 +59,11 @@ const Appbar: React.FC<AppbarProps> = ({
         <TextTicker
           style={{ color: theme.outline, fontSize: 16 }}
           loop
-          scrollSpeed={50}
-          bounceSpeed={60}
+          scrollSpeed={45}
+          bounceSpeed={100}
           marqueeDelay={1000}
           bounceDelay={1000}
-          //isInteraction={false}
+          isInteraction={false}
           disabled={loading}
         >
           {currentUrl}

diff --git a/src/screens/WebviewScreen/components/Menu.tsx b/src/screens/WebviewScreen/components/Menu.tsx
@@ -21,8 +21,9 @@ const Menu: React.FC<MenuProps> = ({
   webView,
   setMenuVisible,
 }) => {
-  const { top } = useSafeAreaInsets();
-
+  const insets = useSafeAreaInsets();
+  const url = currentUrl;
+  console.log(url, typeof url, typeof currentUrl);
   return (
     <Pressable
       onPress={() => setMenuVisible(false)}
@@ -34,10 +35,9 @@ const Menu: React.FC<MenuProps> = ({
         right: 0,
         justifyContent: 'center',
         alignItems: 'center',
-        //zIndex: 1,
       }}
     >
-      <View style={{ position: 'absolute', right: 0, top: top }}>
+      <View style={{ position: 'absolute', right: 0, top: insets.top }}>
         <Pressable
           style={{ backgroundColor: theme.surface2, padding: 15 }}
           onPress={() => {
@@ -54,7 +54,7 @@ const Menu: React.FC<MenuProps> = ({
           style={{ backgroundColor: theme.surface2, padding: 15 }}
           onPress={() => {
             setMenuVisible(false);
-            Share.share({ message: currentUrl });
+            Share.share({ message: url });
           }}
         >
           <Text style={{ color: theme.onSurface }}>
@@ -66,7 +66,7 @@ const Menu: React.FC<MenuProps> = ({
           style={{ backgroundColor: theme.surface2, padding: 15 }}
           onPress={() => {
             setMenuVisible(false);
-            Linking.openURL(currentUrl);
+            Linking.openURL(url);
           }}
         >
           <Text style={{ color: theme.onSurface }}>