From e0cd207e81f8457de8c0c654b6723267548c282d Mon Sep 17 00:00:00 2001 From: Mike PETITFILS Date: Wed, 26 Feb 2025 10:41:16 +0100 Subject: [PATCH 01/10] Add new config object line_name --- docs/getting_started.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/getting_started.md b/docs/getting_started.md index 9aa195fd2..7c34d580e 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -431,6 +431,7 @@ The following are the possible configuration parameters: | --- |:---:| --- | :---: | | `bookmark_mode` | :material-close: | Enable/disable the bookmarks feature | [`Bookmark mode`](#bookmark-mode-schedule) | | `go_from_go_to` | :material-close: | Show/hide the go from/go to buttons | `Boolean` | `true` | +| `line_name` | :material-close: | Show the name of the line | [`Line name`](#line-name-schedule) | | `max_history` | :material-close: | Define the max history items | `Int` | | `networks_filter` | :material-close: | Show/hide the networks selector | `Boolean` | | `next_departures` | :material-close: | Show/hide the next departures | [`Next departures`](#next-departures) | @@ -451,6 +452,12 @@ The following are the possible configuration parameters: | --- |:---:| --- | :---: | :---: | | `home` | :material-close: | Display/hide favorite items on home screen | `Boolean` | `true` | +##### Line Name (Schedule) + +| Name | Required | Description | Type | Example | +| --- |:---:| --- | :---: | :---: | +| `allowed_commerical_modes` | :material-close: | Define the list of commercial mode id allowed to show their name | `String[]` | `["commercial_mode:Train"]` | + #### Traffic features | Name | Required | Description | Type | Example | From 029b842950d8d11d47a52a7fb99d9e038ac62b6a Mon Sep 17 00:00:00 2001 From: hirsch-adeline Date: Wed, 26 Feb 2025 14:51:37 +0100 Subject: [PATCH 02/10] Traffic feature config changed --- docs/getting_started.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/getting_started.md b/docs/getting_started.md index 9aa195fd2..16a5e6f4f 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -458,8 +458,9 @@ The following are the possible configuration parameters: | `alert_subscription` | :material-close: | Alert subscription environment configuration | [`Alert subscription`](#alert-subscription) | - | | `application_periods` | :material-close: | Show/hide the disruption application date | `Boolean` | | `disruption_contributors` | :material-close: | Define the list of disruption contributors id | `String[]` | `["shortterm.tr_idfm"]` | -| `networks_filter` | :material-close: | Show/hide the networks selector | `Boolean` | +| `filters` | :material-close: | Show/hide the filters selector | `Boolean` | | `transport_networks` | :material-close: | Enable/disable showing network on lines | `Boolean` | - | +| `forbidden_networks` | :material-close: | Define the list of forbidden networkds | `String[]` | `["network:ABCD"]` | ##### Alert subscription From 77eea68da376619eb061d519f5eed7f54aa004fb Mon Sep 17 00:00:00 2001 From: Even Modiguy Date: Wed, 26 Feb 2025 15:04:39 +0100 Subject: [PATCH 03/10] update file example --- docs/assets/file/config.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/assets/file/config.json b/docs/assets/file/config.json index 8086cf1a9..bdd8a062f 100644 --- a/docs/assets/file/config.json +++ b/docs/assets/file/config.json @@ -735,6 +735,11 @@ } }, "go_from_go_to": true, + "line_name": { + "allowed_commercial_modes": [ + "" + ] + }, "max_history": 10, "networks_filter": true, "next_departures": { From da43f961cea0cb34a53ddd7ab3d89f92b94d2414 Mon Sep 17 00:00:00 2001 From: hirsch-adeline Date: Wed, 26 Feb 2025 15:07:58 +0100 Subject: [PATCH 04/10] Update config.json file --- docs/assets/file/config.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/assets/file/config.json b/docs/assets/file/config.json index 8086cf1a9..54647f4fc 100644 --- a/docs/assets/file/config.json +++ b/docs/assets/file/config.json @@ -756,8 +756,11 @@ "disruption_contributors": [ "" ], - "networks_filter": true, - "transport_networks": true + "filters": true, + "transport_networks": true, + "forbidden_networks": [ + "" + ] } } } \ No newline at end of file From f1d9e8f097e2b49d4ddfc4362cd2748231e0206d Mon Sep 17 00:00:00 2001 From: Adeline Hirsch Date: Wed, 26 Feb 2025 16:14:11 +0100 Subject: [PATCH 05/10] Update docs/assets/file/config.json Co-authored-by: Mike PETITFILS --- docs/assets/file/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/file/config.json b/docs/assets/file/config.json index 54647f4fc..4117f5312 100644 --- a/docs/assets/file/config.json +++ b/docs/assets/file/config.json @@ -763,4 +763,4 @@ ] } } -} \ No newline at end of file +} From b0266a3faf482305aab9810cc7488842a48f2639 Mon Sep 17 00:00:00 2001 From: Even Modiguy Date: Thu, 27 Feb 2025 11:34:22 +0100 Subject: [PATCH 06/10] update configuration --- docs/assets/file/config.json | 16 ++++++++++++-- docs/getting_started.md | 42 ++++++++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/docs/assets/file/config.json b/docs/assets/file/config.json index 8086cf1a9..cb55bda08 100644 --- a/docs/assets/file/config.json +++ b/docs/assets/file/config.json @@ -668,9 +668,21 @@ }, "schedule_mode": true, "tabs": { - "transports": true, + "transports": { + "enabled": true, + "sections": { + "stations_title_res": "", + "bss_title_res": "", + "car_parking_title_res": "" + } + }, "journeys": true, - "addresses": true + "addresses": { + "enabled": true, + "sections": { + "places_title_res": "" + } + } } }, "journey": { diff --git a/docs/getting_started.md b/docs/getting_started.md index 9aa195fd2..7a57e7093 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -359,7 +359,7 @@ The following are the possible configuration parameters: | --- |:---:| --- | :---: | :---: | | `go_from_go_to` | :material-close: | Show/hide the go from/go to buttons | `Boolean` | `true` | | `next_departures` | :material-close: | Show/hide the next departures | [`Next departures`](#next-departures) | - | -| `park_availability`| :material-close: | Show/hide the bss and car parking availability | [`Park Availability`](#park-availability) | +| `park_availability`| :material-close: | Show/hide the bss and car parking availability | [`Park Availability`](#park-availability) | - | | `schedule_mode` | :material-close: | Show/hide the "See all schedules" button | `Boolean` | `true` | | `tabs` | :material-close: | Enable/disable tabs | [`Bookmark tabs`](#bookmark-tabs) | - | @@ -367,9 +367,37 @@ The following are the possible configuration parameters: | Name | Required | Description | Type | Example | | --- |:---:| --- | :---: | :---: | -| `transports` | :material-check: | Enable/disable transport tab | `Boolean` | `true` | -| `journeys` | :material-check: | Enable/disable journeys tab | `Boolean` | `true` | -| `addresses` | :material-check: | Enable/disable addresses tab | `Boolean` | `true` | +| `transports` | :material-close: | Transport tab configuration | [`Bookmark transports tab`](#bookmark-transports-tab) | - | +| `journeys` | :material-close: | Enable/disable journeys tab | `Boolean` | `true` | +| `addresses` | :material-close: | Addresses tab configuration | [`Bookmark addresses tab`](#bookmark-addresses-tab) | - | + +##### Bookmark transports tab + +| Name | Required | Description | Type | Example | +| --- |:---:| --- | :---: | :---: | +| `enabled` | :material-check: | Enable/disable transport tab | `Boolean` | `true` | +| `sections` | :material-close: | Custom titles for the sections of this tab | [`Bookmark transports tab sections`](#bookmark-transports-tab-sections) | - | + +##### Bookmark transports tab sections + +| Name | Required | Description | Type | Example | +| --- |:---:| --- | :---: | :---: | +| `stations_title_res` | :material-close: | 'Stations' title resource name | `String` | `"stops"` | +| `bss_title_res` | :material-close: | 'Bike sharing service stations' title resource name | `String` | `"bike_rental"` | +| `car_parking_title_res` | :material-close: | 'P+R parkings' title resource name | `String` | `"relay_parkings"` | + +##### Bookmark addresses tab + +| Name | Required | Description | Type | Example | +| --- |:---:| --- | :---: | :---: | +| `enabled` | :material-check: | Enable/disable addresses tab | `Boolean` | `true` | +| `sections` | :material-close: | Custom titles for the sections of this tab | [`Bookmark addresses tab sections`](#bookmark-addresses-tab-sections) | - | + +##### Bookmark addresses tab sections + +| Name | Required | Description | Type | Example | +| --- |:---:| --- | :---: | :---: | +| `places_title_res` | :material-close: | 'Places' title resource name | `String` | `"convenient_places"` | #### Journey features @@ -525,9 +553,9 @@ The following are the possible configuration parameters: | Name | Required | Description | Type | Platform | Example | | --- |:---:| --- | :---: | :---: | :---: | -| `font_res` | :material-check: | The font resource name | `String` | Android | `source_sans_pro_semi_bold` | -| `ttf_file` | :material-check: | The TTF file name | `String` | iOS | `"SourceSansPro"` | -| `font_name` | :material-check: | The font name | `String` | iOS | `"SourceSansPro-Bold"` | +| `font_res` | :material-check: | Font resource name | `String` | Android | `source_sans_pro_semi_bold` | +| `ttf_file` | :material-check: | TTF file name | `String` | iOS | `"SourceSansPro"` | +| `font_name` | :material-check: | Font name | `String` | iOS | `"SourceSansPro-Bold"` | ### Line resource From fdbd515cdde138b25404f853ccf41c644dedaf13 Mon Sep 17 00:00:00 2001 From: Even Modiguy Date: Thu, 27 Feb 2025 15:41:48 +0100 Subject: [PATCH 07/10] update config for around me --- docs/assets/file/config.json | 17 +++++++++++++---- docs/getting_started.md | 21 ++++++++++++++------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/docs/assets/file/config.json b/docs/assets/file/config.json index cb55bda08..f0d48a6eb 100644 --- a/docs/assets/file/config.json +++ b/docs/assets/file/config.json @@ -626,10 +626,19 @@ "booking": true, "bookmark_mode": { "enabled": true, - "display": { - "bss": true, - "journeys": true, - "stations": true + "tabs": { + "bss": { + "display": true, + "title_res": "" + }, + "journeys": { + "display": true, + "title_res": "" + }, + "stations": { + "display": true, + "title_res": "" + } } }, "default_location": { diff --git a/docs/getting_started.md b/docs/getting_started.md index 7a57e7093..c831467dd 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -335,16 +335,23 @@ The following are the possible configuration parameters: | Name | Required | Description | Type | Example | | --- |:---:| --- | :---: | :---: | -| `enabled` | :material-close: | Enable/disable to add and remove an item as favorite | `Boolean` | `true` | -| `display` | :material-close: | Display options of favorite items on screen | [`Bookmark mode display options (Around Me)`](#bookmark-mode-display-options-around-me) | - | +| `enabled` | :material-check: | Enable/disable to add and remove an item as favorite | `Boolean` | `true` | +| `tabs` | :material-close: | | [`Bookmark mode tabs (Around me)`](#bookmark-mode-tabs-around-me) | - | + +##### Bookmark mode tabs (Around me) + +| Name | Required | Description | Type | Example | +| --- |:---:| --- | :---: | :---: | +| `bss` | :material-close: | Favorite bss tab configuration | [`Bookmark mode tab (Around me)`](#bookmark-mode-tab-around-me) | - | +| `journeys` | :material-close: | Favorite journeys tab configuration | [`Bookmark mode tab (Around me)`](#bookmark-mode-tab-around-me) | - | +| `stations` | :material-close: | Favorite stations tab configuration | [`Bookmark mode tab (Around me)`](#bookmark-mode-tab-around-me) | - | -##### Bookmark mode display options (Around Me) +##### Bookmark mode tab (Around me) | Name | Required | Description | Type | Example | | --- |:---:| --- | :---: | :---: | -| `bss` | :material-close: | Display/hide favorite bss tab | `Boolean` | `true` | -| `journeys` | :material-close: | Display/hide favorite journeys tab | `Boolean` | `true` | -| `stations` | :material-close: | Display/hide favorite stations tab | `Boolean` | `true` | +| `display` | :material-check: | Display/hide favorite tab | `Boolean` | `true` | +| `title_res` | :material-close: | Title resource name | `String` | `"tab_title"` | ##### Default location @@ -368,7 +375,7 @@ The following are the possible configuration parameters: | Name | Required | Description | Type | Example | | --- |:---:| --- | :---: | :---: | | `transports` | :material-close: | Transport tab configuration | [`Bookmark transports tab`](#bookmark-transports-tab) | - | -| `journeys` | :material-close: | Enable/disable journeys tab | `Boolean` | `true` | +| `journeys` | :material-close: | Enable/disable journeys tab | `Boolean` | `true` | | `addresses` | :material-close: | Addresses tab configuration | [`Bookmark addresses tab`](#bookmark-addresses-tab) | - | ##### Bookmark transports tab From 2212a02c10ebc77782f0f6ff54fdbc22ab684e09 Mon Sep 17 00:00:00 2001 From: Even Modiguy Date: Thu, 27 Feb 2025 19:52:26 +0100 Subject: [PATCH 08/10] fix config.json --- docs/assets/file/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/file/config.json b/docs/assets/file/config.json index f0d48a6eb..ed9c7de34 100644 --- a/docs/assets/file/config.json +++ b/docs/assets/file/config.json @@ -681,7 +681,7 @@ "enabled": true, "sections": { "stations_title_res": "", - "bss_title_res": "", + "bss_stations_title_res": "", "car_parking_title_res": "" } }, From f6fc719070a90029aaf448cf4c73ec3abce3db54 Mon Sep 17 00:00:00 2001 From: hirsch-adeline Date: Tue, 25 Mar 2025 10:37:14 +0100 Subject: [PATCH 09/10] Update config --- docs/bookmark/ios/index.md | 2 +- docs/getting_started.md | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/docs/bookmark/ios/index.md b/docs/bookmark/ios/index.md index 92e519e75..b0dfee2f2 100644 --- a/docs/bookmark/ios/index.md +++ b/docs/bookmark/ios/index.md @@ -62,7 +62,7 @@ You can also call the `initialize()` method with the global JSON configuration f do { try Bookmark.shared.initialize( token: "your_token", - configurationJsonFile: "aroundme_configuration.json" + configurationJsonFile: "bookmark_configuration.json" ) } catch { Logger.error("%@", String( diff --git a/docs/getting_started.md b/docs/getting_started.md index 4fbb107ec..6c53f4f64 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -350,8 +350,9 @@ The following are the possible configuration parameters: | Name | Required | Description | Type | Example | | --- |:---:| --- | :---: | :---: | -| `display` | :material-check: | Display/hide favorite tab | `Boolean` | `true` | -| `title_res` | :material-close: | Title resource name | `String` | `"tab_title"` | +| `bss` | :material-close: |Title resource name for bss | `Boolean` | `String` |`"bss_tab_title"` | +| `journeys` | :material-close: | Title resource name for journeys | `String` | `"journeys_tab_title"` | +| `stations` | :material-close: | Title resource name for stations | `String` | `"stations_tab_title"` | ##### Default location @@ -380,17 +381,10 @@ The following are the possible configuration parameters: ##### Bookmark transports tab -| Name | Required | Description | Type | Example | -| --- |:---:| --- | :---: | :---: | -| `enabled` | :material-check: | Enable/disable transport tab | `Boolean` | `true` | -| `sections` | :material-close: | Custom titles for the sections of this tab | [`Bookmark transports tab sections`](#bookmark-transports-tab-sections) | - | - -##### Bookmark transports tab sections - | Name | Required | Description | Type | Example | | --- |:---:| --- | :---: | :---: | | `stations_title_res` | :material-close: | 'Stations' title resource name | `String` | `"stops"` | -| `bss_title_res` | :material-close: | 'Bike sharing service stations' title resource name | `String` | `"bike_rental"` | +| `bss_stations_title_res` | :material-close: | 'Bike sharing service stations' title resource name | `String` | `"bike_rental"` | | `car_parking_title_res` | :material-close: | 'P+R parkings' title resource name | `String` | `"relay_parkings"` | ##### Bookmark addresses tab From e6a297d44078c3af40c29178076e5c82c065df2b Mon Sep 17 00:00:00 2001 From: hirsch-adeline Date: Tue, 25 Mar 2025 10:51:11 +0100 Subject: [PATCH 10/10] PR changes --- docs/getting_started.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/getting_started.md b/docs/getting_started.md index 4a2c0c362..0ce469ead 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -355,9 +355,8 @@ The following are the possible configuration parameters: | Name | Required | Description | Type | Example | | --- |:---:| --- | :---: | :---: | -| `bss` | :material-close: |Title resource name for bss | `Boolean` | `String` |`"bss_tab_title"` | -| `journeys` | :material-close: | Title resource name for journeys | `String` | `"journeys_tab_title"` | -| `stations` | :material-close: | Title resource name for stations | `String` | `"stations_tab_title"` | +| `display` | :material-check: | Display/hide favorite tab | `Boolean` | `true` | +| `title_res` | :material-close: | Title resource name | `String` | `"tab_title"` | ##### Default location @@ -500,8 +499,8 @@ The following are the possible configuration parameters: | `application_periods` | :material-close: | Show/hide the disruption application date | `Boolean` | | `disruption_contributors` | :material-close: | Define the list of disruption contributors id | `String[]` | `["shortterm.tr_idfm"]` | | `filters` | :material-close: | Show/hide the filters selector | `Boolean` | -| `transport_networks` | :material-close: | Enable/disable showing network on lines | `Boolean` | - | | `forbidden_networks` | :material-close: | Define the list of forbidden networkds | `String[]` | `["network:ABCD"]` | +| `transport_networks` | :material-close: | Enable/disable showing network on lines | `Boolean` | - | ##### Alert subscription