Skip to content

Commit

Permalink
Merge pull request #501 from Ch1llb0/VideoAddonsViewFix
Browse files Browse the repository at this point in the history 
Adjust video addon views to work with multiple content types
  • Loading branch information
@Ch1llb0
Ch1llb0 authored Dec 5, 2024
2 parents 2bd5c7f + 25e7c05 commit 726861c
Show file tree
Hide file tree
Showing 23 changed files with 1,343 additions and 71 deletions.
85 changes: 75 additions & 10 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

---

**_v21.1.0_**
**_v21.2.0_**

_Improved_
- adjust video addon views to work with multiple content types (videos, episodes, movies)
- add fixed video addon views setting to side menu

---

**_v21.1.0 - October 2024_**

_New_
- add new notification icon
Expand Down Expand Up @@ -527,20 +535,77 @@ Release

---

**Changelog v21.1.0**
**Changelog v21.2.0**

template.xml:
- adjust widget onclick options to avoid errors when widgets are pointing to addon directories
Coordinates_Viewtype523.xml:
- add new content type image includes

Coordinates_DialogNotification.xml:
- add coordinates includes for new notification icon
Coordinates_Viewtype524.xml:
- add new content type image includes

DialogNotification.xml:
- add new notification icon
Coordinates_Viewtype525.xml:
- add new content type image includes

Coordinates_Viewtype535.xml:
- add new content type image includes

Coordinates_Viewtype536.xml:
- add new content type image includes

Coordinates_Viewtype537.xml:
- add new content type image includes

Coordinates_Viewtype538.xml:
- add new content type image includes

Coordinates_Viewtype539.xml:
- add new content type image includes
- fix videos fallback icon

Includes.xml:
- adjust DefaultView include to work with multiple content types and specifically with video addons

Includes_SubMenu.xml:
- add fixed video addon views setting to side menu
- adjust views menu to work together with fixed video addon views setting

Variables.xml:
- add new DefaultViewSettings variable for reworked views menu buttons
- adjust HeadingLabelSecondary variable to show proper information on episodes level (TV show title and season, if useful)
- adjust ContentType variable to show videos content type when a list of video addon items are shown

Viewtype51.xml:
- adjust visibility conditions of images and list container to work with multiple with multiple video addons content type

Viewtype511.xml:
- adjust visibility conditions of images and list container to work with multiple with multiple video addons content type

Viewtype523.xml:
- adjust visibility conditions of list container to work with multiple with multiple video addons content type

Viewtype524xml:
- adjust visibility conditions of list container to work with multiple with multiple video addons content type

Viewtype525.xml:
- adjust visibility conditions of list container and info controls to work with multiple with multiple video addons content type

Viewtype535.xml:
- adjust visibility conditions of panel container to work with multiple with multiple video addons content type

Viewtype536.xml:
- adjust visibility conditions of panel container and info controls to work with multiple with multiple video addons content type

Viewtype537.xml:
- adjust visibility conditions of panel container to work with multiple with multiple video addons content type

Viewtype538.xml:
- adjust visibility conditions of panel container and info controls to work with multiple with multiple video addons content type

Viewtype539.xml:
- adjust visibility conditions of panel container to work with multiple with multiple video addons content type

addon.xml:
- bump version to 21.1.0
- add skinshortcuts script as an optional dependency to avoid removal of the addon when marked as unused
- bump version to 21.2.0
- update changelog

Changelog.md:
Expand Down
4 changes: 2 additions & 2 deletions addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.osmc" version="21.1.1" name="OSMC Skin" provider-name="OSMC">
<addon id="skin.osmc" version="21.2.0" name="OSMC Skin" provider-name="OSMC">
<requires>
<import addon="xbmc.gui" version="5.17.0"/>
<import addon="script.skinshortcuts" version="2.0.3" optional="true"/>
Expand All @@ -18,6 +18,6 @@
<icon>resources/icon.png</icon>
<fanart>resources/fanart.jpg</fanart>
</assets>
<news>[B]New[/B][CR]- add new notification icon[CR][CR][B]Improved[/B][CR]- add skinshortcuts script as an optional dependency to avoid removal of the addon when marked as unused[CR][CR][B]Fixed[/B][CR]- fix widget onclick options to avoid errors when widgets are pointing to addon directories</news>
<news>[B]Improved[/B][CR]- adjust video addon views to work with multiple content types (videos, episodes, movies)[CR]- add fixed video addon views setting to side menu</news>
</extension>
</addon>
144 changes: 144 additions & 0 deletions xml/Coordinates_Viewtype523.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,24 @@
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultVideo.png</param>
Expand Down Expand Up @@ -142,6 +160,24 @@
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultVideo.png</param>
Expand Down Expand Up @@ -200,6 +236,24 @@
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultVideo.png</param>
Expand Down Expand Up @@ -258,6 +312,24 @@
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords7</param>
<param name="coords2">Viewtype523_coords8</param>
<param name="coords3">Viewtype523_coords9</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageNF">
<param name="fallback">DefaultVideo.png</param>
Expand Down Expand Up @@ -325,6 +397,24 @@
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultVideo.png</param>
Expand Down Expand Up @@ -386,6 +476,24 @@
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultVideo.png</param>
Expand Down Expand Up @@ -447,6 +555,24 @@
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultVideo.png</param>
Expand Down Expand Up @@ -508,6 +634,24 @@
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Episodes -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultTVShows.png</param>
<param name="visible">Container.Content(episodes)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Movies -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultMovies.png</param>
<param name="visible">Container.Content(movies)</param>
<param name="id">523</param>
<param name="coords">Viewtype523_coords10</param>
<param name="coords2">Viewtype523_coords11</param>
<param name="coords3">Viewtype523_coords12</param>
</include>
<!-- Image - Videos -->
<include content="MediaViewImageFO">
<param name="fallback">DefaultVideo.png</param>
Expand Down
Loading

0 comments on commit 726861c

Please sign in to comment.