Bumps [com.google.android.material:material](https://github.com/material-components/material-components-android) from 1.12.0 to 1.13.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.13.0</h2> <h1>New in 1.13.0!</h1> <ul> <li><code>DockedToolbarLayout</code> (<a href="https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/dockedtoolbar/DockedToolbarLayout.java">source</a>, <a href="https://github.com/material-components/material-components-android/blob/master/docs/components/DockedToolbar.md">doc</a>, <a href="https://m3.material.io/components/toolbars/overview">spec</a>)</li> <li><code>FloatingToolbarLayout</code> (<a href="https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/floatingtoolbar/FloatingToolbarLayout.java">source</a>, <a href="https://github.com/material-components/material-components-android/blob/master/docs/components/FloatingToolbar.md">doc</a>, <a href="https://m3.material.io/components/toolbars/overview">spec</a>)</li> <li><code>LoadingIndicator</code> (<a href="https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/loadingindicator/LoadingIndicator.java">source</a>, <a href="https://github.com/material-components/material-components-android/blob/master/docs/components/LoadingIndicator.md">doc</a>, <a href="https://m3.material.io/components/loading-indicator/overview">spec</a>)</li> <li><code>MaterialSplitButton</code> (<a href="https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/button/MaterialSplitButton.java">source</a>, <a href="https://github.com/material-components/material-components-android/blob/master/docs/components/SplitButton.md">doc</a>, <a href="https://m3.material.io/components/split-button/overview">spec</a>)</li> <li><code>MaterialButtonGroup</code> (<a href="https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/button/MaterialButtonGroup.java">source</a>, <a href="https://github.com/material-components/material-components-android/blob/master/docs/components/ButtonGroup.md">doc</a>, <a href="https://m3.material.io/components/button-groups/overview">spec</a>)</li> </ul> <h2>Important</h2> <ul> <li>Required <code>minSdkVersion</code> is now 21 or higher, for Material and <a href="https://developer.android.com/jetpack/androidx/versions#version-table">AndroidX</a>.</li> <li>Now built with <code>compileSdkVersion</code> 35, Android Gradle Plugin (AGP) 8.7.3, Gradle 8.9, and <code>android.nonTransitiveRClass=true</code>. <ul> <li>This means that <a href="https://developer.android.com/build/optimize-your-build#use-non-transitive-r-classes">R classes are no longer transitive</a> and resources must be fully qualified with their library path when used programmatically (see the <a href="https://github.com/material-components/material-components-android/blob/master/docs/getting-started.md#non-transitive-r-classes-referencing-library-resources-programmatically">Getting Started guide</a> for more info).</li> </ul> </li> <li>Material 3 Expressive has moved to the 1.14.0 versions of the library. To get a sneak peak, update to version <a href="https://github.com/material-components/material-components-android/releases/tag/1.14.0-alpha04">1.14.0-alpha04</a> and use the <code>Material3Expressive</code> themes/styles in conjunction with new components mentioned above.</li> </ul> <h2>Dependency Updates</h2> <table> <thead> <tr> <th>Dependency</th> <th>Previous version</th> <th>New version</th> </tr> </thead> <tbody> <tr> <td>androidx.appcompat:appcompat</td> <td>1.6.1</td> <td>1.7.0</td> </tr> <tr> <td>androidx.constraintlayout:constraintlayout</td> <td>2.0.1</td> <td>2.1.0</td> </tr> <tr> <td>androidx.dynamicanimation:dynamicanimation</td> <td>1.0.0</td> <td>1.1.0</td> </tr> <tr> <td>androidx.graphics:graphics-shapes</td> <td>N/A</td> <td>1.0.1</td> </tr> <tr> <td>com.android.tools.build:gradle</td> <td>7.4.2</td> <td>8.7.3</td> </tr> </tbody> </table> <h2>Library Updates</h2> <ul> <li><code>A11y</code> <ul> <li>Include "hour" and "minute" in announcements. For example: "Not checked, Hour - 11'0 clock. double tap to select Hour". (960bb4cb825c607c244d51ed4f302752912e37cc)</li> <li>Move responsibility of disabling hide on scroll to HideViewOnScrollBehavior and BottomAppBar (9c33476db68ffc15151b742516da2f7e8c4a98f7)</li> <li>Prevent hide on scroll when Talkback is on (d56070586102b66486f7f8697de077c3d7689922)</li> <li>Add missing 'button' mention to Talkback output for close icon. (79bd7d7b1ba46b0593c7758a81b02bdb5a1dbf67)</li> </ul> </li> <li><code>BottomNavigationView</code> <ul> <li>Update catalog demo to demonstrate adaptive bottom navigation bar (76936c42c43164b9930f616266f215bf7045003a)</li> <li>Fix early return in setItemGravity() (8a4d3c695117c46cf1c7235744d81196fb97110f)</li> </ul> </li> <li><code>BottomSheet</code> <ul> <li>Prevent ACTION_DOWN events on the BottomSheetHandleDragView from setting touchingScrollChild to true. (af7f254bf660704368d46e630d34a81c479fa1c7)</li> <li>Fix keyboard animation on Android 14 (a0b4dfa8769f98851efe97569c900f75eb0d5ef2)</li> <li>Fixed main catalog demo cutting off content when screen size is too small. (005687d1b64ea5542168183511861f7d023682da)</li> <li>Remove disruptive announcement "Drag handle double tapped"for BottomSheetDragHandleView. (95025c6728e49946c55d4b2688f97fa1d321cd02)</li> </ul> </li> <li><code>Carousel</code> <ul> <li>Recyclerview children do not inherit layout direction (ca0b870a344ef6e8f5fadc1ec417ef11f5b23340)</li> <li>Update keyline state if necessary if item size changes (52228c1b3bd50dd1a81bdaae40aeb93ef4d9ea9b)</li> <li>Update multi-browse strategy to always have at least 1 medium item (916e9085f9ca66704f907fd6af14d7e55df5d411)</li> <li>Recalculate keyline state if it doesn't match the current container size (d0f5d721a1f83b3b115d7f20bf865fb1df9063a3)</li> </ul> </li> <li><code>Checkbox</code> <ul> <li>Update translations. (771119111e58d101f2540f0bbbb572073ff9c053)</li> </ul> </li> <li><code>Chip</code> <ul> <li>Get default minTouchTargetSize from material attributes (436437a6fbf2d28658fea46320a350db33c7a455)</li> <li>Add a <code>show all</code> Chip for a11y (8e334213fc806b399ec014bdf68a3778064de308)</li> <li>Updated flow layout to correctly layout padding when in RTL. (1eaf483fc94f522546d349e6984e24c15d226d18)</li> <li>Fix close icon focus ripple (a7ff8c9006b69cbfcc346f74ed8a9ebad6661346)</li> </ul> </li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="84c0e6d6d4"><code>84c0e6d</code></a> Update library version to 1.13.0</li> <li><a href="46fde74a93"><code>46fde74</code></a> [Theme] Added missing Shape Attributes to Dialog themes</li> <li><a href="8f58fcc6fc"><code>8f58fcc</code></a> Update library version to 1.13.0-rc01</li> <li><a href="64867cf024"><code>64867cf</code></a> [ProgressIndicator] Updated to not throw exceptions for calling `setIndetermi...</li> <li><a href="f89b8afeb7"><code>f89b8af</code></a> [LoadingIndicator] Added a default static drawable, which is displayed when t...</li> <li><a href="d56330d6a1"><code>d56330d</code></a> Update library version to 1.13.0-beta01</li> <li><a href="1886cf0485"><code>1886cf0</code></a> [LoadingIndicator] Fixed the animation no constant rotation.</li> <li><a href="61c5a6d042"><code>61c5a6d</code></a> [Internal] Restore binary compatibility (ViewOverlay)</li> <li><a href="e722464dbc"><code>e722464</code></a> [MaterialButton] Updated the shapes of buttons when the orientation is changed.</li> <li><a href="df9074c4f5"><code>df9074c</code></a> [ButtonGroup] Fixed connected button groups to not morph button size.</li> <li>Additional commits viewable in <a href="https://github.com/material-components/material-components-android/compare/1.12.0...1.13.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:
./app/build.gradle.kts -
Set the following properties in your
local.propertiesfile:sdk.dir=/Users/<username>/Library/Android/sdk -
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.
If you get errors about rustc or cargo not being found, it can help to
explicitly specify the path to these in your shell environment. For example:
# ~/.zprofile or ~/.bash_profile
export RUST_ANDROID_GRADLE_RUSTC_COMMAND=$HOME/.cargo/bin/rustc
export RUST_ANDROID_GRADLE_CARGO_COMMAND=$HOME/.cargo/bin/cargo
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
Logs
To see all connlib related logs via ADB use:
adb logcat --format color "connlib *:S"
This will show logs of all levels from the connlib tag and silence logs from other tags (*:S).
