From b21bf3fffd1b158972fa58b401173cfeb6e282bb Mon Sep 17 00:00:00 2001 From: Zitrone <74491719+quantenzitrone@users.noreply.github.com> Date: Thu, 19 Sep 2024 21:57:26 +0000 Subject: [PATCH] Improve bone layout (#748) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * shell.nix: fix gradle error error was: > \> Task :compileDebugJavaWithJavac FAILED > error: Source option 7 is no longer supported. Use 8 or later. > error: Target option 7 is no longer supported. Use 8 or later. fixed by overriding the jdk version for gradle to openjdk17 * layouts/latn_bone: fix layout - fix alignment with tabs mess - make like actual bone layout, instead of trying to fit it into a 10 key wide keyboard - fixes missing üäö - fix missing $ - moves q and ß where they belong - remove all of the diacritic keys (they can be added through the settings as extra keys) - kept the number row extra keys integration into top row - kept the idea of compressing , and . into the swipe actions of the bottom row - kept the number keys as key4 in the layer4 positions (instead of moving them to a number row, which i also considered) --- check_layout.output | 2 +- shell.nix | 3 +- srcs/layouts/latn_bone.xml | 94 ++++++++++++++++++++++++-------------- 3 files changed, 63 insertions(+), 36 deletions(-) diff --git a/check_layout.output b/check_layout.output index 696f4b2..b70d9d8 100644 --- a/check_layout.output +++ b/check_layout.output @@ -64,7 +64,7 @@ Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], { # latn_bepo_fr 0 warnings # latn_bone -Layout includes some ASCII punctuation but not all, missing: $ +Layout doesn't define some important keys, missing: loc esc, loc tab Layout redefines the bottom row but some important keys are missing, missing: cursor_left, cursor_right, loc compose, loc end, loc home, loc page_down, loc page_up, loc switch_clipboard, loc switch_greekmath, loc voice_typing, switch_backward 2 warnings # latn_colemak diff --git a/shell.nix b/shell.nix index 82206c7..823edd5 100644 --- a/shell.nix +++ b/shell.nix @@ -15,12 +15,13 @@ let ANDROID_SDK_ROOT = "${android.androidsdk}/libexec/android-sdk"; + gradle = pkgs.gradle.override { java = jdk; }; # Without this option, aapt2 fails to run with a permissions error. gradle_wrapped = pkgs.runCommandLocal "gradle-wrapped" { nativeBuildInputs = with pkgs; [ makeBinaryWrapper ]; } '' mkdir -p $out/bin - ln -s ${pkgs.gradle}/bin/gradle $out/bin/gradle + ln -s ${gradle}/bin/gradle $out/bin/gradle wrapProgram $out/bin/gradle \ --add-flags "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${build_tools_version}/aapt2" ''; diff --git a/srcs/layouts/latn_bone.xml b/srcs/layouts/latn_bone.xml index b547a56..a99f338 100644 --- a/srcs/layouts/latn_bone.xml +++ b/srcs/layouts/latn_bone.xml @@ -1,46 +1,72 @@ + - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + +