Skip to content

Merge upstream main#7

Merged
AsafMah merged 20 commits into
mainfrom
copilot/merge-upstream-main
May 23, 2026
Merged

Merge upstream main#7
AsafMah merged 20 commits into
mainfrom
copilot/merge-upstream-main

Conversation

@AsafMah

@AsafMah AsafMah commented May 23, 2026

Copy link
Copy Markdown
Owner

Summary

  • merge upstream/main into origin/main on a dedicated sync branch
  • bring in upstream build/release, README, symbol-row, floating-keyboard persistence, touchpad, clipboard icon, and settings updates
  • resolve conflicts while preserving LeanType clipboard editing and toolbar state-key icons

Conflict resolution

  • KeyboardIconsSet.kt: kept LeanType autospace/auto-cap/force-auto-cap toolbar icons and clear-clipboard themed icons
  • ClipboardDao.kt: kept clipboard edit support and upstream synchronized pin toggling

Tests

  • $env:JAVA_HOME = "C:\Program Files\Eclipse Adoptium\jdk-21.0.11.10-hotspot"; .\gradlew.bat :app:assembleStandardDebug --no-daemon

LeanBitLab and others added 20 commits May 18, 2026 20:54
Fix: show all symbols in letter long-press popup (#113)
fix: include floating keyboard prefs in backup, use synchronous commit on restore
- Add Obtainium deep link redirect
- Add Obtainium badge image
- Note F-Droid version lag (v3.7.6)
- Change number row from replacement to insertion in symbols view
- Adjust row height to 1/5 when number row is added to symbols
- Ensure consistency between Symbols and More Symbols views
- Remove redundant manual height adjustment
- Let parser's heightRescale handle the 5-row symbols layout
- Restore replacement logic for symbol view number row (keep 4 rows)
- Enable number row in symbol view by default
- Extend replacement logic to 'More Symbols' view for consistency
- Allow parser height auto-scaling to handle custom row counts
- Ensure custom symbol layouts with >10 keys in the first row don't lose keys when number row is enabled
- Extra symbols are now appended to the right of the numbers
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@AsafMah
AsafMah merged commit f227026 into main May 23, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants