Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add splashscreens and backup/restore on changescreen install/remove #724

Merged
merged 14 commits into from
Nov 12, 2023

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Aug 22, 2023

Changes

  • Add new splashscreens category
  • Add various splashscreens.
    • You should only be able to install one splashscreen of a type at a time
    • The splashscreen should automatically be enabled on install, and reverted on remove
  • Update changescrn
    • Rename folder to match package name
    • Backup splashscreens on install
    • Restore splashscreens on remove

Known Issues

  • lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in /var/lib/uboot (Startup and lowbattery screens don't work pr0fsmith/rMscreens#7)
  • The error when trying to install two splashscreens of the same type is about conflicting files, even though replaces is used against the same target name.

@Eeems Eeems added the packages Add or improve packages of the repository label Aug 22, 2023
@Eeems Eeems marked this pull request as ready for review August 22, 2023 22:06
@Eeems Eeems marked this pull request as draft August 22, 2023 22:40
@Eeems Eeems marked this pull request as ready for review August 22, 2023 22:55
@TheSunCat
Copy link

I didn't test starting and batteryempty because of the known issues. Here's the ones I did test though!

When trying to install one over the other:

root@reMarkable:~/rm0.6# opkg install splashscreen-suspended-chaotic_ribbon_0.0.0-1_rmall.ipk 
Installing splashscreen-suspended-chaotic_ribbon (0.0.0-1) to root...
Collected errors:
 * check_data_file_clashes: Package splashscreen-suspended-chaotic_ribbon wants to install file /opt/share/remarkable/splashscreens/suspended.png
	But that file is already provided by package  * splashscreen-suspended-barnsley_fern
 * opkg_install_cmd: Cannot install package splashscreen-suspended-chaotic_ribbon.

suspended

  • barnsley: ok
  • chaotic_ribbon: ok
  • collatz: ok
  • dragon: ok
  • fire: ok
  • flower: ok
  • fractal: ok
  • gallifreyan: it's just a circular icon at the bottom, is this intended?
  • gallifreyan-dark: it kept the contents of my screen and put some semitransparent circles on it. The same icon is there at the bottom.
  • gallifreyan-2: "the remarkable is on pause" text is very small so it becomes hard to read
  • sachs: ok
  • sierpinski: ok
  • snowy: ok
  • starr: ok
  • wavey lines: ok

poweroff

  • barnsley: ok
  • ribbon: ok
  • collatz: ok
  • dragon: ok
  • fire: ok
  • fractal: ok
  • gallifreyan: same as sleeping
  • sacks: ok
  • sierpinski: ok
  • snowy: ok
  • starr: ok

@Eeems
Copy link
Member Author

Eeems commented Oct 30, 2023

When trying to install one over the other:

root@reMarkable:~/rm0.6# opkg install splashscreen-suspended-chaotic_ribbon_0.0.0-1_rmall.ipk 
Installing splashscreen-suspended-chaotic_ribbon (0.0.0-1) to root...
Collected errors:
 * check_data_file_clashes: Package splashscreen-suspended-chaotic_ribbon wants to install file /opt/share/remarkable/splashscreens/suspended.png
	But that file is already provided by package  * splashscreen-suspended-barnsley_fern
 * opkg_install_cmd: Cannot install package splashscreen-suspended-chaotic_ribbon.

This would be the second-listed known issue.

* gallifreyan: it's just a circular icon at the bottom, is this intended?

* gallifreyan-dark: it kept the contents of my screen and put some semitransparent circles on it. The same icon is there at the bottom.

* gallifreyan-2: "the remarkable is on pause" text is very small so it becomes hard to read

Have you looked at the source repository for these packages? That would show you what the intended splashscreens are, as that's the files we are pulling.

@TheSunCat
Copy link

Have you looked at the source repository for these packages?

Nope, I missed that entirely! Yes, the screens match the images there, so it's not a bug.

@Eeems Eeems merged commit 5fc766d into testing Nov 12, 2023
3 checks passed
@Eeems Eeems deleted the splashscreens branch November 12, 2023 18:36
Eeems added a commit that referenced this pull request Nov 22, 2023
…724)

