From 2d356f396b3e29edf389a71b9e9dab9d06ad39c7 Mon Sep 17 00:00:00 2001 From: PaddiM8 Date: Sat, 9 Jan 2021 01:19:52 +0100 Subject: [PATCH] Added button panel to kalk_web --- .../myapp/ExampleInstrumentedTest.java | 27 --------- .../getcapacitor/myapp/ExampleUnitTest.java | 17 ------ kalk_mobile/package-lock.json | 6 +- kalk_mobile/package.json | 2 +- kalk_mobile/www/index.html | 2 +- kalk_mobile/www/style/style.css | 1 - kalk_mobile/www/style/style.min.css | 2 +- kalk_mobile/www/style/style.sass | 1 - kalk_web/package.json | 2 +- kalk_web/src/KalkCalculator.svelte | 60 +++++++++---------- 10 files changed, 36 insertions(+), 84 deletions(-) delete mode 100644 kalk_mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java delete mode 100644 kalk_mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java diff --git a/kalk_mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/kalk_mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java deleted file mode 100644 index 8834b0a..0000000 --- a/kalk_mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.getcapacitor.myapp; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.getcapacitor.app", appContext.getPackageName()); - } -} diff --git a/kalk_mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/kalk_mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java deleted file mode 100644 index 4a45edf..0000000 --- a/kalk_mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.getcapacitor.myapp; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} diff --git a/kalk_mobile/package-lock.json b/kalk_mobile/package-lock.json index 6fd42f1..f21cfd0 100644 --- a/kalk_mobile/package-lock.json +++ b/kalk_mobile/package-lock.json @@ -268,9 +268,9 @@ "integrity": "sha512-HAWcL2dzOr5KY1/tXoHmMXkjvFuxwWXrljPyUkYtyzlQUKeeKbQkH0B7t9N0sAMw+n+9zw4nxiavPp7DbcKaNw==" }, "@paddim8/kalk-component": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@paddim8/kalk-component/-/kalk-component-1.0.8.tgz", - "integrity": "sha512-xaxhUlapu/r2DDE4zzP2UutvhoQLoObEDuDQHAEvMUdEh4UkZYPOPyd1BZiNnJ1u93TE216fznJMNaNpAF99Ug==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@paddim8/kalk-component/-/kalk-component-1.0.11.tgz", + "integrity": "sha512-pHeApcNdNskT7YL00u4CC/ivbGpOyQIEm4sdSeGPM7rJ/3cU60cjRmYLO8gGXjtJuSvzTFDgf8U6g+bEFVroYA==", "requires": { "@paddim8/kalk": "^1.4.2", "shadow-selection-polyfill": "^1.1.0" diff --git a/kalk_mobile/package.json b/kalk_mobile/package.json index 84b8b83..748838c 100644 --- a/kalk_mobile/package.json +++ b/kalk_mobile/package.json @@ -16,7 +16,7 @@ "@capacitor/android": "^2.4.5", "@capacitor/cli": "^2.4.5", "@capacitor/core": "^2.4.5", - "@paddim8/kalk-component": "^1.0.8" + "@paddim8/kalk-component": "^1.0.11" }, "devDependencies": { "@capacitor-community/electron": "^1.3.2", diff --git a/kalk_mobile/www/index.html b/kalk_mobile/www/index.html index 84f9cda..d677435 100644 --- a/kalk_mobile/www/index.html +++ b/kalk_mobile/www/index.html @@ -23,7 +23,7 @@
- + kalk Type 'help' for instructions. diff --git a/kalk_mobile/www/style/style.css b/kalk_mobile/www/style/style.css index de56f63..cf6b032 100644 --- a/kalk_mobile/www/style/style.css +++ b/kalk_mobile/www/style/style.css @@ -12,7 +12,6 @@ body { font-family: "Hack", sans-serif; color: white; background-color: #2e2e2e; - padding: 10px 20px 10px 20px; } .hint { diff --git a/kalk_mobile/www/style/style.min.css b/kalk_mobile/www/style/style.min.css index d0b639a..8fa18c6 100644 --- a/kalk_mobile/www/style/style.min.css +++ b/kalk_mobile/www/style/style.min.css @@ -1 +1 @@ -body{width:100%;height:100%;padding:0;margin:0}.calculator{width:100%;height:100vh;box-sizing:border-box;font-family:"Hack", sans-serif;color:white;background-color:#2e2e2e;padding:10px 20px 10px 20px}.hint{color:#c3c3c3} +body{width:100%;height:100%;padding:0;margin:0}.calculator{width:100%;height:100vh;box-sizing:border-box;font-family:"Hack", sans-serif;color:white;background-color:#2e2e2e}.hint{color:#c3c3c3} diff --git a/kalk_mobile/www/style/style.sass b/kalk_mobile/www/style/style.sass index 21909ae..7c923ce 100644 --- a/kalk_mobile/www/style/style.sass +++ b/kalk_mobile/www/style/style.sass @@ -11,7 +11,6 @@ body font-family: "Hack", sans-serif color: white background-color: lighten(#212121, 5%) - padding: 10px 20px 10px 20px .hint color: #c3c3c3 diff --git a/kalk_web/package.json b/kalk_web/package.json index d990716..34af146 100644 --- a/kalk_web/package.json +++ b/kalk_web/package.json @@ -1,6 +1,6 @@ { "name": "@paddim8/kalk-component", - "version": "1.0.9", + "version": "1.0.11", "description": "A Svelte component for kalk, a calculator that supports user-defined functions and variables.", "svelte": "src/main.ts", "main": "public/build/bundle.js", diff --git a/kalk_web/src/KalkCalculator.svelte b/kalk_web/src/KalkCalculator.svelte index 94a82d3..51a7568 100644 --- a/kalk_web/src/KalkCalculator.svelte +++ b/kalk_web/src/KalkCalculator.svelte @@ -375,32 +375,21 @@ .button-panel { display: grid; - grid-template-columns: repeat(4, auto); - padding-right: 1.82vw; + grid-template-columns: repeat(10, auto); + grid-template-rows: repeat(3, auto); } - .arrow { - .left { - grid-area: left-arrow; - } - - .right { - grid-area: right-arrow; - } - } - - .number-row, .button-panel { + width: 100%; + button { - $margin: 2px; + $margin: 4px; + margin-right: $margin; margin-bottom: $margin; position: relative; border: 0; - border-right: $margin solid transparent; - $padding: 2.5vw; - $font-size: 8vw; - padding: calc(#{$padding} - #{$margin} / 2); - font-size: $font-size; + padding: 2.5vw; + font-size: 6.5vw; line-height: 1.2; background-color: inherit; font-family: inherit; @@ -424,6 +413,19 @@ bottom: 0px; background-color: rgba(0, 0, 0, 0.2); } + + button:last-child { + margin-right: 0; + } + } + + .arrow.left { + grid-area: 1 / 1 / span 2 / 1; + } + + .arrow.right { + margin-right: 0; + grid-area: 1 / 10 / span 2 / 10; } } @@ -470,21 +472,17 @@ -
- {#each buttonRowValues as value} - - {/each} -
+ {#each buttonRowValues as value} + + {/each} - - {/if} - {#if numberrow} -
- {#each numberRowValues as value} - - {/each} + {#if numberrow} + {#each numberRowValues as value} + + {/each} + {/if}
{/if}