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

[android] New About screen #4439

Merged
merged 2 commits into from
Mar 1, 2023
Merged

[android] New About screen #4439

merged 2 commits into from
Mar 1, 2023

Conversation

rtsisyk
Copy link
Member

@rtsisyk rtsisyk commented Feb 11, 2023

I did my best to update translations... It would be nice to fit each item into one line, but this is not critical.

Edited: actualize screenshots

@Jean-BaptisteC
Copy link
Contributor

Really good changes !

  • Is it normal if blue accent color have been replace by green ? (When you long press buttons, blue accent color is always used)
  • Icons is missing in bottom sheet to access to settings and bottom sheet about each list of bookmarks
  • What about dark mode ? (In dark mode, color is blue accent color, and in About screen, OM icon is too dark)

@rtsisyk
Copy link
Member Author

rtsisyk commented Feb 11, 2023

Really good changes !

Thanks for testing!

  • Is it normal if blue accent color have been replace by green ? (When you long press buttons, blue accent color is
    always used)

This blue MAPS.ME accent color wasn't updated during initial re-styling just by a mistake. I accidentally changed this part in this PR and it looked better to me. However, it looks like a distraction of the primary goal of this PR. I am extracting this change into #4444 and reverting here to avoid any speculations.

  • Icons is missing in bottom sheet to access to settings and bottom sheet about each list of bookmarks

Fixed, thanks! This dangling "else" clause without brackets is really error-prone.

  • What about dark mode ? (In dark mode, color is blue accent color, and in About screen, OM icon is too dark)

+1 I am also not satisfied with the color of the logo in dark mode, but this is the same color as on Splash screen. I thought about changing it to white in both places, but probably it would be better to address separately.

@Jean-BaptisteC
Copy link
Contributor

Maybe we can create a different disposition for tablets in landscape mode ?
Just separate screen horizontally with first part in left (OM icon, up to report a bug button) and second part in right with all links

@rtsisyk
Copy link
Member Author

rtsisyk commented Feb 12, 2023

Maybe we can create a different disposition for tablets in landscape mode ?

Just separate screen horizontally with first part in left (OM icon, up to report a bug button) and second part in right with all links

I haven't started with landscape yet.

@rtsisyk
Copy link
Member Author

rtsisyk commented Feb 12, 2023

Added OSM data version as @biodranik desperately wanted.

data/strings/strings.txt Show resolved Hide resolved
android/res/values-de/strings.xml Outdated Show resolved Hide resolved
iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings Outdated Show resolved Hide resolved
@vng vng added Android Android development UI User interface issues labels Feb 12, 2023
Copy link
Contributor

@matheusgomesms matheusgomesms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PT and PT-BR fix

android/res/values-pt-rBR/strings.xml Outdated Show resolved Hide resolved
android/res/values-pt-rBR/strings.xml Outdated Show resolved Hide resolved
android/res/values-pt/strings.xml Outdated Show resolved Hide resolved
android/res/values-pt/strings.xml Outdated Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
@rtsisyk
Copy link
Member Author

rtsisyk commented Feb 16, 2023

@nautilusx
Copy link

@rtsisyk Can you please provide all other components (news, app strings,...) on weblate. It's easier for all and we can increase the quality. You can automagically merge the translations and the translators have an easier way to translate.

@biodranik
Copy link
Member

Can you please provide all other components (news, app strings,...) on weblate. It's easier for all and we can increase the quality. You can automagically merge the translations and the translators have an easier way to translate.

Unfortunately, weblate doesn't support our current developer workflow for editing app strings. By moving to weblate we significantly complicate strings editing and adding for all contributors. We're looking for solutions for this problem that will make it easy to contribute and review strings for developers, and for Weblate users.

@d4f5409d
Copy link
Contributor

d4f5409d commented Feb 16, 2023

Can you please provide all other components (news, app strings,...) on weblate. It's easier for all and we can increase the quality. You can automagically merge the translations and the translators have an easier way to translate.

Unfortunately, weblate doesn't support our current developer workflow for editing app strings. By moving to weblate we significantly complicate strings editing and adding for all contributors. We're looking for solutions for this problem that will make it easy to contribute and review strings for developers, and for Weblate users.

Did you reach out to Weblate already? Maybe they could help you writing support for it.

android/src/app/organicmaps/Framework.java Show resolved Hide resolved
setupItem(R.id.report, isLandscape, root);

final TextView supportUsView = root.findViewById(R.id.support_us);
if (BuildConfig.FLAVOR.equals("google") && !TextUtils.isEmpty(mDonateUrl))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove this check and see if it works with the changed wording.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't get what you propose.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I propose to always show support us. And use the hand with the heart icon for it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I have changed "Support us" to "Support the project" as was requested above. I am not sure that new wording is really much different to get away with it. Let's keep it disabled for Google Play for now.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The icon is already "hand with the heart", no changes by this patch.

data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
@biodranik
Copy link
Member

Did you reach out to Weblate already? Maybe they could help you writing support for it.

Yes, they do not support https://github.com/scelis/twine strings format that we're using (see data/strings/strings.txt for example).

It is possible however to write a Weblate addon that will support it.

Copy link
Contributor

@mpawelski mpawelski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Polish translations suggestions. Mostly fixes in conjugations because we are talking about "aplikacja" and the sentence about battery drain didn't sound natural.

data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
android/res/values-de/strings.xml Outdated Show resolved Hide resolved
android/res/values-de/strings.xml Outdated Show resolved Hide resolved
android/res/values-de/strings.xml Outdated Show resolved Hide resolved
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logo is not visible in the dark theme.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah... the night (a.k.a dark) theme is implemented in some custom way which make it is hard to maintain. I will try to deal with styles and fix this issue and accent colors.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setTint can help here, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setTint with what value? Styles are a bit messy and require refactoring.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've solved this problem. Logo is now white in the dark mode.

