Various fixes (Memmy-App#570)

flx-sta · Jul 11, 2023 · 15af3e4 · 15af3e4
1 parent 17101cc
commit 15af3e4
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/Stack.tsx b/Stack.tsx
@@ -95,13 +95,20 @@ function FeedStackScreen() {
             title: "Saved Posts",
           }}
         />
-        <ProfileStack.Screen
+        <FeedStack.Screen
           name="ViewAccounts"
           component={ViewAccountsScreen}
           options={{
             title: "Manage Accounts",
           }}
         />
+        <FeedStack.Screen
+          name="EditAccount"
+          component={EditAccountScreen}
+          options={{
+            title: "Edit Account",
+          }}
+        />
       </FeedStack.Group>
 
       <FeedStack.Group

diff --git a/src/components/common/AvatarUsername.tsx b/src/components/common/AvatarUsername.tsx
@@ -98,7 +98,7 @@ function AvatarUsername({
             style={{ height: 18, width: 18, borderRadius: 100 }}
           />
         ) : (
-          <IconUser color={theme.colors.app.textSecondary} />
+          <IconUser color={theme.colors.app.textSecondary} size={18} />
         ))}
       <VStack>
         <HStack space={0.5}>

diff --git a/src/components/common/SwipeableRow/ReplyOption.tsx b/src/components/common/SwipeableRow/ReplyOption.tsx
@@ -219,6 +219,5 @@ const styles = StyleSheet.create({
   },
   background: {
     ...StyleSheet.absoluteFillObject,
-    borderWidth: 1,
   },
 });
diff --git a/src/components/common/SwipeableRow/VoteOption.tsx b/src/components/common/SwipeableRow/VoteOption.tsx
@@ -233,6 +233,5 @@ const styles = StyleSheet.create({
   },
   background: {
     ...StyleSheet.absoluteFillObject,
-    borderWidth: 1,
   },
 });
diff --git a/src/components/screens/Feed/components/FeedView.tsx b/src/components/screens/Feed/components/FeedView.tsx
@@ -1,36 +1,36 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import { PostView } from "lemmy-js-client";
-import { HStack, useTheme, View } from "native-base";
-import { Button, StyleSheet } from "react-native";
-import { FlashList, ListRenderItemInfo } from "@shopify/flash-list";
 import { useNavigation, useScrollToTop } from "@react-navigation/native";
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
+import { FlashList, ListRenderItemInfo } from "@shopify/flash-list";
+import { PostView } from "lemmy-js-client";
+import { HStack, View, useTheme } from "native-base";
+import React, { useEffect, useMemo, useRef, useState } from "react";
+import { Button, StyleSheet } from "react-native";
 import {
-  IconBaselineDensitySmall,
   IconBaselineDensityMedium,
+  IconListDetails,
 } from "tabler-icons-react-native";
-import FeedItem from "./FeedItem/FeedItem";
 import { useAppDispatch, useAppSelector } from "../../../../../store";
+import { removeReadPosts } from "../../../../helpers/LemmyHelpers";
+import { ExtensionType, getLinkInfo } from "../../../../helpers/LinkHelper";
+import { UseFeed } from "../../../../hooks/feeds/useFeed";
 import {
   selectFeed,
   setDropdownVisible,
 } from "../../../../slices/feed/feedSlice";
-import { UseFeed } from "../../../../hooks/feeds/useFeed";
 import { setSetting } from "../../../../slices/settings/settingsActions";
 import { selectSettings } from "../../../../slices/settings/settingsSlice";
-import FeedSortButton from "./FeedSortButton";
-import { Community, FeedOverflowButton } from "./FeedOverflowButton";
+import HeaderIconButton from "../../../common/Buttons/HeaderIconButton";
+import HideReadFAB from "../../../common/Buttons/HideReadFAB";
+import LoadingErrorView from "../../../common/Loading/LoadingErrorView";
+import LoadingView from "../../../common/Loading/LoadingView";
 import NoResultView from "../../../common/NoResultView";
-import CompactFeedItem from "./CompactFeedItem/CompactFeedItem";
-import { ExtensionType, getLinkInfo } from "../../../../helpers/LinkHelper";
 import RefreshControl from "../../../common/RefreshControl";
-import FeedHeaderDropdownDrawer from "./FeedHeaderDropdownDrawer";
-import LoadingView from "../../../common/Loading/LoadingView";
-import LoadingErrorView from "../../../common/Loading/LoadingErrorView";
+import CompactFeedItem from "./CompactFeedItem/CompactFeedItem";
 import FeedFooter from "./FeedFooter";
-import { removeReadPosts } from "../../../../helpers/LemmyHelpers";
-import HeaderIconButton from "../../../common/Buttons/HeaderIconButton";
-import HideReadFAB from "../../../common/Buttons/HideReadFAB";
+import FeedHeaderDropdownDrawer from "./FeedHeaderDropdownDrawer";
+import FeedItem from "./FeedItem/FeedItem";
+import { Community, FeedOverflowButton } from "./FeedOverflowButton";
+import FeedSortButton from "./FeedSortButton";
 
 interface FeedViewProps {
   feed: UseFeed;
@@ -96,7 +96,7 @@ function FeedView({ feed, community = false, header }: FeedViewProps) {
             <HeaderIconButton
               icon={
                 compactView ? (
-                  <IconBaselineDensitySmall />
+                  <IconListDetails />
                 ) : (
                   <IconBaselineDensityMedium />
                 )

diff --git a/src/components/screens/Settings/Content/ContentScreen.tsx b/src/components/screens/Settings/Content/ContentScreen.tsx
@@ -73,7 +73,7 @@ function ContentScreen({
                 "Most Comments",
                 "Cancel",
               ];
-              const cancelButtonIndex = 6;
+              const cancelButtonIndex = options.length - 1;
 
               showActionSheetWithOptions(
                 {
@@ -127,7 +127,7 @@ function ContentScreen({
             accessory="DisclosureIndicator"
             onPress={() => {
               const options = ["All", "Local", "Subscribed", "Cancel"];
-              const cancelButtonIndex = 3;
+              const cancelButtonIndex = options.length - 1;
 
               showActionSheetWithOptions(
                 {