Skip to content

Commit

Permalink
Merge branch 'main' into login-page
Browse files Browse the repository at this point in the history
  • Loading branch information
fmzbl committed Oct 11, 2024
2 parents ce68053 + 1f0e27e commit 7c19e0f
Show file tree
Hide file tree
Showing 19 changed files with 1,395 additions and 166 deletions.
148 changes: 135 additions & 13 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ robius-use-makepad = "0.1.0"
robius-open = "0.1.0"
## A fork of the `directories` crate that adds support for Android by using our `robius-android-env` crate.
robius-directories = { git = "https://github.com/project-robius/robius-directories", branch = "robius"}
robius-location = { git = "https://github.com/project-robius/robius-location" }

anyhow = "1.0"
chrono = "0.4"
Expand Down Expand Up @@ -175,6 +176,8 @@ section = "utils"
[package.metadata.packager.macos]
minimum_system_version = "11.0"
frameworks = [ ]
info_plist_path = "./packaging/Info.plist"
entitlements = "./packaging/Entitlements.plist"
signing_identity = "Developer ID Application: AppChef Inc. (SFVQ5V48GD)"


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ The following table shows which host systems can currently be used to build Robr

2. If you're building on **Linux** or **WSL** on Windows, install the required dependencies. Otherwise, proceed to step 3.
* `openssl`, `clang`/`libclang`, `binfmt`, `Xcursor`/`X11`, `asound`/`pulse`.

On a Debian-like Linux distro (e.g., Ubuntu), run the following:
```sh
sudo apt-get update
sudo apt-get install libssl-dev libsqlite3-dev pkg-config llvm clang libclang-dev binfmt-support libxcursor-dev libx11-dev libasound2-dev libpulse-dev
sudo apt-get install libssl-dev libsqlite3-dev pkg-config binfmt-support libxcursor-dev libx11-dev libasound2-dev libpulse-dev
```

3. Then, build and run Robrix (you can optionally add `--release` after `run`):
Expand Down Expand Up @@ -78,7 +78,7 @@ cargo run -- 'USERNAME' 'PASSWORD' ['HOMESERVER_URL']
* API version 33 or higher is required, which is Android 13 and up.
## Feature status tracker
## Feature status tracker
These are generally sorted in order of priority. If you're interested in helping out with anything here, please reach out via a GitHub issue or on our Robius matrix channel.

Expand All @@ -93,7 +93,7 @@ These are generally sorted in order of priority. If you're interested in helping
- [ ] Loading animation while waiting for pagination request: https://github.com/project-robius/robrix/issues/109
- [x] Stable positioning of events during simple timeline update
- [x] Stable positioning of events during complex/multi-part timeline update
- [ ] Re-spawn timeline as focused on an old event after a full timeline clear: https://github.com/project-robius/robrix/issues/103
- [ ] Re-spawn timeline as focused on an old event after a full timeline clear: https://github.com/project-robius/robrix/issues/103
- [x] Display simple text-only messages
- [x] Display image messages (PNG, JPEG)
- [x] Rich text formatting for message bodies
Expand Down
8 changes: 8 additions & 0 deletions packaging/Entitlements.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.personal-information.location</key>
<true/>
</dict>
</plist>
Loading

0 comments on commit 7c19e0f

Please sign in to comment.