Merge pull request #1640 from keymapperorg/develop

Version 3.0.0

Author: sds100

.gitignore

@@ -89,4 +89,8 @@ Gemfile.lock
 app/play-service-account-key.json
 
 app/.env
-.venv/
+.venv/
+/.idea/appInsightsSettings.xml
+/.idea/AndroidProjectSystem.xml
+/.idea/runConfigurations.xml
+/.idea/studiobot.xml

.gitmodules

@@ -1,11 +1,19 @@
+## [3.0.0](https://github.com/sds100/KeyMapper/releases/tag/v3.0.0)
+
+_See the changes from previous 3.0 Beta releases._
+
+#### 10 April 2025
+
+- #1635 do not crash if the URL for the HTTP action is malformed
+
 ## [3.0 Beta 5](https://github.com/sds100/KeyMapper/releases/tag/v3.0.0-beta.5)
 
+_See the changes from previous 3.0 Beta releases as well._
+
 #### 6 April 2025
 
 - #1625 HTTP Request action.
 
-###
-
 ## Bug fixes
 
 - #1627 open camera app action does not work when device is locked

.idea/runConfigurations/app.xml

@@ -1,18 +1,10 @@
-**UPDATE**: I miss working on this project and Key Mapper still has so much potential so I am back! 😊
-> 
-> Well, working on this project was a fun ride 🎢! This project has taught me so much about Android, software development and how to collaborate with an online community. It has been my dream to lead a big FOSS project with people from all over the world so a **huge** thank you goes to everyone that spread the word and helped on GitHub along the way ☺.
->
-> ~~Unfortunately, I do not have any more time to work on this project - I'm now studying Computer Science at university and I have landed software-dev side jobs, which has taken up any free-time I did have to code on the side.~~
->
-> A special thank you goes to everyone in the [Team](https://docs.keymapper.club/#our-team) for their long-term
-> commitment to the project and for being so engaged with the community 👏 🎉.
-> The Discord server, website and app store listing will still be up! So don't worry, you can still map your keys to your heart's content. ❤
+![GitHub release](https://img.shields.io/github/release/keymapperorg/KeyMapper.svg)
+![fdroid release](https://img.shields.io/f-droid/v/io.github.sds100.keymapper.svg)
 
 <p align="center">
   <img width="200" height="auto" src="https://github.com/sds100/KeyMapper/blob/master/app/src/main/ic_launcher-web.png">
   <br/>
 
-Key Mapper is a free and open source Android app that can remap your buttons and fingerprint reader gestures. The aim of this project is to allow anyone to remap their buttons with (almost) infinite flexibility.
 </b>
 </p>
 
@@ -25,11 +17,47 @@ Key Mapper is a free and open source Android app that can remap your buttons and
 <noscript><a href="https://buy.stripe.com/00g16L9YEabldDWdQQ"><img alt="Donate using Stripe" src="https://img.shields.io/badge/Donate-Stripe-blueviolet?style=for-the-badge&logo=stripe"></a></noscript>
 </p>
 
-![GitHub release](https://img.shields.io/github/release/keymapperorg/KeyMapper.svg)
-![fdroid release](https://img.shields.io/f-droid/v/io.github.sds100.keymapper.svg)
+## Unleash your keys!
+
+Make custom macros on your keyboard or gamepad, make on-screen buttons in any app, and unlock new functionality from your volume buttons!
+
+Key Mapper supports a huge variety of buttons and keys:
+
+- ALL your phone buttons (volume AND side key)
+- Game controllers (D-pad, ABXY, and most others)
+- Keyboards
+- Headsets and headphones
+- Fingerprint sensor
+
+Most devices are already supported, with new devices being added over time. Let us know if it's not working for you and we can prioritize your device.
+
+Not currently supported:
+ - Mouse buttons
+ - Joysticks and triggers (LT,RT) on gamepads
+
+Not enough keys? Design your own on-screen button layouts and remap those just like real keys!
+
+## What shortcuts can I make?
 
-🎉 Check out the [website](https://docs.keymapper.club) for more information and help! 🎉
+With over 100 individual actions, the sky is the limit.
 
+Build complex macros with screen taps and gestures, keyboard inputs, open apps, control media, and even send intents directly to other apps.
+
+
+## How much control do I have?
+
+TRIGGERS: You decide how to trigger a key map. Long press, double press, press as many times as you like! Combine keys on different devices, and even include your on-screen buttons.
+
+ACTIONS: Design specific macros for what you want to do. Combine over 100 actions, and choose the delay between each one. Set repeating actions to automate and speed up slow tasks.
+
+CONSTRAINTS: You choose when key maps should run and when they shouldn't. Only need it in one specific app? Or when media is playing? On your lockscreen? Constrain your key maps for maximum control.
+
+
+## Links
+
+Come say hi in our [Discord community!](http://keymapper.club)
+
+Read the [documentation!](https://docs.keymapper.club/?utm_source=github)
 
 ## Translations
 
@@ -41,11 +69,9 @@ Key Mapper is a free and open source Android app that can remap your buttons and
 [![sk proofreading](https://img.shields.io/badge/dynamic/json?color=green&label=sk&style=flat&logo=crowdin&query=%24.progress.11.data.approvalProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-13864667-360045-update.json)](https://crowdin.com/project/key-mapper)
 [![zh-CN proofreading](https://img.shields.io/badge/dynamic/json?color=green&label=zh-CN&style=flat&logo=crowdin&query=%24.progress.15.data.approvalProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-13864667-360045-update.json)](https://crowdin.com/project/key-mapper)
 
-
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=keymapperorg/KeyMapper&type=Date)](https://star-history.com/#keymapperorg/KeyMapper&Date)
-
-### How do I contribute?
+[![Star History Chart](https://api.star-history.com/svg?repos=keymapperorg/KeyMapper&type=Date)](https://www.star-history.com/#keymapperorg/KeyMapper&Date)
+## Contributing
 There are many ways to help with this project. 😃
-Check out the contributing guide in the [documentation](https://docs.keymapper.club).
+Check out the contributing guide in the [documentation.](https://docs.keymapper.club/contributing/introduction/?utm_source=github)

CHANGELOG.md

@@ -5,6 +5,7 @@ Key Mapper 3.0 is here! 🎉
 🗂️ Grouping key maps into folders with shared constraints.
 
 🔦 You can now change the flashlight brightness. Tip: use the constraint for when the flashlight is showing to remap your volume buttons to change the brightness.
+
 🛜 Send HTTP requests with a new action.
 
 ❤️ There are also tonnes of improvements to make your key mapping experience more enjoyable.

README.md

@@ -777,7 +777,7 @@ class CreateActionDelegate(
                     httpRequestBottomSheetState = ActionData.HttpRequest(
                         description = "",
                         method = HttpMethod.GET,
-                        url = "",
+                        url = "http://",
                         body = "",
                         authorizationHeader = "",
                     )

app/src/main/assets/whats-new.txt

@@ -43,6 +43,7 @@ import io.github.sds100.keymapper.system.network.HttpMethod
 import io.github.sds100.keymapper.util.ui.compose.KeyMapperDropdownMenu
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -106,6 +107,7 @@ private fun HttpRequestBottomSheet(
     val descriptionEmptyErrorString =
         stringResource(R.string.action_http_request_description_empty_error)
     val urlEmptyErrorString = stringResource(R.string.action_http_request_url_empty_error)
+    val malformedUrlErrorString = stringResource(R.string.action_http_request_malformed_url_error)
 
     var descriptionError: String? by rememberSaveable { mutableStateOf(null) }
     var urlError: String? by rememberSaveable { mutableStateOf(null) }
@@ -272,6 +274,10 @@ private fun HttpRequestBottomSheet(
                             urlError = urlEmptyErrorString
                         }
 
+                        if (state.url.toHttpUrlOrNull() == null) {
+                            urlError = malformedUrlErrorString
+                        }
+
                         if (descriptionError == null && urlError == null) {
                             onDoneClick()
                         }

app/src/main/java/io/github/sds100/keymapper/actions/CreateActionDelegate.kt

@@ -160,6 +160,7 @@ fun KeyMapListAppBar(
                 actions = {
                     AppBarActions(
                         onHelpClick,
+                        onSortClick,
                         onSettingsClick,
                         onAboutClick,
                         onExportClick,
@@ -253,11 +254,13 @@ fun KeyMapListAppBar(
                         AnimatedVisibility(!state.isEditingGroupName) {
                             AppBarActions(
                                 onHelpClick,
+                                onSortClick,
                                 onSettingsClick,
                                 onAboutClick,
                                 onExportClick,
                                 onImportClick,
                                 showDeleteGroup = true,
+                                showSort = true,
                                 onDeleteGroupClick = {
                                     showDeleteGroupDialog = true
                                 },
@@ -529,11 +532,13 @@ private fun SelectingAppBar(
 @Composable
 private fun AppBarActions(
     onHelpClick: () -> Unit,
+    onSortClick: () -> Unit,
     onSettingsClick: () -> Unit,
     onAboutClick: () -> Unit,
     onExportClick: () -> Unit,
     onImportClick: () -> Unit,
     showDeleteGroup: Boolean = false,
+    showSort: Boolean = false,
     onDeleteGroupClick: () -> Unit = {},
 ) {
     var expandedDropdown by rememberSaveable { mutableStateOf(false) }
@@ -555,6 +560,10 @@ private fun AppBarActions(
 
         AppBarDropdownMenu(
             expanded = expandedDropdown,
+            onSortClick = {
+                expandedDropdown = false
+                onSortClick()
+            },
             onSettingsClick = {
                 expandedDropdown = false
                 onSettingsClick()
@@ -573,6 +582,7 @@ private fun AppBarActions(
             },
             onDismissRequest = { expandedDropdown = false },
             showDeleteGroup = showDeleteGroup,
+            showSort = showSort,
             onDeleteGroupClick = {
                 expandedDropdown = false
                 onDeleteGroupClick()
@@ -810,12 +820,14 @@ private fun selectedTextTransition(
 @Composable
 private fun AppBarDropdownMenu(
     expanded: Boolean,
+    onSortClick: () -> Unit = {},
     onSettingsClick: () -> Unit = {},
     onAboutClick: () -> Unit = {},
     onExportClick: () -> Unit = {},
     onImportClick: () -> Unit = {},
     onDismissRequest: () -> Unit = {},
     showDeleteGroup: Boolean = false,
+    showSort: Boolean = false,
     onDeleteGroupClick: () -> Unit = {},
 ) {
     DropdownMenu(
@@ -830,6 +842,14 @@ private fun AppBarDropdownMenu(
             )
         }
 
+        if (showSort) {
+            DropdownMenuItem(
+                leadingIcon = { Icon(Icons.AutoMirrored.Rounded.Sort, contentDescription = null) },
+                text = { Text(stringResource(R.string.home_app_bar_sort)) },
+                onClick = onSortClick,
+            )
+        }
+
         DropdownMenuItem(
             leadingIcon = { Icon(Icons.Rounded.Settings, contentDescription = null) },
             text = { Text(stringResource(R.string.home_menu_settings)) },

app/src/main/java/io/github/sds100/keymapper/actions/HttpRequestBottomSheet.kt

@@ -170,6 +170,8 @@ class AndroidNetworkAdapter(
         } catch (e: IOException) {
             Timber.e(e)
             return Error.UnknownIOError
+        } catch (e: IllegalArgumentException) {
+            return Error.MalformedUrl
         }
     }
 }