Upgrade makepade to get our new Android AAB build tooling

Cargo.toml

@@ -14,11 +14,8 @@ version = "1.0.0-alpha.1"
 metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
-# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
-# makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }
-
-makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "dock_collision_issues", features = ["serde"] }
-makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "dock_collision_issues" }
+makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
+makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }
 
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
@@ -208,6 +205,15 @@ strip = true
 debug-assertions = false
 
 
+
+## Configuration for cargo makepad (`cargo makepad android build-aab`).
+## The `[package.metadata.packager]` section below already sets the package ID
+## and product name, so we just need a version code for Google Play Store builds.
+[package.metadata.makepad.android]
+## Specifying "auto" will set it to a format like 'YYYYMMDDHH'.
+version_code = "auto"
+
+
 ## Configuration for `cargo packager`
 [package.metadata.packager]
 product_name = "Robrix"

resources/android/AndroidManifest.xml.template

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Robrix's AndroidManifest, used by `cargo makepad android build-aab` (and
+  `build`). cargo-makepad substitutes the {token} placeholders below at build
+  time. See `cargo makepad android help` for the supported tokens.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="{package_id}"
+    android:versionCode="{version_code}"
+    android:versionName="{version_name}">
+
+    <uses-sdk
+        android:minSdkVersion="{min_sdk_version}"
+        android:targetSdkVersion="{target_sdk_version}" />
+
+    <!-- OpenGL ES 2.0 is Makepad 2.0's minimum requirement. -->
+    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+
+    <!-- Networking: required for talking to a Matrix homeserver. -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <!-- Once we support file/image attachments, we can re-enable these.
+         Media access for image/video attachments. READ_EXTERNAL_STORAGE only
+         applies on pre-Android-13 devices; READ_MEDIA_IMAGES/_VIDEO is the
+         scoped replacement on API 33+.
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    -->
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    <!-- Location is optional, just used for opt-in location sharing. -->
+    <uses-feature android:name="android.hardware.location" android:required="false" />
+    <uses-feature android:name="android.hardware.location.gps" android:required="false" />
+    <uses-feature android:name="android.hardware.location.network" android:required="false" />
+
+    <application
+        android:label="{label}"
+        android:icon="@mipmap/ic_launcher"
+        android:theme="@style/MakepadAppTheme"
+        android:allowBackup="true"
+        android:supportsRtl="true"
+        android:debuggable="{debuggable}"
+        android:largeHeap="true"
+        tools:targetApi="{target_sdk_version}">
+
+        <meta-data android:name="android.max_aspect" android:value="2.1" />
+
+        <activity
+            android:name=".{class_name}"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustNothing|stateUnchanged"
+            android:theme="@style/MakepadLaunchTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+        </intent>
+    </queries>
+</manifest>

src/login/login_screen.rs

@@ -11,7 +11,7 @@ script_mod! {
     use mod.prelude.widgets.*
     use mod.widgets.*
 
-    mod.widgets.IMG_APP_LOGO = crate_resource("self://resources/icon_512.png")
+    mod.widgets.IMG_APP_LOGO = crate_resource("self://resources/robrix_logo_alpha.png")
     mod.widgets.ICON_EYE_OPEN   = crate_resource("self://resources/icons/eye_open.svg")
     mod.widgets.ICON_EYE_CLOSED = crate_resource("self://resources/icons/eye_closed.svg")