organicmaps/organicmaps

Fork 18

[android] Add Kayak setting: opt-in on F-Droid and an easy opt-out for other builds #9820

Merged

root merged 3 commits from pastk-android-kayak-setting into master

2024-12-12 21:50:06 +00:00

pastk commented

2024-12-04 18:39:07 +00:00

Member

Adds a new setting to enable/disable Kayak.com affiliate links.

based on #6720
closes #6773
partially solves #7342

F-Droid flavor:

make Kayak links opt-in / disabled by default (unless a user had already accepted the Kayak disclaimer before)
if explicitly enabled by a user, then no need to display a disclaimer dialog for the first use
links contain a referral part hence OM will get a referral bonus for bookings (reverts #7262)

Other flavors:

added a button to easily disable Kayak links from the first-use disclaimer dialog

Adds a new setting to enable/disable Kayak.com affiliate links. - based on #6720 - closes https://git.omaps.dev/organicmaps/organicmaps/issues/6773 - partially solves https://git.omaps.dev/organicmaps/organicmaps/issues/7342 ![image](https://github.com/user-attachments/assets/2d8f90a1-e122-4f36-9616-17e3cc2018c1) F-Droid flavor: - make Kayak links opt-in / disabled by default (unless a user had already accepted the Kayak disclaimer before) - if explicitly enabled by a user, then no need to display a disclaimer dialog for the first use - links contain a referral part hence OM will get a referral bonus for bookings (reverts #7262) Other flavors: - added a button to easily disable Kayak links from the first-use disclaimer dialog ![image](https://github.com/user-attachments/assets/795950d1-bec6-426d-8fa6-1095380d1c0c)

pastk commented

2024-12-04 18:39:07 +00:00

Author

Member

requested review from @ghost

requested review from `@ghost`

pastk commented

2024-12-04 18:41:50 +00:00

Author

Member

mentioned in merge request !6720

pastk commented

2024-12-04 18:44:00 +00:00

Author

Member

mentioned in merge request !6523

Misalfgit commented

2024-12-04 19:10:20 +00:00

(Migrated from github.com)

if explicitly enabled by a user, then no need to display a disclaimer dialog for the first use

Maybe I don't get it.
Wouldn't the dialog, especially with its "details ..." button, still be useful for any first time user?
A user might have toggled the setting on/off out of curiosity or even accidentally.

> - if explicitly enabled by a user, then no need to display a disclaimer dialog for the first use Maybe I don't get it. Wouldn't the dialog, especially with its "details ..." button, still be useful for _any_ first time user? A user might have toggled the setting on/off out of curiosity or even accidentally.

pastk commented

2024-12-04 19:31:08 +00:00

Author

Member

Maybe I don't get it. Wouldn't the dialog, especially with its "details ..." button, still be useful for any first time user?

(the "Details on Kayak" button just proceeds to kayak.com link)

There is a detailed description of the setting, its more detailed than the disclaimer dialog even. So if a user have explicitly enabled it then I assume they have accepted it and there is no need to show and accept the same disclaimer second time..

A user might have toggled the setting on/off out of curiosity or even accidentally.

Could happen, but its a niche case. We can also say that a user might have accepted the first-use disclaimer dialog accidentally / out of curiosity... But we won't add another "Are you really-really sure?" dialog, right? :)
Anyway the setting is there still and the user can return to it at any time.

> > Maybe I don't get it. Wouldn't the dialog, especially with its "details ..." button, still be useful for _any_ first time user? (the "Details on Kayak" button just proceeds to kayak.com link) There is a detailed description of the setting, its more detailed than the disclaimer dialog even. So if a user have explicitly enabled it then I assume they have accepted it and there is no need to show and accept the same disclaimer second time.. > A user might have toggled the setting on/off out of curiosity or even accidentally. Could happen, but its a niche case. We can also say that a user might have accepted the first-use disclaimer dialog accidentally / out of curiosity... But we won't add another "Are you really-really sure?" dialog, right? :) Anyway the setting is there still and the user can return to it at any time.

pastk commented

2024-12-05 07:35:50 +00:00

Author

Member

mentioned in issue #7342

rtsisyk commented

2024-12-05 17:29:21 +00:00

Owner

I am more inclined to remove it entirely, as it doesn't make sense in its current state.

biodranik commented

2024-12-05 22:31:15 +00:00

(Migrated from github.com)

What about showing a "More information" button and display "Unfortunately, some FDroid folks are against displaying more detailed information about a hotel with a minor referral bonus to support Organic Maps if you book it. You can use Organic Maps from Google Play, AppGallery, or Obtainium to support the project" ?

pastk commented

2024-12-06 11:30:26 +00:00

Author

Member

I am more inclined to remove it entirely, as it doesn't make sense in its current state.

But what about users who find this feature convenient?

> I am more inclined to remove it entirely, as it doesn't make sense in its current state. But what about users who find this feature convenient?

pastk commented

2024-12-06 11:35:02 +00:00

Author

Member

with a minor referral bonus to support Organic Maps if you book it. You can use Organic Maps from Google Play, AppGallery, or Obtainium to support the project" ?

Actually this PR brings F-Droid OM users a possibility to support OM via referral bookings. There was no such option since #7262

> with a minor referral bonus to support Organic Maps if you book it. You can use Organic Maps from Google Play, AppGallery, or Obtainium to support the project" ? Actually this PR brings F-Droid OM users a possibility to support OM via referral bookings. There was no such option since https://git.omaps.dev/organicmaps/organicmaps/pulls/7262

rtsisyk commented

2024-12-12 20:48:11 +00:00

Owner

approved this merge request

pastk closed this pull request

2024-12-12 21:50:06 +00:00

pastk merged commit into master

2024-12-12 21:50:06 +00:00

pastk commented

2024-12-12 22:04:24 +00:00

Author

Member

@organicmaps/translations please review strings changes and post amendments here (if any) - I'll submit changes in a separate PR.

`@organicmaps/translations` please review [strings changes](https://git.omaps.dev/organicmaps/organicmaps/pulls/9820/commits/7821c1d453c748952c8e193163a3f814c41267dd#diff-8e9891f34f779c3f69c75ce68b56207e638f199a26123422c079734a32496c7c) and post amendments here (if any) - I'll submit changes in a separate PR.

fitojb commented

2024-12-12 22:15:33 +00:00

(Migrated from github.com)

Enllaços d'hotels del Kayak.com

andergd commented

2024-12-13 07:07:31 +00:00

(Migrated from github.com)

Enlaces de hoteles de Kayak.com

matheusgomesms commented

2024-12-13 10:25:46 +00:00

(Migrated from github.com)

pt-BR = Desativar Kayak

matheusgomesms commented

2024-12-13 10:27:05 +00:00

(Migrated from github.com)

pt = São apresentadas fotografias, críticas e ligações de reserva para os hotéis que estão listados no Kayak.com. O bónus de referência recebido por cada reserva efetuada através destas ligações destina-se ao desenvolvimento do Organic Maps.
pt-BR = Fotos, avaliações e links de reserva são exibidos para os hotéis que estão listados no Kayak.com. O bônus de indicação recebido por cada reserva feita por meio desses links é destinado ao desenvolvimento do Organic Maps.

pt = São apresentadas fotografias, críticas e ligações de reserva para os hotéis que estão listados no Kayak.com. O bónus de referência recebido por cada reserva efetuada através destas ligações destina-se ao desenvolvimento do Organic Maps. pt-BR = Fotos, avaliações e links de reserva são exibidos para os hotéis que estão listados no Kayak.com. O bônus de indicação recebido por cada reserva feita por meio desses links é destinado ao desenvolvimento do Organic Maps.

matheusgomesms commented

2024-12-13 10:27:23 +00:00

(Migrated from github.com)

pt = Ligações de hotéis do Kayak.com

matheusgomesms commented

2024-12-13 10:27:35 +00:00

(Migrated from github.com)

Review: Commented

PT and PT-BR reviewed

**Review:** Commented PT and PT-BR reviewed

andergd commented

2024-12-13 10:46:31 +00:00

(Migrated from github.com)

eu = Kayak.com-en zerrenda bat duten hoteletarako "argazkiak, iritziak, erreserba" estekak bistaratuko dira. Esteka horien bidez egindako erreserbek lortzen dituzten hobariak Organic Maps garatzeko erabiliko dira.

eu = Kayak.com-en zerrenda bat duten hoteletarako "argazkiak, iritziak, erreserba" estekak bistaratuko dira. Esteka horien bidez egindako erreserbek lortzen dituzten hobariak Organic Maps garatzeko erabiliko dira.

andergd commented

2024-12-13 10:49:41 +00:00

(Migrated from github.com)

Review: Changes requested

ES & EU revised

**Review:** Changes requested ES & EU revised

pastk commented

2024-12-17 13:55:31 +00:00

Author

Member

Thanks for translation fixes, I've included them into #9882

Thanks for translation fixes, I've included them into https://git.omaps.dev/organicmaps/organicmaps/pulls/9882