Add Privacy Policy page #72

Linfye · 2024-08-27T08:24:52Z

Contributor checklist

This pull request is on a separate branch and not the main branch

Description

This PR adds a privacy policy page.

But the page does not show line breaks. I have tried editing string.xml with "\n\n" but it changed back after I built the project. So it looks like this now:

I search it on Google and tried many ways but can't solve it. I am new in Android App developing. Can you help me with this? @angrezichatterbox

Related issue

Add the Privacy policy page to About tab #59

github-actions · 2024-08-27T08:25:03Z

Thank you for the pull request!

The Scribe team will do our best to address your contribution as soon as we can. The following is a checklist for maintainers to make sure this process goes as well as possible. Feel free to address the points below yourself in further commits if you realize that actions are needed :)

If you're not already a member of our public Matrix community, please consider joining! We'd suggest using Element as your Matrix client, and definitely join the General and Android rooms once you're in. Also consider joining our bi-weekly Saturday dev syncs. It'd be great to have you!

Maintainer checklist

The commit messages for the remote branch should be checked to make sure the contributor's email is set up correctly so that they receive credit for their contribution
- The contributor's name and icon in remote commits should be the same as what appears in the PR
- If there's a mismatch, the contributor needs to make sure that the email they use for GitHub matches what they have for git config user.email in their local Scribe-Android repo
The CHANGELOG has been updated with a description of the changes for the upcoming release and the corresponding issue (if necessary)

andrewtavis · 2024-08-27T09:04:21Z

Thanks for the PR, @Linfye! Greta to have you over here :) Let's be sure to not edit the texts as those are from Scribe-i18n and we need to be able to pull, but we can reset those after the PR. @angrezichatterbox, let us know if you have suggestions on the line breaks 😊

angrezichatterbox · 2024-08-27T09:30:41Z

Thanks for the PR, @Linfye! Greta to have you over here :) Let's be sure to not edit the texts as those are from Scribe-i18n and we need to be able to pull, but we can reset those after the PR. @angrezichatterbox, let us know if you have suggestions on the line breaks 😊

It seems that the script written for the Scribe-i18n adds a new line to the XML file instead of adding a \n from the json. A possible fix would be to make the script to be ignoring the \n. It was an undersight from part. Sorry. Another fix could be using regex in the Kotlin front to load the text. It would be better to make the script ignore it right ?

angrezichatterbox

Your PR looks mostly Great @Linfye. There is a small change to be made that's it. Hope we can see you make more contributions to Scribe-Android :)

angrezichatterbox · 2024-08-27T10:21:00Z

app/src/main/res/layout/activity_privacy_policy.xml

+                        <TextView
+                            android:singleLine="false"
+                            android:layout_width="304dp"
+                            android:layout_height="3560dp"


Could the height be changed to wrap_content. Since I am seeing a lot of space after the content since the layout height is fixed.

I saved these space lines for the line breaks. It should fix then.

Wouldn't wrap_content be enough even if the new lines are there?

Oh, I know. I changed the height to wrap_content now.

angrezichatterbox · 2024-08-27T14:34:26Z

app/src/main/res/layout/activity_privacy_policy.xml

+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="56dp"
+                android:text="@string/app.about.privacyPolicy"


Could you change this text to say Keeping you safe from the strings.xml

angrezichatterbox · 2024-08-27T14:49:51Z

@Linfye A temporary fix for the line breaks could be to use regex with HTML formatting. One thing I noticed is that most of the single lines should be in a single paragraph. You add a break like after each . This could also be done @andrewtavis.

Linfye · 2024-08-27T15:02:39Z

@Linfye A temporary fix for the line breaks could be to use regex with HTML formatting. One thing I noticed is that most of the single lines should be in a single paragraph. You add a break like after each . This could also be done @andrewtavis.

But this will split these places:

🧐

andrewtavis · 2024-08-27T16:24:17Z

Big thing is that we want the texts that are used here to be directly in Scribe-i18n. No formatting should be necessary within Scribe-Android. I'll check the changes in the most recent i18n PR and maybe we can bring those in here :)