@rtsisyk rtsisyk requested review from LaoshuBaby, mpawelski, strump, fitojb and biodranik and removed request for strump February 19, 2023 08:42
Copy link
Contributor

@Wivik Wivik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some suggestions for French lines.

android/res/values-fr/strings.xml Outdated Show resolved Hide resolved
android/res/values-fr/strings.xml Outdated Show resolved Hide resolved
helpButton.setImageResource(R.drawable.ic_christmas_tree);
helpButton.getDrawable().setTintList(null);
helpButton.setImageResource(R.drawable.logo);
// Keep this button colorful in normal theme.
Copy link
Member

@RedAuburn RedAuburn Feb 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in my opinion, this doesn't look as good:

it might look better if the colour is changed to grey like the others? but the question mark was also good

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is intentionally green to attract attention... Otherwise users would just give us * star without even trying to read FAQ and/or report a bug... Anyway, we can experiment here.

Copy link
Member

@biodranik biodranik Feb 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I bet that any user will tap an unknown button/icon at least once.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is intentionally green to attract attention...

I bet that any user will tap an unknown button/icon at least once.

I also agree with @endim8 that this doesn't look good. Also the current question mark looks fine for me and it's much clearer that it's something related to "help/about".

For me the clean UI is one of the best things in OM. I understand that you try to get more users to read the about page, but I think many users really wouldn't like to have default UI of OM to be more "attention screaming" just to avoid some negative reviews on app stores.

I have two alternative ideas:

  1. Maybe some mixed approach would be valuable? Like having this button with green color after first install/update of application and render it in gray color after it's been clicked once?

  2. Or have possibility to disable this this button in options page? Some toggle that when it's ON then the 4 buttons change to 3 buttons (without the About Page), and the About Page appears just as another position when you click "hamburger menu" button. However, this might seem a bit like over-complicating setting page for not huge benefit. On the other hand there is already option like "hide zoom buttons" that affect what GUI element appear on app, so there is some precedence.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@endim8 @mpawelski I agree with you in general and will try to improve the situation with this button in the next updates.

@rtsisyk rtsisyk requested a review from strump February 20, 2023 07:14
@rtsisyk rtsisyk force-pushed the rt-android-about-screen branch 3 times, most recently from 631b779 to ea93b0f Compare February 25, 2023 19:56
@@ -664,8 +664,7 @@

<activity
android:name="app.organicmaps.help.HelpActivity"
android:configChanges="orientation|screenLayout|screenSize"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means that the activity will be recreated on screen rotation, and users will see a blank screen for a moment, more visible on older devices. Why is it mandatory for this PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To enable the previous landscape mode!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least some TODO can be left here. Intentionally making the app slower does not fit well into Organic Maps "we are the fastest" approach.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What TODO? This change is needed to enable separate layout for portrait and landscape. Otherwise, screen rotation will use the previous layout.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO to enable it back when layout will not be recreated.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be recreated if we want a separate landscape mode.

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setTint can help here, right?

@@ -28,6 +28,7 @@
<style name="MwmTextAppearance.Headline">
<item name="android:textSize">@dimen/text_size_headline</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:fontFamily">@string/robotoMedium</item>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if this font is not installed on a device?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This string is overridden for old APIs.

data/strings/strings.txt Show resolved Hide resolved
@@ -48,15 +48,9 @@ public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType)
public void onBindViewHolder(ViewHolder viewHolder, final int position)
{
final MenuBottomSheetItem item = dataSet.get(position);
viewHolder.getContainer().setOnClickListener((v) -> onMenuItemClick(item));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

По клику на лого можно приделать пасхалку.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Что практически предлагается сделать?

{
return format.parse(String.valueOf(dataVersion));
}
catch (ParseException e)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this catch necessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ParseException is a checked exception.

@vng
Copy link
Member

vng commented Feb 27, 2023

Take out "[strings] Regenerated." commit

data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Outdated Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
data/strings/strings.txt Show resolved Hide resolved
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
@rtsisyk rtsisyk merged commit c6ebf7f into master Mar 1, 2023
@rtsisyk rtsisyk deleted the rt-android-about-screen branch March 1, 2023 07:30
sv = Kartografiska data från OpenStreetMap från och med %@. Det är som Wikipedia där du kan lägga till eller redigera platser för alla användare över hela världen.
sw = Takwimu za katuni kutoka kwa OpenStreetMap kama ya %@. Ni kama Wikipedia ambapo unaweza kuongeza au kuhariri maeneo kwa watumiaji wote ulimwenguni.
th = ข้อมูลการทำแผนที่จาก OpenStreetMap ณ ปี %@มันเป็นเหมือนวิกิพีเดียที่คุณสามารถเพิ่มหรือแก้ไขสถานที่สำหรับผู้ใช้ทุกคนทั่วโลก
tr = Harita verileri, %@ tarihine ait OpenStreetMap verilerinden alınmıştır. OpenStreetMap, Vikipedi'nin harita sürümü gibidir: dünyadaki herkes yer ekleyebilir veya düzenleyebilir.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

   tr = Harita verileri, %@ tarihine ait OpenStreetMap verilerinden alınmıştır. OpenStreetMap, Vikipedi'nin harita sürümü gibidir: dünyadaki tüm kullanıcılar için yer ekleyebilir veya düzenleyebilirsiniz.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the exact translation. But current is also OK.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Android development UI User interface issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.