[//]: # (dependabot-start) ⚠️ **Dependabot is rebasing this PR** ⚠️ Rebasing might not happen immediately, so don't worry if this takes some time. Note: if you make any changes to this PR yourself, they will take precedence over the rebase. --- [//]: # (dependabot-end) Bumps [com.google.android.material:material](https://github.com/material-components/material-components-android) from 1.8.0 to 1.11.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/material-components/material-components-android/releases">com.google.android.material:material's releases</a>.</em></p> <blockquote> <h2>1.11.0</h2> <h1>Important</h1> <p>Elevation Overlays within default component styles have been replaced by the new <a href="https://material.io/blog/tone-based-surface-color-m3">Tonal Surface Color system</a>. Instead of blending the Primary color with the Surface color based on an elevation value, components now use a specific Surface color role that can be more easily understood and customized.</p> <p>Documentation for the affected components and which Surface color roles they use has been updated in <a href="2114a11378</a>.</p> <h1>What's new since 1.10.0</h1> <ul> <li>New <a href="https://material.io/blog/tone-based-surface-color-m3">Tonal Surface Color system</a>! Check out the <a href="https://material.io/blog/tone-based-surface-color-m3">design guidance</a> and the <a href="2114a11378">commit with documentation updates</a> for more details.</li> <li>New Carousel variants! 1.11.0 introduces three new Carousel variants: center-aligned hero, uncontained, and fullscreen. Check out the <a href="https://github.com/material-components/material-components-android/blob/master/docs/components/Carousel.md">Carousel documentation</a> for more details.</li> </ul> <h2>Dependency Updates</h2> <p>None.</p> <p><em>Note: Earlier versions of 1.11.0 used other versions of the <code>androidx.activity</code> 1.8.0 library dependency, but there is no change in the dependency from 1.10.0, the last stable MDC library version.</em></p> <h2>Library Updates</h2> <ul> <li><code>Badging</code> <ul> <li>Adjusted badge vertical offset for certain components to fit design requirements (78cc54b8c39da437732ff3d7c96de8f345e09348)</li> <li>Added note in attachBadgeDrawable method docs about menu item views being re-used when there is a structural change in the menu. Since badges are attached to the views, this may change the menu item that the badge is intended for (5e6ea582801ebfe2af8457261581a2ad43c8051a)</li> </ul> </li> <li><code>BottomNavigationView</code> <ul> <li>Set badges to be null instead of removing them from the sparse array so that removing badges before restoring badge states will not override the current state (9f2e6864d2170d633709e7aa66b9e8e178352ef0)</li> </ul> </li> <li><code>BottomSheet</code> <ul> <li>Fix sheet corners animation (de271320e4ba046c73e35e18f687ee4637f3a6ac)</li> </ul> </li> <li><code>Carousel</code> <ul> <li>Ensure that extra small size is not larger than the large size (17baf71972016cf4608d9c83b902bb2debee585b)</li> <li>Fixed crash when recyclerview has a size of zero. (26c31292012868d7e9889f6ecee7559c61caa5b2)</li> <li>When navigating with keyboard, scroll focused item to nearest focal keyline, not the first focal keyline (fb9c1c6edfbdbe4791043a128c03a7fad5fd99f0)</li> <li>Force hero strategy to be start-aligned if there are not enough items to make it center-aligned (9a2347bda5312dd6dc3ab7818a6f71297dcf018b)</li> <li>Add logic for multibrowse strategy to change strategy when number of items is less than the number of keylines (cbb380df61f8eb66273043b437582c8058df7088)</li> <li>Fixed focus order when using keyboard navigation for hero carousels. (0356f24a63b5c47ee23cbf5c0fca4d817e4d6acd)</li> <li>Cleaning up multi-browse strategy and removing compact arrangement (ed4647d5dfa42876063521546de2dbcf71914e01)</li> <li>Disallowing center aligned hero strategy with only 2 items since it does not make any sense. With only 2 items there can only be a start state and end state with the hero strategy. (d5d604d0ccfd73b4345dbea8fd3f833410fd2958)</li> <li>Fix issue with uncontained carousel not having a proper end scroll value due to assumption made in end scroll calculation (8cb444b26856fdb8b0c894eccbf90133efc2a2b6)</li> <li>Added tests for hero and multibrowse strategies when the carousel container is very small. (8312162f533d1c9fc9e9b15ceca58e3d1d4b61b5)</li> <li>Update scroll offset to scroll to the estimated position that it was at upon an initial load (4a6ae4d0b6969311b41b3878e3c0e7f7a0824a72)</li> <li>Fixed strategies crashing when there is not enough available space for a large and a small item (c418063205d74233a6235d7f7fd39be7deeb4bc7)</li> <li>Tweak uncontained strategy logic to adjust medium size items to improve motion (93660d424139642320c85a098f0fb728126d4838)</li> <li>Fixed formatted for KeylineState and KeylineStateList (b80d9a5ef4d93567554d5aac85c4070b4577d9fc)</li> <li>Fixed keyline shifting in RTL for uncontained carousels (71517147110227e8032f5b064d6b59c5e3f117de)</li> <li>Reduce the number of truncations in intermediate calculations (4ce7e4c8fa84ce05a6c34591855dd1207e44e42b)</li> <li>Update vertical scroll speed to be faster (c6ea2d404023ca1a92cb95eb3f177579df1c2d28)</li> <li>Fix some a11y bugs in Carousel (3d84841caddd6e0127e67721844a3900225ab3a9)</li> <li>Center aligned uncontained carousel (b6f6eb555a0477322aa1ab4115f90d74d25a2266)</li> <li>Add left-aligned uncontained strategy (9d81cac125144576501ca19dafa835625e5cf5c7)</li> <li>Fix orientation not correct in item decoration calculations (966f7daec9d02092aadc63324212be9ae6dc8f2a)</li> <li>Update mask size on size change if mask x percentage has been set (dc91b39d7c9af5a531a4f2f761297c6e44b8f08c)</li> <li>Fix issue with next carousel item not being masked properly (a16f180ce7da65107305ba3a8c85db3e149767c1)</li> <li>Add a layout listener to recyclerview to refresh keyline state upon size change (ff528621b3b550979c64f41aaec47438de30f061)</li> <li>Remove default list from Carousel catalog demos as it is not an example of a carousel (0171624c16c799ca4e2dbe01e647a706fe7b895e)</li> </ul> </li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="967e682326"><code>967e682</code></a> [Release] Updated library version to 1.11.0.</li> <li><a href="8bf55e7cb2"><code>8bf55e7</code></a> [Release] Update library version to 1.11.0-rc01</li> <li><a href="4b669c1289"><code>4b669c1</code></a> [Release] Bump MDC library version to 1.11.0-beta01</li> <li><a href="541df074a7"><code>541df07</code></a> [Color] Delete unused contrast resources</li> <li><a href="ad63d3ff7e"><code>ad63d3f</code></a> [M3][Color] Introduce U color tokens</li> <li><a href="2590c42764"><code>2590c42</code></a> [TextInputLayout] Fix editText paddings on pre-Lollipop</li> <li><a href="17baf71972"><code>17baf71</code></a> [Carousel] Ensure that extra small size is not larger than the large size</li> <li><a href="ad2b5f8f8b"><code>ad2b5f8</code></a> [Docs][Predictive Back] Add note to clarify that automatic back handling in c...</li> <li><a href="2c539524ec"><code>2c53952</code></a> [Catalog][BottomSheet] Use BottomSheetDialogFragment</li> <li><a href="26c3129201"><code>26c3129</code></a> [Carousel] Fixed crash when recyclerview has a size of zero.</li> <li>Additional commits viewable in <a href="https://github.com/material-components/material-components-android/compare/1.8.0...1.11.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Firezone Android client
This README contains instructions for building and testing the Android client locally.
Dev Setup
-
Install your JDK 17 of choice. We recommend just updating your CLI environment to use the JDK bundled in Android Studio to ensure you're using the same JDK on the CLI as Android Studio.
-
Install the Android SDK through Android Studio.
- Open Android studio, go to Android Studio > Preferences
- Search for
sdk - Find the
Android SDKnav item underSystem Settingsand select - Click the
Editbutton next to theAndroid SDK Locationfield - Follow the steps presented to install Android SDK
-
Install
NDKusing Android StudioTo see which version is installed, make sure to select the
Show Package Detailscheckbox in theAndroid SDKsettings page in Android StudioMake sure the correct NDK version is installed by looking at:
../../rust/connlib/clients/android/connlib/build.gradle.kts -
Set the following ENV variables in the start up config for your shell:
JAVA_HOME=/Applications/Android\ Studio.app/Contents/jbr/Contents/Home ANDROID_HOME=/Users/<username>/Library/Android/sdk NDK_HOME=$ANDROID_HOME/ndk-bundle PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin -
Make sure the following Rust targets are installed into the correct toolchain.
aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi i686-linux-android x86_64-linux-androidEnsure you've activated the correct toolchain version for your local environment with
rustup default <toolchain>(find this from the root/rust/rust-toolchain.tomlfile), then run:rustup target add aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi i686-linux-android x86_64-linux-android -
Perform a test build:
./gradlew assembleDebug. -
Add your debug signing key's SHA256 fingerprint to the portal's
assetlinks.jsonfile. This is required for the App Links to successfully intercept the Auth redirect../gradlew signingReport
Release Setup
We release from GitHub CI, so this shouldn't be necessary. But if you're looking
to test the release variant locally:
- Download the keystore from 1Pass and save to
app/.signing/keystore.jksdir. - Download firebase credentials from 1Pass and save to
app/.signing/firebase.json - Now you can execute the
*Releasetasks with:
export KEYSTORE_PATH="$(pwd)/app/.signing/keystore.jks"
export FIREBASE_CREDENTIALS_PATH="$(pwd)/app/.signing/firebase.json"
HISTCONTROL=ignorespace # prevents saving the next line in shell history
KEYSTORE_PASSWORD='keystore_password' KEYSTORE_KEY_PASSWORD='keystore_key_password' ./gradlew assembleRelease