1e07813 Merge pull request scribe-org#42 from angrezichatterbox/XML-TO-JSON-FIX 2a8fe2a fix:Added escape characters for \n 924f00c scribe-org#37 minor edits to conversion scripts and try new command path aafa0f6 scribe-org#37 update Scribe-i18n structure and fix conversion workflow 6a8faaa Merge pull request scribe-org#39 from Jag-Marcel/i18n-refactor 2b9caff Added newline at end of all JSON files e775e46 Updated jsons and xcstrings file using new iOS scripts dd018c1 Refactored iOS conversion scripts to use python json package 7f8c273 Updated conversion workflow to use paths filter instead of conditional check ff21cdb Refactored scripts into new iOS and Android folders git-subtree-dir: app/src/main/assets/i18n git-subtree-split: 1e07813b694edc57934b46ec76943cc1e974d4fb

…e/72

andrewtavis · 2024-08-27T17:22:52Z

Ok @Linfye and @angrezichatterbox: This branch now has the updated i18n keys for Android. Let me know if it's working!

Linfye · 2024-08-28T02:24:07Z

Ok @Linfye and @angrezichatterbox: This branch now has the updated i18n keys for Android. Let me know if it's working!

I pull the update and it works fine now. Thank you!😄

andrewtavis · 2024-08-28T07:32:32Z

Ok great, @Linfye, but what were the changes to the string files in your last commit? These files should only be what is brought in from the Scribe-i18n project, so it changes are needed still then we need to make them in Scribe-i18n and then bring them here :)

Maybe I'm misunderstanding though. Thanks so much for the work here!

Linfye · 2024-08-28T07:39:28Z

Ok great, @Linfye, but what were the changes to the string files in your last commit? These files should only be what is brought in from the Scribe-i18n project, so it changes are needed still then we need to make them in Scribe-i18n and then bring them here :)

Maybe I'm misunderstanding though. Thanks so much for the work here!

I didn't push those changes. :)

andrewtavis · 2024-08-28T07:44:59Z

