organicmaps/organicmaps-tmp

Archived

Fork 1

WIP: [android] Improve bookmarks description #7156

Draft

Jean-BaptisteC wants to merge 2 commits from Jean-BaptisteC/linkify_desc into master

Jean-BaptisteC commented

2024-01-12 21:44:39 +00:00

(Migrated from github.com)

This PR:

Remove click listener on title, author and text TextView (to able to open links without updating lines visibility of textview)
~~Updates onMoreButtonClicked method to add Less like text in button when MAX_VISIBLE_LINES is true~~
Apply the same style on TextInputLayout
Remove weird elevation in fragment edit bookmark

Before	After

More	Less

Tested on Pixel 6 - Android 14

This PR: - Remove click listener on title, author and text TextView (to able to open links without updating lines visibility of textview) - ~~Updates onMoreButtonClicked method to add `Less` like text in button when MAX_VISIBLE_LINES is true~~ - Apply the same style on TextInputLayout - Remove weird elevation in fragment edit bookmark |Before|After| |-|-| |<img src="https://github.com/organicmaps/organicmaps/assets/87148630/943293a5-c5f9-4ee1-93c0-e4a29cf8e392" height=300 />|<img src="https://github.com/organicmaps/organicmaps/assets/87148630/164d41cf-e504-4954-a2e0-a139b00ac785" height=300 />| |More|Less| |-|-| <img src="https://github.com/organicmaps/organicmaps/assets/87148630/fe3233c9-aae3-4c65-8a48-af9f98d48ae1" height=300 />|<img src="https://github.com/organicmaps/organicmaps/assets/87148630/575b4b0b-f0ab-4c22-b41d-275e2990881b" height=300 /> Tested on Pixel 6 - Android 14

NeatNit (Migrated from github.com) requested changes 2024-01-13 01:35:59 +00:00

data/strings/strings.txt

NeatNit (Migrated from github.com) commented

2024-01-13 01:35:34 +00:00

This includes nikkud which is very rarely used in apps and daily life, and can be off-putting. Replace with:

he = פחות

