Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve/swap map with flatlist #1595

Merged
merged 10 commits into from
Oct 20, 2023
Merged

Improve/swap map with flatlist #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
45ce7d2
added FlatLists to Profile section task cards
desperado1802 Oct 19, 2023
f9e2f91
added flatLists to team screen task cards
desperado1802 Oct 19, 2023
289300d
added margin bottom to the end of the lists, also prevented bouncing …
desperado1802 Oct 19, 2023
c6d95fd
added flatList to Teams Dropdown
desperado1802 Oct 19, 2023
b9b6d70
added flatLists to profile screen filter tasks by status, label, prio…
desperado1802 Oct 19, 2023
ad9d8cd
added FlatLists to status, label, priority, size screens
desperado1802 Oct 19, 2023
6bc3205
added flatList to unassigned tasks in Teams Screen task card
desperado1802 Oct 19, 2023
a2895b2
added flatList to timer screen combobox
desperado1802 Oct 19, 2023
8ae2e21
added flatlists to tenant rendering when user logins
desperado1802 Oct 19, 2023
20b0d1e
Merge branch 'develop' into improve/swap-map-with-flatlist
desperado1802 Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Avatar } from "react-native-paper"
import { observer } from "mobx-react-lite"
import { limitTextCharaters } from "../../helpers/sub-text"
import { useNavigation } from "@react-navigation/native"
import { FlatList } from "react-native-gesture-handler"

export interface Props {
teams: IOrganizationTeamList[]
Expand Down Expand Up @@ -73,15 +74,22 @@ const DropDownSection: FC<Props> = observer(function DropDownSection({
{activeTeamId && (
<DropItem resized={resized} team={activeTeam} changeTeam={changeTeam} isActiveTeam={true} />
)}
{others.map((item, index) => (
<DropItem
key={index}
team={item}
resized={resized}
changeTeam={changeTeam}
isActiveTeam={false}
/>
))}

<FlatList
data={others}
scrollEnabled={false}
renderItem={({ item, index }) => (
<View style={{ width: "100%", justifyContent: "center", alignItems: "center" }}>
<DropItem
key={index}
team={item}
resized={resized}
changeTeam={changeTeam}
isActiveTeam={false}
/>
</View>
)}
/>
<TouchableOpacity
style={{ width: "90%", opacity: isAccountVerified ? 1 : 0.5 }}
onPress={() => onCreateTeam()}
Expand Down
27 changes: 16 additions & 11 deletions apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskLabelFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {
Text,
StyleSheet,
ViewStyle,
ScrollView,
Dimensions,
Animated,
Modal,
TouchableWithoutFeedback,
FlatList,
} from "react-native"
import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
Expand Down Expand Up @@ -92,16 +92,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
>
<View style={styles.secondContainer}>
<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
{allTaskLabels.map((item, idx) => (
<DropDownItem
selectedLabels={selectedLabels}
setSelectedLabels={setSelectedLabels}
label={item}
key={idx}
/>
))}
</ScrollView>
<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
<FlatList
bounces={false}
showsVerticalScrollIndicator={false}
data={allTaskLabels}
renderItem={({ item, index }) => (
<DropDownItem
selectedLabels={selectedLabels}
setSelectedLabels={setSelectedLabels}
label={item}
key={index}
/>
)}
/>
</View>
</View>
</View>
</TouchableWithoutFeedback>
Expand Down
27 changes: 16 additions & 11 deletions apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskPriorityFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {
Text,
StyleSheet,
ViewStyle,
ScrollView,
Dimensions,
Animated,
Modal,
TouchableWithoutFeedback,
FlatList,
} from "react-native"
import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
Expand Down Expand Up @@ -99,16 +99,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
>
<View style={styles.secondContainer}>
<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
{allTaskPriorities.map((item, idx) => (
<DropDownItem
selectedPriorities={selectedPriorities}
setSelectedPriorities={setSelectedPriorities}
priority={item}
key={idx}
/>
))}
</ScrollView>
<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
<FlatList
bounces={false}
showsVerticalScrollIndicator={false}
data={allTaskPriorities}
renderItem={({ item, index }) => (
<DropDownItem
selectedPriorities={selectedPriorities}
setSelectedPriorities={setSelectedPriorities}
priority={item}
key={index}
/>
)}
/>
</View>
</View>
</View>
</TouchableWithoutFeedback>
Expand Down
27 changes: 16 additions & 11 deletions apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskSizeFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {
Text,
StyleSheet,
ViewStyle,
ScrollView,
Dimensions,
Animated,
Modal,
TouchableWithoutFeedback,
FlatList,
} from "react-native"
import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
Expand Down Expand Up @@ -92,16 +92,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
>
<View style={styles.secondContainer}>
<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
{allTaskSizes.map((item, idx) => (
<DropDownItem
selectedSizes={selectedSizes}
setSelectedSizes={setSelectedSizes}
size={item}
key={idx}
/>
))}
</ScrollView>
<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
<FlatList
bounces={false}
showsVerticalScrollIndicator={false}
data={allTaskSizes}
renderItem={({ item, index }) => (
<DropDownItem
selectedSizes={selectedSizes}
setSelectedSizes={setSelectedSizes}
size={item}
key={index}
/>
)}
/>
</View>
</View>
</View>
</TouchableWithoutFeedback>
Expand Down
27 changes: 16 additions & 11 deletions apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskStatusFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {
Text,
StyleSheet,
ViewStyle,
ScrollView,
Dimensions,
Animated,
Modal,
TouchableWithoutFeedback,
FlatList,
} from "react-native"
import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
Expand Down Expand Up @@ -93,16 +93,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
>
<View style={styles.secondContainer}>
<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
{allStatuses.map((item, idx) => (
<DropDownItem
selectedStatus={selectedStatus}
setSelectedStatus={setSelectedStatus}
status={item}
key={idx}
/>
))}
</ScrollView>
<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
<FlatList
bounces={false}
showsVerticalScrollIndicator={false}
data={allStatuses}
renderItem={({ item, index }) => (
<DropDownItem
selectedStatus={selectedStatus}
setSelectedStatus={setSelectedStatus}
status={item}
key={index}
/>
)}
/>
</View>
</View>
</View>
</TouchableWithoutFeedback>
Expand Down
Loading