Skip to content

Commit

Permalink
Merge pull request #500 from syphon-org/dev
Browse files Browse the repository at this point in the history
dev -> main
  • Loading branch information
ereio authored Jan 10, 2022
2 parents b56b0c0 + 58555d1 commit 8122d59
Show file tree
Hide file tree
Showing 105 changed files with 808 additions and 641 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
} catch(Exception e) {
Log.e(TAG, "Error registering plugin file_picker, com.mr.flutter.plugin.filepicker.FilePickerPlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.example.flutterimagecompress.FlutterImageCompressPlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin flutter_image_compress, com.example.flutterimagecompress.FlutterImageCompressPlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.jrai.flutter_keyboard_visibility.FlutterKeyboardVisibilityPlugin());
} catch(Exception e) {
Expand Down
84 changes: 78 additions & 6 deletions assets/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
"title-proxy-use-proxy": "Use a Proxy",
"title-proxy-host": "Modify Proxy Host",
"title-proxy-port": "Modify Proxy Port",
"title-lock-overlay": "Please enter passcode.",
"title-search-unencrypted": "Search Unencrypted",
"title-confirm-lock-overlay": "Please confirm passcode.",
"title-message-details": "Message Details",
"title-send-media-message": "Send Media Message",
"title-send-media-message-unencrypted": "Send Media Message (Unencrypted)",
"title-dialog-delete-keys": "Confirm Deleting Keys",
"title-dialog-confirm-linkout": "Confirm Opening Link",
"title-dialog-encryption": "Encrypt Chat?",
Expand All @@ -31,11 +37,16 @@
"title-dialog-terms-alpha": "Confirm Open Alpha Terms Of Service",
"title-dialog-email-requirement": "Email requirement",
"title-dialog-email-requirement-verified": "Email verification",
"title-dialog-accept-invite": "Accept Invite?",
"title-dialog-chat-color": "Select Chat Color",
"title-dialog-draft-preview": "Draft Preview",
"title-user-verification": "User verification",
"title-confirm-password": "Confirm Password",
"title-confirm-email": "Confirm Email",
"title-device-rename": "Rename a device",
"subtitle-proxy-use-proxy": "This will force all traffic leaving Syphon to do so via a proxy",
"subtitle-settings-sync-interval": "Amount of time in seconds the app wait\nbetween syncing",
"subtitle-settings-sync-toggle": "Toggle syncing with the matrix server",
"label-searching": "Searching…",
"label-search-homeservers": "Search for homeservers…",
"label-search-user": "Search for a user…",
Expand Down Expand Up @@ -63,6 +74,11 @@
"label-message-matrix-unencrypted": "Matrix message (unencrypted)",
"label-deleted-message": "This message was deleted",
"label-terms-of-service": "Terms of Service",
"label-search-unencrypted": "Search Unencrypted",
"label-about": "About",
"label-chat-settings": "Chat Settings",
"label-color": "Color",
"label-default-room-notification": "Default (Argon)",
"button-login": "log in",
"button-login-sso": "single sign on",
"button-save": "save",
Expand All @@ -87,6 +103,7 @@
"button-confirm-verification": "confirm verification",
"button-deactivate": "deactivate",
"button-reset-password": "reset password",
"button-dismiss": "Dismiss",
"button-text-agreement": "I Agree",
"button-text-see-users": "See All Users",
"button-text-login-question": "Already have a username?",
Expand All @@ -100,19 +117,64 @@
"button-text-invite": "Invite Friends",
"button-text-settings": "Settings",
"button-text-support": "Help",
"button-text-go-back": "go back",
"button-text-reject": "reject",
"button-text-accept": "accept",
"button-text-lets-encrypt": "let's encrypt",
"button-save-message-edit": "Save Message Edit",
"button-gallery": "Gallery",
"button-file": "File",
"button-contact": "Contact",
"button-location": "Location",
"list-item-chat-detail-toggle-direct-chat": "Direct Chat",
"list-item-chat-detail-notification-setting": "Notification Settings",
"list-item-chat-detail-notifications": "Notifications",
"list-item-chat-detail-notification-sound": "Notification Sound",
"list-item-chat-detail-privacy-status": "Privacy and Status",
"list-item-chat-detail-view-key": "View Encryption Key",
"list-item-settings-notification": "Notifications",
"list-item-settings-privacy": "Privacy",
"list-item-settings-sms": "SMS and MMS",
"list-item-settings-logout": "Logout",
"list-item-settings-proxy": "Proxy Settings",
"list-item-settings-proxy-host": "Host",
"list-item-settings-proxy-port": "Port",
"list-item-settings-sync-interval": "Sync Interval",
"list-item-settings-sync-toggle": "Toggle Syncing",
"list-item-user-details-invite-to-room": "Invite to Room",
"list-item-user-details-confirm-start-chat": "Chat with {}",
"list-item-user-details-send-message": "Send A Message",
"list-item-user-details-view-profile": "View Profile",
"list-item-user-details-unblock-user": "Unblock User",
"list-item-user-details-block-user": "Block User",
"list-item-image-options-photo-select-method": "Photo Select Method",
"list-item-image-options-take-photo": "Take Photo",
"list-item-image-options-pick-from-gallery": "Pick from Gallery",
"list-item-image-options-remove-photo": "Remove Photo",
"list-item-context-switcher-user-display-name": "{} (Encrypted User)",
"list-item-context-switcher-accounts": "Accounts",
"list-item-context-switcher-add-account": "Add Account",
"list-item-advanced-settings-licenses": "Open Source Licenses",
"list-item-advanced-settings-start-background": "Start Background Service",
"list-item-advanced-settings-stop-background": "Stop All Services",
"list-item-advanced-settings-test-notifications": "Test Notifications",
"list-item-advanced-settings-test-sync-loop": "Test Background Sync Loop",
"list-item-advanced-settings-force-function": "Force Function",
"list-item-sent": "Sent",
"list-item-received": "Received",
"list-item-via": "Via",
"list-item-from": "From",
"list-item-read-by": "Read By",
"alert-restart-app-effect": "You'll need to close and restart the app for this to take effect",
"alert-invite-user-unknown": "This user doesn't appear to exist within matrix, but you can attempt to invite them anyway.\n\nMake sure you have the correct name before trying.",
"alert-feature-in-progress": "🛠 This feature is coming soon",
"alert-message-failed": "Message Failed To Send",
"alert-homeserver-invalid": "This server failed the 'well-known' check. Make sure the server is configured correctly.",
"alert-hidden-read-receipts": "Hidden Read Receipts must be supported by your homeserver, or this will have the same effect as switching Read Receipts 'On'",
"alert-offline": "Looks like you may be offline. Check your connection and try again.",
"alert-unknown": "Unknown Error Occurred",
"alert-could-not-launch-url": "Could not launch {}",
"alert-no-images-found": "No Images Found.",
"prompt-homeserver-select": "Select your username and homeserver",
"prompt-confirm-deactivate": "Enter your password below to confirm deactivation",
"placeholder-topic": "No Topic Description",
Expand All @@ -138,9 +200,11 @@
"content-sync-interval": "Syncing works by submitting a long poll request to a matrix server. The sync interval is not how frequently it will sync, but how frequently it will attempt a new long poll request.",
"content-proxy-host": "The host for your proxy",
"content-proxy-port": "The port your proxy is listening on",
"content-dialog-confirm-password": "Please confirm your password (Default)",
"message-edited-append": " (Edited)",
"confirm-linkout": "Are you sure you want to open the following link?\n\n{}",
"confirm-delete-keys": "Are you sure you want to delete your encryption keys for this device? This is very destructive and will probably render all your encrypted messages undecryptable.",
"confirm-invite": "Are you sure you want to invite the following user to the following chat?",
"confirm-invite": "Are you sure you want to invite the following users?",
"confirm-invites-multiple": "Are you sure you want to invite the selected users to the following chat?",
"confirm-start-chat": "Even if you don't send a message, the user will still see your invite to chat.",
"confirm-attempt-chat": "Even if you don't send a message, the user will still see your invite to chat if they exist.\n\nDo you want to try chatting with this username?",
Expand Down Expand Up @@ -168,14 +232,22 @@
"warning-deactivate-account-final": "There is no way to recover this account after it's deleted. You will immediately be logged out of your account and it will become unavailable.\n\nThis is your final warning regarding deactivation. If you are sure, press deactivate below.",
"label-send-unencrypted": "Send unencrypted message",
"label-send-encrypted": "Send encrypted message",
"semnatics-image-intro": "Relaxed, lounging User",
"semnatics-image-private-message": "A person holding up a private message bubble",
"semnatics-image-intro-section-third": "People lounging around and messaging each other",
"semnatics-image-intro-section-four": "Two different people feeling confident and lookin' good",
"label-default": "Default",
"semantics-image-intro": "Relaxed, lounging User",
"semantics-image-private-message": "A person holding up a private message bubble",
"semantics-image-intro-section-third": "People lounging around and messaging each other",
"semantics-image-intro-section-four": "Two different people feeling confident and lookin' good",
"semantics-image-empty-chat-list": "Several tiny, cute monsters peering out behind foliage.",
"semantics-image-terms-of-service": "Hand holding a phone with a terms of service checkbox checked",
"semantics-image-signup-username": "Person resting elbow on I.D. card",
"semantics-image-password-reset": "Person resting arm ontop a letter with a checkbox inside",
"semantics-create-public-room": "Create A Public Room",
"label-proxy-host": "Hostname",
"label-proxy-port": "Port"
"label-proxy-port": "Port",
"label-password": "password",
"tooltip-search-users": "Search users",
"tooltip-profile-settings": "Profile and Settings",
"tooltip-search-chats": "Search Chats",
"tooltip-search-unencrypted": "Search Unencrypted",
"tooltip-cancel-reply": "Cancel Reply"
}
12 changes: 12 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [0.2.7](https://github.com/syphon-org/syphon/releases/tag/0.2.6) - 2021-12-27


### Added
- removes exif information for image uploads

### Fixed
- fixed sending images from the quick select menu
- fixed inviting users to chats
-


## [0.2.6](https://github.com/syphon-org/syphon/releases/tag/0.2.6) - 2021-12-27

### Fixed
Expand Down
12 changes: 6 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 2006;
CURRENT_PROJECT_VERSION = 2007;
DEVELOPMENT_TEAM = W98LUTKH5G;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -370,7 +370,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.2.5;
MARKETING_VERSION = 0.2.6;
PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -493,7 +493,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 2006;
CURRENT_PROJECT_VERSION = 2007;
DEVELOPMENT_TEAM = W98LUTKH5G;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -509,7 +509,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.2.5;
MARKETING_VERSION = 0.2.6;
PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand All @@ -526,7 +526,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 2006;
CURRENT_PROJECT_VERSION = 2007;
DEVELOPMENT_TEAM = W98LUTKH5G;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -542,7 +542,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.2.5;
MARKETING_VERSION = 0.2.6;
PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down
11 changes: 11 additions & 0 deletions lib/global/print.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ void _printJson(Map? jsonMap) {
debugPrint(prettyEvent, wrapWidth: 2048);
}

// TODO: convert with better tab completion
class Print {
static info(String content, {String? title}) => _printInfo(content, title: title);
static warn(String content, {String? title}) => _printWarning(content, title: title);
static error(String content, {String? title}) => _printError(content, title: title);
static debug(String content, {String? title}) => _printDebug(content, title: title);
static json(Map? json) => _printJson(json);
}

final log = Print();

PrintJson printJson = _printJson;
PrintDebug printInfo = _printInfo;
PrintDebug printDebug = _printDebug;
Expand Down
Loading

0 comments on commit 8122d59

Please sign in to comment.