NaikSoftware · NaikSoftware · May 10, 2026 · May 9, 2026 · May 9, 2026 · May 9, 2026
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 
 android {
     namespace 'ua.naiksoftware.aritymod'
-    compileSdk 34
+    compileSdk 36
 
     defaultConfig {
         applicationId "ua.naiksoftware.aritymod"
         minSdk 21
-        targetSdk 34
-        versionCode 37
+        targetSdk 36
+        versionCode 39
         versionName "1.45"
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/icon"
-        android:label="ArityMOD"
+        android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"

diff --git a/app/src/main/java/ua/naiksoftware/aritymod/MainActivity.java b/app/src/main/java/ua/naiksoftware/aritymod/MainActivity.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.Editable;
@@ -14,7 +13,6 @@
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ListView;
@@ -23,6 +21,11 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.graphics.Insets;
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 import org.javia.arity.Complex;
 import org.javia.arity.Function;
 import org.javia.arity.FunctionAndName;
@@ -131,33 +134,47 @@ private void internalConfigChange(Configuration config) {
         input.addTextChangedListener(this);
         input.setEditableFactory(new CalculatorEditable.Factory());
 
-        if (Build.VERSION.SDK_INT > 10) {// for greater 4.x
-            input.setTextIsSelectable(true);
-        } else {                         // hide keyboard for less 4.x
-            input.setInputType(0);
-        }
+        input.setTextIsSelectable(true);
+        input.setShowSoftInputOnFocus(false);
 
         changeInput(history.getText());
         if (oldText != null) {
             input.setText(oldText);
         }
         input.requestFocus();
-        InputMethodManager inputManager
-                = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputManager.hideSoftInputFromWindow(
-                this.getCurrentFocus().getWindowToken(), InputMethodManager.RESULT_UNCHANGED_HIDDEN);
         graphView.setOnClickListener(this);
         graph3dView.setOnClickListener(this);
         if (historyView != null) {
             historyView.setAdapter(adapter);
             historyView.setOnItemClickListener(this);
         }
+        applyKeyboardInsets();
+    }
+
+    private void applyKeyboardInsets() {
+        final View keyboardContainer = findViewById(R.id.keyboard_container);
+        if (keyboardContainer == null) return;
+        final int xmlLeft = keyboardContainer.getPaddingLeft();
+        final int xmlRight = keyboardContainer.getPaddingRight();
+        final int xmlBottom = keyboardContainer.getPaddingBottom();
+        ViewCompat.setOnApplyWindowInsetsListener(keyboardContainer, new OnApplyWindowInsetsListener() {
+            @Override
+            public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) {
+                Insets bars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+                int bottomPad = Math.max(bars.bottom, xmlBottom);
+                v.setPadding(xmlLeft, 0, xmlRight, bottomPad);
+                return insets;
+            }
+        });
+        ViewCompat.requestApplyInsets(keyboardContainer);
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), true);
+
         history = new History(this);
         adapter = new HistoryAdapter(this, history);
         internalConfigChange(getResources().getConfiguration());

diff --git a/app/src/main/res/layout-land/keyboard.xml b/app/src/main/res/layout-land/keyboard.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ua.naiksoftware.aritymod.KeyboardView xmlns:android="http://schemas.android.com/apk/res/android"
-     android:id="@+id/digits"
-     android:layout_width="fill_parent"
-     android:layout_height="100dip"
-    />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/keyboard_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:paddingBottom="16dp">
+
+    <ua.naiksoftware.aritymod.KeyboardView
+        android:id="@+id/digits"
+        android:layout_width="match_parent"
+        android:layout_height="100dip" />
+</LinearLayout>
diff --git a/app/src/main/res/layout-port/keyboard.xml b/app/src/main/res/layout-port/keyboard.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/keyboard_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:paddingBottom="48dp">
+
     <ua.naiksoftware.aritymod.KeyboardView
         android:id="@+id/alpha"
         android:layout_width="match_parent"
         android:layout_height="192dp" />
+
     <ua.naiksoftware.aritymod.KeyboardView
         android:id="@+id/digits"
         android:layout_width="match_parent"
         android:layout_height="224dp" />
-</merge>
+</LinearLayout>
diff --git a/app/src/main/res/layout/history_line.xml b/app/src/main/res/layout/history_line.xml
@@ -2,16 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="56dp"
+    android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
-    android:paddingHorizontal="12dp"
-    android:paddingVertical="8dp">
+    android:minHeight="56dp"
+    android:orientation="horizontal"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="12dp">
 
     <TextView
         android:id="@+id/input"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?attr/textAppearanceBodyLarge"
         android:textColor="?attr/colorOnSurface" />
@@ -20,7 +23,7 @@
         android:id="@+id/equals_separator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="8dp"
+        android:paddingHorizontal="6dp"
         android:singleLine="true"
         android:text=" = "
         android:textAppearance="?attr/textAppearanceBodyMedium"
@@ -30,6 +33,7 @@
         android:id="@+id/result"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?attr/textAppearanceBodyLarge"
         android:textColor="?attr/colorPrimary"

diff --git a/app/src/main/res/layout/keyboard.xml b/app/src/main/res/layout/keyboard.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/keyboard_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:paddingBottom="48dp">
+
     <ua.naiksoftware.aritymod.KeyboardView
         android:id="@+id/alpha"
         android:layout_width="match_parent"
         android:layout_height="192dp" />
+
     <ua.naiksoftware.aritymod.KeyboardView
         android:id="@+id/digits"
         android:layout_width="match_parent"
         android:layout_height="224dp" />
-</merge>
+</LinearLayout>
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
@@ -61,9 +61,8 @@
         android:layout_height="0dip"
         android:layout_weight="1"
         android:choiceMode="singleChoice"
-        android:divider="@null"
-        android:dividerHeight="0dp"
-        android:paddingHorizontal="8dp"
+        android:divider="@color/md_divider_subtle"
+        android:dividerHeight="1dp"
         android:scrollbarStyle="outsideInset"
         android:scrollbars="none" />
 

diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
@@ -12,7 +12,6 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        app:logo="@drawable/icon"
         app:title="@string/app_name"
         tools:context=".MainActivity" />
 

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -39,4 +39,6 @@
     <color name="md_inverse_on_surface">#303034</color>
     <color name="md_inverse_primary">#355CA8</color>
     <color name="md_scrim">#000000</color>
+
+    <color name="md_divider_subtle">#1FFFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">ArityMOD</string>
+    <string name="app_name">Arity Calculator</string>
     <string name="user_defs">Переменные</string>
     <string name="help">Помощь</string>
     <string name="settings">Настройки</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">ArityMOD</string>
+    <string name="app_name">Arity Calculator</string>
     <string name="user_defs">Змінні</string>
     <string name="help">Допомога</string>
     <string name="settings">Налаштування</string>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -39,4 +39,6 @@
     <color name="md_inverse_on_surface">#F2EFF4</color>
     <color name="md_inverse_primary">#B3C5FF</color>
     <color name="md_scrim">#000000</color>
+
+    <color name="md_divider_subtle">#14000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 
 <resources>
 
-    <string name="app_name">ArityMOD</string>
+    <string name="app_name">Arity Calculator</string>
     <string name="user_defs">User definitions</string>
     <string name="help">Help</string>
     <string name="settings">Settings</string>

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.9.3'
     }
 }
 allprojects {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Dec 30 18:51:09 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists