fix progressbar

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

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/screens/WebviewScreen/WebviewScreen.tsx b/src/screens/WebviewScreen/WebviewScreen.tsx
@@ -36,6 +36,7 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
     if (!e.loading) {
       setTitle(e.title);
     }
+    setLoading(e.loading)
     setCurrentUrl(e.url);
     setCanGoBack(e.canGoBack);
     setCanGoForward(e.canGoForward);
@@ -74,7 +75,7 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
       <Appbar
         title={title}
         theme={theme}
-        loading={loading}
+        loading={loading && progress !== 1}
         currentUrl={currentUrl}
         canGoBack={canGoBack}
         canGoForward={canGoForward}
@@ -85,27 +86,16 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
           navigation.goBack();
         }}
       />
-      {menuVisible ? (
-        <Menu
-          theme={theme}
-          currentUrl={currentUrl}
-          webView={webViewRef}
-          setMenuVisible={setMenuVisible}
-        />
-      ) : null}
       <ProgressBar
         color={theme.primary}
         progress={progress}
-        visible={loading}
+        visible={loading && progress !== 1}
       />
       <WebView
         userAgent={getUserAgent()}
         ref={webViewRef}
         source={{ uri }}
-        onLoadProgress={({ nativeEvent }) => {
-          setProgress(nativeEvent.progress);
-          setLoading(nativeEvent.loading);
-        }}
+        onLoadProgress={({ nativeEvent }) => setProgress(nativeEvent.progress)}
         onNavigationStateChange={handleNavigation}
         injectedJavaScript={injectJavaScriptCode}
         setDisplayZoomControls={true}
@@ -115,6 +105,14 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
           setTempData(JSON.parse(nativeEvent.data))
         }
       />
+      {menuVisible ? (
+        <Menu
+          theme={theme}
+          currentUrl={currentUrl}
+          webView={webViewRef}
+          setMenuVisible={setMenuVisible}
+        />
+      ) : null}
     </>
   );
 };

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

diff --git a/src/screens/WebviewScreen/components/Menu.tsx b/src/screens/WebviewScreen/components/Menu.tsx
@@ -34,10 +34,10 @@ const Menu: React.FC<MenuProps> = ({
         right: 0,
         justifyContent: 'center',
         alignItems: 'center',
-        zIndex: 1,
+        //zIndex: 1,
       }}
     >
-      <View style={{ position: 'absolute', right: 0, paddingTop: top }}>
+      <View style={{ position: 'absolute', right: 0, top: top }}>
         <Pressable
           style={{ backgroundColor: theme.surface2, padding: 15 }}
           onPress={() => {