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

Toasts no longer cover bottom toolbar #37

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Toasts no longer cover bottom toolbar #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
REACT_APP_VERSION=1.4.0
REACT_APP_VERSION=1.4.1
8 changes: 4 additions & 4 deletions ios/App/App.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = LS6BR8Q859;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = LinkThing;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.4.0;
MARKETING_VERSION = 1.4.1;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = com.moscardino.LinkThing;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -371,13 +371,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = LS6BR8Q859;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = LinkThing;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.4.0;
MARKETING_VERSION = 1.4.1;
PRODUCT_BUNDLE_IDENTIFIER = com.moscardino.LinkThing;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
107 changes: 44 additions & 63 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "link-thing",
"version": "1.4.0",
"version": "1.4.1",
"private": true,
"dependencies": {
"@capacitor-community/app-react": "^0.1.0",
Expand All @@ -14,8 +14,8 @@
"@capacitor/preferences": "^5.0.0",
"@capacitor/share": "^5.0.0",
"@capacitor/status-bar": "^5.0.0",
"@ionic/react": "^7.0.6",
"@ionic/react-router": "^7.0.6",
"@ionic/react": "^7.5.0",
"@ionic/react-router": "^7.5.0",
"@tanstack/react-query": "^4.24.4",
"@types/node": "^12.19.15",
"@types/react": "^18.0.17",
Expand Down
5 changes: 2 additions & 3 deletions src/components/BookmarkListItemOptions/EditOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ interface EditOptionProps {
}

const EditOption = ({ id, listRefresh, slidingRef, containingPage }: EditOptionProps) => {
const handleEdiModalDismiss = async (anyChanges: boolean) => {
const handleEditModalDismiss = async (anyChanges: boolean) => {
if (anyChanges)
await listRefresh();

dismissEditModal();
await slidingRef.current?.close();
};

const [showEditModal, dismissEditModal] = useIonModal(EditPage, { id, dismiss: handleEdiModalDismiss });

const [showEditModal, dismissEditModal] = useIonModal(EditPage, { id, dismiss: handleEditModalDismiss });

const handleEditOptionClick = async () => {
showEditModal({
Expand Down
1 change: 1 addition & 0 deletions src/components/BookmarkListItemOptions/ToggleReadOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const ToggleReadOption = ({ id, unread, slidingRef, listRefresh }: ToggleReadOpt
icon: unread ? bookmarkOutline : bookmark,
color: "medium",
duration: 3000,
positionAnchor: 'FooterToolbar',
buttons: [{
text: 'Ok',
handler: async () => dismissToast()
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const ListPage = () => {

const footerToolbar = !showSearch
? (
<IonToolbar>
<IonToolbar id="FooterToolbar">
<IonSegment
value={viewMode?.toString()}
onIonChange={(e) => setViewMode((e.detail.value || 'unread') as ViewMode)}
Expand Down