I'm curious, what precisely are you using to translate? Maybe there's a tweak we can add to avoid nikkud in the future. (Or I'll just keep correcting it when it shows up, that works too...)

This includes nikkud which is very rarely used in apps and daily life, and can be off-putting. Replace with: he = פחות I'm curious, what precisely are you using to translate? Maybe there's a tweak we can add to avoid nikkud in the future. (Or I'll just keep correcting it when it shows up, that works too...)

Jean-BaptisteC (Migrated from github.com) reviewed 2024-01-13 10:31:13 +00:00

data/strings/strings.txt

Jean-BaptisteC (Migrated from github.com) commented

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

Google translate

jimcarst (Migrated from github.com) approved these changes 2024-01-13 15:18:08 +00:00

jimcarst (Migrated from github.com) left a comment

nl om

NeatNit (Migrated from github.com) reviewed 2024-01-13 15:22:48 +00:00

data/strings/strings.txt

NeatNit (Migrated from github.com) commented

2024-01-13 15:22:48 +00:00

I opened an issue upstream https://github.com/soimort/translate-shell/issues/509, assuming some use translate.py. Regardless, can you fix the translation for this PR in the meantime?

biodranik (Migrated from github.com) reviewed 2024-01-19 23:13:19 +00:00

biodranik (Migrated from github.com) left a comment

Thanks! Please rebase + strings regen

data/strings/strings.txt

biodranik (Migrated from github.com) commented

2024-01-19 23:12:00 +00:00

Which script are you using? python/tools/translate.py provides different results for me (note be and zh). I've also manually corrected some translations:

    en = Less
    af = Minder
    ar = أقل
    az = Daha az
    be = Менш
    bg = По-малко
    ca = Menys
    cs = Méně
    da = Mindre
    de = Weniger
    el = Λιγότερο
    es = Menos
    et = Vähem
    eu = Gutxiago
    fa = کمتر
    fi = Vähemmän
    fr = Moins
    he = פחות
    hi = कम
    hu = Kevesebb
    id = Kurang
    it = Meno
    ja = より少ない
    ko = 더 적은
    lt = Mažiau
    mr = कमी
    nb = Mindre
    nl = Minder
    pl = Mniej
    pt = Menos
    ro = Mai puțin
    ru = Меньше
    sk = Menej
    sv = Mindre
    sw = Chini
    th = น้อย
    tr = Daha az
    uk = Менше
    vi = Ít hơn
    zh-Hans = 更少
    zh-Hant = 較少的

Which script are you using? `python/tools/translate.py` provides different results for me (note be and zh). I've also manually corrected some translations: ``` en = Less af = Minder ar = أقل az = Daha az be = Менш bg = По-малко ca = Menys cs = Méně da = Mindre de = Weniger el = Λιγότερο es = Menos et = Vähem eu = Gutxiago fa = کمتر fi = Vähemmän fr = Moins he = פחות hi = कम hu = Kevesebb id = Kurang it = Meno ja = より少ない ko = 더 적은 lt = Mažiau mr = कमी nb = Mindre nl = Minder pl = Mniej pt = Menos ro = Mai puțin ru = Меньше sk = Menej sv = Mindre sw = Chini th = น้อย tr = Daha az uk = Менше vi = Ít hơn zh-Hans = 更少 zh-Hant = 較少的 ```

Jean-BaptisteC (Migrated from github.com) reviewed 2024-01-20 09:30:06 +00:00

data/strings/strings.txt

Jean-BaptisteC (Migrated from github.com) commented

2024-01-20 09:30:06 +00:00

Done

biodranik (Migrated from github.com) reviewed 2024-02-25 20:10:09 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

biodranik (Migrated from github.com) commented

2024-02-25 20:03:10 +00:00

Which other schemes except http(s) can be there? Is file:// scheme supported? What else?

Why a pattern approach is required?

Which other schemes except http(s) can be there? Is file:// scheme supported? What else? Why a pattern approach is required?

Jean-BaptisteC (Migrated from github.com) reviewed 2024-02-25 20:22:04 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

Jean-BaptisteC (Migrated from github.com) commented

2024-02-25 20:22:04 +00:00

Default linkify doesn't catch URL contains https or https
Linkify doesn't support file scheme -> https://developer.android.com/reference/android/text/util/Linkify and I think it's not possible to copy path of file with default file manager on phone.

Default linkify doesn't catch URL contains https or https Linkify doesn't support file scheme -> https://developer.android.com/reference/android/text/util/Linkify and I think it's not possible to copy path of file with default file manager on phone.

biodranik (Migrated from github.com) reviewed 2024-03-02 21:12:31 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

biodranik (Migrated from github.com) commented

2024-03-02 21:12:31 +00:00

What about links without http(s) schemes? Will they still be highlighted when the pattern is provided?

Jean-BaptisteC (Migrated from github.com) reviewed 2024-03-02 21:23:20 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

Jean-BaptisteC (Migrated from github.com) commented

2024-03-02 21:23:20 +00:00

Yes, you right url without https or https is not catch
this regex is ok? ^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$

Yes, you right url without https or https is not catch this regex is ok? `^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$`

biodranik (Migrated from github.com) reviewed 2024-03-02 22:04:56 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

biodranik (Migrated from github.com) commented

2024-03-02 22:04:56 +00:00

It would be great to avoid using regexes completely, they're not great...

Maybe stripping schemes before displaying them helps?

It would be great to avoid using regexes completely, they're not great... Maybe stripping schemes before displaying them helps?

j13m126 (Migrated from github.com) approved these changes 2024-03-03 15:57:30 +00:00

Jean-BaptisteC (Migrated from github.com) reviewed 2024-03-03 18:17:26 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

Jean-BaptisteC (Migrated from github.com) commented

2024-03-03 18:17:25 +00:00

We can remove http or https from description content but for example github.com is not caught by linkify.
Without my changes, linkify catch only url inside <a></a>
Maybe @rtsisyk has an idea to resolve problem?

We can remove http or https from description content but for example `github.com` is not caught by linkify. Without my changes, linkify catch only url inside `<a></a>` Maybe @rtsisyk has an idea to resolve problem?

rtsisyk reviewed 2024-03-10 08:47:14 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

rtsisyk commented

2024-03-10 08:47:14 +00:00

Owner

@Jean-BaptisteC, let's use ^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$. It is better than having only <a></a>. [a-z]+:\\/\\/[^ \\n]* is too generic and will produce false-positive matching.

@Jean-BaptisteC, let's use `^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$`. It is better than having only `<a></a>`. `[a-z]+:\\/\\/[^ \\n]*` is too generic and will produce false-positive matching.

rtsisyk requested changes 2024-03-10 08:48:37 +00:00

rtsisyk left a comment

Owner

Let's push changes in strings.txt separately.

d4f5409d (Migrated from github.com) requested changes 2024-03-10 20:00:19 +00:00

d4f5409d (Migrated from github.com) left a comment

🇭🇺 needs change

android/app/src/main/res/values-hu/strings.xml

d4f5409d (Migrated from github.com) commented

2024-03-10 19:59:48 +00:00

	<string name="description">Jegyzetek</string>

```suggestion <string name="description">Jegyzetek</string> ```

Jean-BaptisteC (Migrated from github.com) reviewed 2024-03-11 18:06:53 +00:00

android/app/src/main/res/values-hu/strings.xml

Jean-BaptisteC (Migrated from github.com) commented

2024-03-11 18:06:52 +00:00

Done

Jean-BaptisteC (Migrated from github.com) reviewed 2024-03-11 18:07:39 +00:00

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

Jean-BaptisteC (Migrated from github.com) commented

2024-03-11 18:07:39 +00:00

URL without http or https is linkify, but try to open do nothing

d4f5409d (Migrated from github.com) approved these changes 2024-03-11 19:53:03 +00:00

d4f5409d (Migrated from github.com) left a comment

🇭🇺 is ok

biodranik (Migrated from github.com) approved these changes 2024-03-24 21:56:18 +00:00

biodranik (Migrated from github.com) left a comment

Thanks!

This repo is archived. You cannot comment on pull requests.

No reviewers

NeatNit

jimcarst

j13m126

rtsisyk

d4f5409d

biodranik

No labels

Android Automotive (AAOS)

API

AppGallery

AppStore

Battery and Performance

External Map Datasets

F-Droid

Fonts

Frequently User Reported

No milestone

No project

No assignees

2 participants

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: organicmaps/organicmaps-tmp#7156

No description provided.

Rows
Columns