Just checking, I'm talking this commit here that comes after my commits to import Scribe-i18n. Maybe it's looking weird on GitHub mobile (I'm on the way to work and am trying to check this)? I'm just considering that those changes might be conflicts for future Scribe-i18n updates as we need to maintain the same git history as the Scribe-i18n repo.

angrezichatterbox · 2024-08-28T07:51:06Z

Just checking, I'm talking this commit here that comes after my commits to import Scribe-i18n. Maybe it's looking weird on GitHub mobile (I'm on the way to work and am trying to check this)? I'm just considering that those changes might be conflicts for future Scribe-i18n updates as we need to maintain the same git history as the Scribe-i18n repo.

That's the change the gradle bought. The gradle changed the existing values of the Android project from the assets folder. It did not change the contents of the assets folder.

andrewtavis · 2024-08-28T08:36:27Z

Ah ok, perfect :) Thanks so much for the explanation, @angrezichatterbox, and sorry for the confusion, @Linfye! I had a feeling I just wasn't seeing something 😇

I'll bring this in later today :) Let us know if there's another issue that's of interest, @Linfye!

andrewtavis

Thanks for all the work here, @Linfye! Really happy to have you on the project and also it's so great that you're already onto your next issue 😊

We've getting a real team here now with multiple people! 🎉

c916c4d Update xcstrings and de/sv strings given new localizations 0a58b1c Merge pull request #75 from weblate/weblate-scribe-scribe-i18n 6b43bfd Translated using Weblate (Swedish) f193e49 Translated using Weblate (German) 4f60287 Translated using Weblate (Swedish) 1422f5e Convert Korean JSON to xcstrings and Android values 718ab45 Update all xcstrings and strings files given new localizations 8c13530 Merge pull request #73 from yerimmii/ko-json bc78915 Create ko.json 3f2a3de Minor edit to .gitignore for spacing e40d892 Merge pull request #72 from axif0/bangla 1afc6ea Creating Bangla localization 23c56ed Merge pull request #70 from KesharwaniArpita/ArpitaContributionsMarathi d49ed68 Create string.xml 7dc4b73 Create mr.json (Marathi) 6bc6502 Merge pull request #69 from axif0/work 933237d Update pr_maintainer_checklist.yaml fa75400 Merge pull request #68 from OmarAI2003/MSA-internationalization 329ad53 Translate from en to ar c81e3a1 Add Arabic translation file (ar.json) for localization support 45bce87 Merge pull request #66 from OmarAI2003/improve-android-convert-str-to-json b774027 Minor spacing and removing permissions error a3eeda1 Merge pull request #67 from weblate/weblate-scribe-scribe-i18n c67255b Translated using Weblate (Spanish) 7054971 fix: add check for missing values_directory a90a040 Error handling for file read and write operations 9295291 Use a single variable for the 'jsons' folder path and add error handling for missing 'jsons' folder. 5e85b16 Merge pull request #64 from OmarAI2003/improve-android-convert-jsons-to-strings 94482ef Added docstrings to Android string conversion functions 2a7b35b for the recently supported language: adding the 'hi' language folder generated by the script to prevent 'directory not found' errors when testing the reverse conversion (JSON to strings). 13a4849 small fix to the lang_dir e5ca964 Refactor: Pre-load language JSON files before generating strings.xml files f8ffe63 Use a single variable for the 'jsons' folder path and add error handling for missing 'jsons' folder. 7dbeaa1 Merge pull request #62 from OmarAI2003/improve-convert-jsons-to-xcstrings a3e5fbf Minor edits to script spacing and comments 5fb2fc5 Merge pull request #63 from KesharwaniArpita/ArpitaContributionsHindi fd91955 Create hi.json 9fcc0de fix: update inline comments to start with lowercase as per style guide. 8925a4b Rename variable for improved clarity aee58c0 Add error handling for missing base language file d41c8eb Remove automatic creation of the 'jsons' folder d811de7 Optimize performance by pre-loading language JSON files 81da648 Refactor: Use a single variable for the 'jsons' folder path and ensure it exists. f354bb4 Fix file handling: Use context managers to ensure safe reading and writing of files. 13d52f2 Merge pull request #58 from OmarAI2003/improve-convert-xcstrings-to-jsons 8b13ee6 Fix to en.json being written rather than en-US + minor edits 2a7e03d Merge pull request #61 from weblate/weblate-scribe-scribe-i18n f0abf87 Translated using Weblate (French) 6c4acae Merge pull request #60 from OmarAI2003/fix-typo-in-readme.md d30380a Revert: Move Localizable.xcstrings back to original location 46a68da moved Localizable.xcstrings again where it was as andrew told me d426a4b Fix typo in README: Changed 'an tools' to 'tools' 0d48009 made the changes as per the feedback and added Localizable.xcstrings to 'jsons' directory 42e76dd Improve language handling and ensure directory creation b1ccff7 Refactor: Use context manager for writing JSON files to ensure proper file handling. 5b97d83 Add JSON loading error handling in convert_xcstrings_to_jsons.py 32b8f70 Improve file handling in convert_xcstrings_to_jsons.py 7536be6 Update app menu headings to not include second word caps c286cf2 Merge pull request #50 from weblate/weblate-scribe-scribe-i18n 3038710 Translated using Weblate (Spanish) b80ddc7 Translated using Weblate (Spanish) faf7ce3 Various fixes of strings and adding conjugate keys 1eb7d47 Minor update to readme headers 04574f8 Remove unused keys and fix colon spacing 8492a7a Make sure that application names are not localized 0ac6710 Merge pull request #48 from weblate/weblate-scribe-scribe-i18n 80708cb Translated using Weblate (Spanish) dd15564 Merge pull request #47 from weblate/weblate-scribe-scribe-i18n f05f74d Translated using Weblate (Spanish) git-subtree-dir: app/src/main/assets/i18n git-subtree-split: c916c4d563c2cf2ba8735494a76e97a6a1c912c2

Linfye added 2 commits August 27, 2024 16:02

Add Privacy Policy page

67934ab

Fix shield_lock.xml

1c1979b

andrewtavis requested review from angrezichatterbox and andrewtavis August 27, 2024 09:02

angrezichatterbox reviewed Aug 27, 2024

View reviewed changes

Fix hight

bfd976c

angrezichatterbox reviewed Aug 27, 2024

View reviewed changes

Fix tab upper title

bc68979

andrewtavis added 2 commits August 27, 2024 19:21

Merge commit '5d5b9b5f97e010bb9825961fd488a8d38ac2001e' into pr/Linfy…

3417ec1

…e/72

Update string.xml for line breaks

f440202

andrewtavis approved these changes Aug 29, 2024

View reviewed changes

andrewtavis merged commit 3553e43 into scribe-org:main Aug 29, 2024

andrewtavis mentioned this pull request Aug 29, 2024

Add the Privacy policy page to About tab #59

Closed

2 tasks

Linfye deleted the privacy-policy-page branch August 29, 2024 08:31

Linfye mentioned this pull request Aug 29, 2024

Third party page #75

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Privacy Policy page #72

Add Privacy Policy page #72

Linfye commented Aug 27, 2024 •

edited

Loading

github-actions bot commented Aug 27, 2024 •

edited by andrewtavis

Loading

andrewtavis commented Aug 27, 2024

angrezichatterbox commented Aug 27, 2024 •

edited

Loading

angrezichatterbox left a comment •

edited

Loading

angrezichatterbox Aug 27, 2024 •

edited

Loading

Linfye Aug 27, 2024

angrezichatterbox Aug 27, 2024

Linfye Aug 27, 2024

angrezichatterbox Aug 27, 2024

Linfye Aug 27, 2024

angrezichatterbox commented Aug 27, 2024

Linfye commented Aug 27, 2024

andrewtavis commented Aug 27, 2024

andrewtavis commented Aug 27, 2024

Linfye commented Aug 28, 2024

andrewtavis commented Aug 28, 2024

Linfye commented Aug 28, 2024

andrewtavis commented Aug 28, 2024

angrezichatterbox commented Aug 28, 2024 •

edited

Loading

andrewtavis commented Aug 28, 2024

andrewtavis left a comment

Add Privacy Policy page #72

Add Privacy Policy page #72

Conversation

Linfye commented Aug 27, 2024 • edited Loading

Contributor checklist

Description

Related issue

github-actions bot commented Aug 27, 2024 • edited by andrewtavis Loading

Thank you for the pull request!

Maintainer checklist

andrewtavis commented Aug 27, 2024

angrezichatterbox commented Aug 27, 2024 • edited Loading

angrezichatterbox left a comment • edited Loading

Choose a reason for hiding this comment

angrezichatterbox Aug 27, 2024 • edited Loading

Choose a reason for hiding this comment

Linfye Aug 27, 2024

Choose a reason for hiding this comment

angrezichatterbox Aug 27, 2024

Choose a reason for hiding this comment

Linfye Aug 27, 2024

Choose a reason for hiding this comment

angrezichatterbox Aug 27, 2024

Choose a reason for hiding this comment

Linfye Aug 27, 2024

Choose a reason for hiding this comment

angrezichatterbox commented Aug 27, 2024

Linfye commented Aug 27, 2024

andrewtavis commented Aug 27, 2024

andrewtavis commented Aug 27, 2024

Linfye commented Aug 28, 2024

andrewtavis commented Aug 28, 2024

Linfye commented Aug 28, 2024

andrewtavis commented Aug 28, 2024

angrezichatterbox commented Aug 28, 2024 • edited Loading

andrewtavis commented Aug 28, 2024

andrewtavis left a comment

Choose a reason for hiding this comment

Linfye commented Aug 27, 2024 •

edited

Loading

github-actions bot commented Aug 27, 2024 •

edited by andrewtavis

Loading

angrezichatterbox commented Aug 27, 2024 •

edited

Loading

angrezichatterbox left a comment •

edited

Loading

angrezichatterbox Aug 27, 2024 •

edited

Loading

angrezichatterbox commented Aug 28, 2024 •

edited

Loading