* Add splashscreens and backup/restore on changescreen install/remove

* Only backup if splashscreens are missing

* update docs
Eeems added a commit that referenced this pull request Dec 6, 2023
### New Packages
- `template-daily-planner`, `template-weekly-planner`, `template-journal`, `template-meeting-notes`, `template-smart-goals`, and `template-good-time-journal` - 0.0.0-1 (#712)
- `splashscreen-starting-wavey-lines`, `splashscreen-suspended-wavey-lines`, `splashscreen-poweroff-gallifreyan`, `splashscreen-suspended-gallifreyan`, `splashscreen-suspended-gallifreyan-dark`, `splashscreen-starting-gallifreyan`, `splashscreen-suspended-gallifreyan-2`, `splashscreen-suspended-flower-pause`, `splashscreen-batteryempty-barnsley_fern`, `splashscreen-poweroff-barnsley_fern`, `splashscreen-starting-barnsley_fern`, `splashscreen-suspended-barnsley_fern`, `splashscreen-batteryempty-chaotic_ribbon`, `splashscreen-poweroff-chaotic_ribbon`, `splashscreen-starting-chaotic_ribbon`, `splashscreen-suspended-chaotic_ribbon`, `splashscreen-batteryempty-collatz_sea_weed`, `splashscreen-poweroff-collatz_sea_weed`, `splashscreen-starting-collatz_sea_weed`, `splashscreen-suspended-collatz_sea_weed`, `splashscreen-batteryempty-dragon_curve`, `splashscreen-poweroff-dragon_curve`, `splashscreen-starting-dragon_curve`, `splashscreen-suspended-dragon_curve`, `splashscreen-batteryempty-fire`, `splashscreen-poweroff-fire`, `splashscreen-starting-fire`, `splashscreen-suspended-fire`, `splashscreen-batteryempty-fractal_tree`, `splashscreen-poweroff-fractal_tree`, `splashscreen-starting-fractal_tree`, `splashscreen-suspended-fractal_tree`, `splashscreen-batteryempty-sacks_spiral`, `splashscreen-poweroff-sacks_spiral`, `splashscreen-starting-sacks_spiral`, `splashscreen-suspended-sacks_spiral`, `splashscreen-batteryempty-sierpinski_triangle`, `splashscreen-poweroff-sierpinski_triangle`, `splashscreen-starting-sierpinski_triangle`, `splashscreen-suspended-sierpinski_triangle`, `splashscreen-batteryempty-snowy_hills`, `splashscreen-poweroff-snowy_hills`, `splashscreen-starting-snowy_hills`, `splashscreen-suspended-snowy_hills`, `splashscreen-batteryempty-starr`, `splashscreen-poweroff-starr`, `splashscreen-starting-starr`, and `splashscreen-suspended-starr` - 0.0.0-1 (#724)
  - Installing a splashscreen will automatically enable it
  - Removing a splashscreen will automatically revert to the previous splashscreen

### Updated Packages
- `toltec-bootstrap` - 0.2.3-1 (#740)
- `rmfm` - 1.5.0-2 (#700 #746)
- `whiteboard-hypercard` - 0.3.7-2 (#700 #747)
- `yaft` - 0.0.10-2 (#700 #736)
- `xochitl` - 0.0.0-16 (#700 #707)
- `reboot-guard` - 1.0.1-7 (#689)
- `calculator` - 0.0.0-16 (#700)
- `chessmarkable` - 0.8.0-2 (#700)
- `doomarkable` - 0.4.1-2 (#700)
- `fingerterm` - 1.3.5-15 (#700)
- `keywriter` - 0.2~20-gddc9e73-2 (#700)
- `koreader` - 2023.08-2 (#700)
- `netsurf` - 0.4.0-3 (#700)
- `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 0.2.6-2 (#700 #745)
- `plato` - 0.9.34-2 (#700)
- `puzzles` - 0.2.2-4 (#700)
- `recrossable` - 0.0.0-8 (#700)
- `regenda` - 0.0.2-2 (#700)
- `reterm` - 20230628.1927-2 (#700)
- `retris` - 0.6.3-4 (#700)
- `dumbskull` - 0.0.1-3 (#700)
- `harmony` - 0.2.2-2 (#700)
- `mines` - 0.1.4-3 (#700)
- `nao` - 0.1.2-4 (#700)
- `rpncalc` - 0.0.3-3 (#700)
- `wordlet` - 0.0.2-3 (#700)
- `sill` - 0.1.1-1 (#700)
- `vnsee` - 0.4.1-2 (#700)
- `wikipedia` - 0.1.0-4 (#700)
- `zshelf` - 0.4.0-4 (#700)
- `changescrn` - 1.0.0-2 (#724)

### Tooling
- Packages that contain files in `/opt/etc/draft` or `/opt/usr/share/applications` will now automatically reload oxide applications as part of install, upgrade, and remove.

### Documentation
- Add documentation for the reload-oxide-apps hook.
- Update category list to include the new splashscreens category.

### Known Issues
- lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in `/var/lib/uboot` (pr0fsmith/rMscreens#7)
- Installing two splashscreens of the same type will error instead of replacing the previously installed splashscreen (#761)
- Fingerterm icon is incorrect (#762)
@Eeems Eeems mentioned this pull request Dec 6, 2023
Eeems added a commit that referenced this pull request Dec 6, 2023
### New Packages
- `template-daily-planner`, `template-weekly-planner`, `template-journal`, `template-meeting-notes`, `template-smart-goals`, and `template-good-time-journal` - 0.0.0-1 (#712)
- `splashscreen-starting-wavey-lines`, `splashscreen-suspended-wavey-lines`, `splashscreen-poweroff-gallifreyan`, `splashscreen-suspended-gallifreyan`, `splashscreen-suspended-gallifreyan-dark`, `splashscreen-starting-gallifreyan`, `splashscreen-suspended-gallifreyan-2`, `splashscreen-suspended-flower-pause`, `splashscreen-batteryempty-barnsley_fern`, `splashscreen-poweroff-barnsley_fern`, `splashscreen-starting-barnsley_fern`, `splashscreen-suspended-barnsley_fern`, `splashscreen-batteryempty-chaotic_ribbon`, `splashscreen-poweroff-chaotic_ribbon`, `splashscreen-starting-chaotic_ribbon`, `splashscreen-suspended-chaotic_ribbon`, `splashscreen-batteryempty-collatz_sea_weed`, `splashscreen-poweroff-collatz_sea_weed`, `splashscreen-starting-collatz_sea_weed`, `splashscreen-suspended-collatz_sea_weed`, `splashscreen-batteryempty-dragon_curve`, `splashscreen-poweroff-dragon_curve`, `splashscreen-starting-dragon_curve`, `splashscreen-suspended-dragon_curve`, `splashscreen-batteryempty-fire`, `splashscreen-poweroff-fire`, `splashscreen-starting-fire`, `splashscreen-suspended-fire`, `splashscreen-batteryempty-fractal_tree`, `splashscreen-poweroff-fractal_tree`, `splashscreen-starting-fractal_tree`, `splashscreen-suspended-fractal_tree`, `splashscreen-batteryempty-sacks_spiral`, `splashscreen-poweroff-sacks_spiral`, `splashscreen-starting-sacks_spiral`, `splashscreen-suspended-sacks_spiral`, `splashscreen-batteryempty-sierpinski_triangle`, `splashscreen-poweroff-sierpinski_triangle`, `splashscreen-starting-sierpinski_triangle`, `splashscreen-suspended-sierpinski_triangle`, `splashscreen-batteryempty-snowy_hills`, `splashscreen-poweroff-snowy_hills`, `splashscreen-starting-snowy_hills`, `splashscreen-suspended-snowy_hills`, `splashscreen-batteryempty-starr`, `splashscreen-poweroff-starr`, `splashscreen-starting-starr`, and `splashscreen-suspended-starr` - 0.0.0-1 (#724)
  - Installing a splashscreen will automatically enable it
  - Removing a splashscreen will automatically revert to the previous splashscreen

### Updated Packages
- `toltec-bootstrap` - 0.2.3-1 (#740)
- `rmfm` - 1.5.0-2 (#700 #746)
- `whiteboard-hypercard` - 0.3.7-2 (#700 #747)
- `yaft` - 0.0.10-2 (#700 #736)
- `xochitl` - 0.0.0-16 (#700 #707)
- `reboot-guard` - 1.0.1-7 (#689)
- `calculator` - 0.0.0-16 (#700)
- `chessmarkable` - 0.8.0-2 (#700)
- `doomarkable` - 0.4.1-2 (#700)
- `fingerterm` - 1.3.5-15 (#700)
- `keywriter` - 0.2~20-gddc9e73-2 (#700)
- `koreader` - 2023.08-2 (#700)
- `netsurf` - 0.4.0-3 (#700)
- `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 0.2.6-2 (#700 #745)
- `plato` - 0.9.34-2 (#700)
- `puzzles` - 0.2.2-4 (#700)
- `recrossable` - 0.0.0-8 (#700)
- `regenda` - 0.0.2-2 (#700)
- `reterm` - 20230628.1927-2 (#700)
- `retris` - 0.6.3-4 (#700)
- `dumbskull` - 0.0.1-3 (#700)
- `harmony` - 0.2.2-2 (#700)
- `mines` - 0.1.4-3 (#700)
- `nao` - 0.1.2-4 (#700)
- `rpncalc` - 0.0.3-3 (#700)
- `wordlet` - 0.0.2-3 (#700)
- `sill` - 0.1.1-1 (#700)
- `vnsee` - 0.4.1-2 (#700)
- `wikipedia` - 0.1.0-4 (#700)
- `zshelf` - 0.4.0-4 (#700)
- `changescrn` - 1.0.0-2 (#724)

### Tooling
- Packages that contain files in `/opt/etc/draft` or `/opt/usr/share/applications` will now automatically reload oxide applications as part of install, upgrade, and remove.

### Documentation
- Add documentation for the reload-oxide-apps hook.
- Update category list to include the new splashscreens category.

### Known Issues
- lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in `/var/lib/uboot` (pr0fsmith/rMscreens#7)
- Installing two splashscreens of the same type will error instead of replacing the previously installed splashscreen (#761)
- Fingerterm icon is incorrect (#762)
Eeems added a commit that referenced this pull request Dec 6, 2023
### New Packages
- `template-daily-planner`, `template-weekly-planner`, `template-journal`, `template-meeting-notes`, `template-smart-goals`, and `template-good-time-journal` - 0.0.0-1 (#712)
- `splashscreen-starting-wavey-lines`, `splashscreen-suspended-wavey-lines`, `splashscreen-poweroff-gallifreyan`, `splashscreen-suspended-gallifreyan`, `splashscreen-suspended-gallifreyan-dark`, `splashscreen-starting-gallifreyan`, `splashscreen-suspended-gallifreyan-2`, `splashscreen-suspended-flower-pause`, `splashscreen-batteryempty-barnsley_fern`, `splashscreen-poweroff-barnsley_fern`, `splashscreen-starting-barnsley_fern`, `splashscreen-suspended-barnsley_fern`, `splashscreen-batteryempty-chaotic_ribbon`, `splashscreen-poweroff-chaotic_ribbon`, `splashscreen-starting-chaotic_ribbon`, `splashscreen-suspended-chaotic_ribbon`, `splashscreen-batteryempty-collatz_sea_weed`, `splashscreen-poweroff-collatz_sea_weed`, `splashscreen-starting-collatz_sea_weed`, `splashscreen-suspended-collatz_sea_weed`, `splashscreen-batteryempty-dragon_curve`, `splashscreen-poweroff-dragon_curve`, `splashscreen-starting-dragon_curve`, `splashscreen-suspended-dragon_curve`, `splashscreen-batteryempty-fire`, `splashscreen-poweroff-fire`, `splashscreen-starting-fire`, `splashscreen-suspended-fire`, `splashscreen-batteryempty-fractal_tree`, `splashscreen-poweroff-fractal_tree`, `splashscreen-starting-fractal_tree`, `splashscreen-suspended-fractal_tree`, `splashscreen-batteryempty-sacks_spiral`, `splashscreen-poweroff-sacks_spiral`, `splashscreen-starting-sacks_spiral`, `splashscreen-suspended-sacks_spiral`, `splashscreen-batteryempty-sierpinski_triangle`, `splashscreen-poweroff-sierpinski_triangle`, `splashscreen-starting-sierpinski_triangle`, `splashscreen-suspended-sierpinski_triangle`, `splashscreen-batteryempty-snowy_hills`, `splashscreen-poweroff-snowy_hills`, `splashscreen-starting-snowy_hills`, `splashscreen-suspended-snowy_hills`, `splashscreen-batteryempty-starr`, `splashscreen-poweroff-starr`, `splashscreen-starting-starr`, and `splashscreen-suspended-starr` - 0.0.0-1 (#724)
  - Installing a splashscreen will automatically enable it
  - Removing a splashscreen will automatically revert to the previous splashscreen

### Updated Packages
- `toltec-bootstrap` - 0.2.3-1 (#740)
- `rmfm` - 1.5.0-2 (#700 #746)
- `whiteboard-hypercard` - 0.3.7-2 (#700 #747)
- `yaft` - 0.0.10-2 (#700 #736)
- `xochitl` - 0.0.0-16 (#700 #707)
- `reboot-guard` - 1.0.1-7 (#689)
- `calculator` - 0.0.0-16 (#700)
- `chessmarkable` - 0.8.0-2 (#700)
- `doomarkable` - 0.4.1-2 (#700)
- `fingerterm` - 1.3.5-15 (#700)
- `keywriter` - 0.2~20-gddc9e73-2 (#700)
- `koreader` - 2023.08-2 (#700)
- `netsurf` - 0.4.0-3 (#700)
- `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 0.2.6-2 (#700 #745)
- `plato` - 0.9.34-2 (#700)
- `puzzles` - 0.2.2-4 (#700)
- `recrossable` - 0.0.0-8 (#700)
- `regenda` - 0.0.2-2 (#700)
- `reterm` - 20230628.1927-2 (#700)
- `retris` - 0.6.3-4 (#700)
- `dumbskull` - 0.0.1-3 (#700)
- `harmony` - 0.2.2-2 (#700)
- `mines` - 0.1.4-3 (#700)
- `nao` - 0.1.2-4 (#700)
- `rpncalc` - 0.0.3-3 (#700)
- `wordlet` - 0.0.2-3 (#700)
- `sill` - 0.1.1-1 (#700)
- `vnsee` - 0.4.1-2 (#700)
- `wikipedia` - 0.1.0-4 (#700)
- `zshelf` - 0.4.0-4 (#700)
- `changescrn` - 1.0.0-2 (#724)

### Tooling
- Packages that contain files in `/opt/etc/draft` or `/opt/usr/share/applications` will now automatically reload oxide applications as part of install, upgrade, and remove.

### Documentation
- Add documentation for the reload-oxide-apps hook.
- Update category list to include the new splashscreens category.

### Known Issues
- lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in `/var/lib/uboot` (pr0fsmith/rMscreens#7)
- Installing two splashscreens of the same type will error instead of replacing the previously installed splashscreen (#761)
- Fingerterm icon is incorrect (#762)
@Eeems Eeems linked an issue Dec 6, 2023 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages Add or improve packages of the repository
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sort out standard for suspend/startup etc packages
3 participants