From 3f935261e0176fe2af9966a33530dd1e7355392b Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 9 Sep 2022 07:26:34 -0700
Subject: [PATCH] Fix #4348: Prepare for Beta MR1 by updating version codes &
 pulling in the latest pt-BR translations (#4565)

## Explanation
Fixes #4348

This PR performs the final preparation tasks necessary for the MR1 Beta release to be cut. Specifically:
- It updates the version codes & minor version.
- It pulls the latest pt-BR translations (for the ones that didn't make it in the automatic Thursday Translatewiki push).
- It addresses the final open comments from #4081 which included me needing to do the pt-BR translation for 2 strings related to profile names (I used Google Translate then made minor modifications).

There are no tests affected directly by these changes (though we could consider adding some in the future).

## Essential Checklist
- [x] The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
- [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation.
- [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
For the most part this PR is not UI-tied (though obviously the 1 English string change and all of the pt-BR string changes affect UIs). I'm deciding not to include screenshots for string-only changes since they aren't very interesting in this case (i.e. they don't seem like they would actually break the UI to warrant including screenshots).

Commits:

* Create dedicated alpha application component.

This simplifies application component management significantly and
allows individual build flavors to have their own unique module lists.

* Add beta & GA update notices.

This also introduces dedicated beta & GA build flavors which is a
necessary prerequisite.

It also introduces an extra beta, alpha, and dev mode labels for the splash
screen (the latter 2 were extra) with 2 second minimum wait timers for
beta and alpha to ensure they are seen. A 5-second safety timer was
added to ensure the splash screen can always be passed even if something
goes wrong at the domain level (since there are now quite a few moving
pieces to determine the user's current onboarding state).

* Add build tests for the new beta & GA flavors.

* Fix broken test per earlier changes.

* Fix general broken tests & builds.

Tests broken due to changes to the app startup experience haven't yet
been fixed.

* Lint fixes.

* First part of adding tests for GA notices.

There's a bunch left to do here, this is mainly needed so that I can
transfer changes to a different machine.

* Update TransformAndroidManifestTest.kt

Correct typos.

* Fix tests & static checks.

This also removes temporary debug code and TODOs, and finishes the tests
for SplashActivity.

* Post-merge fixes.

* Test fixes.

* Fix Gradle test.

* Add some string resource checks/tools.

Also, fixes major performance issue with all file-based CI checks.

* Ensure newline consistency in translated strings.

Also, fix reporting in new validation check script.

* Add tests & fix static checks.

* Update version codes & pt-BR strings.

The strings were manually pulled Translatewiki.

* Follow-up adjustments after self-review.

* Add latest translated pt-BR strings.

* Address comments from #4081.
---
 app/src/main/res/values-pt-rBR/strings.xml    | 21 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  2 +-
 .../util/profile/ProfileNameValidatorTest.kt  |  2 +-
 version.bzl                                   | 17 +++++++--------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7c7ede84acf..4b14f4da952 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -236,8 +236,8 @@
   <string name="add_profile_pin_info">Com um PIN, ninguém mais pode acessar um perfil além deste usuário atribuído.</string>
   <string name="add_profile_error_image_failed_store">Falha ao armazenar sua imagem de avatar. Por favor, tente novamente.</string>
   <string name="add_profile_error_name_not_unique">Este nome já está em uso por outro perfil.</string>
-  <string name="add_profile_error_name_empty">Por favor, insira um nome para este perfil.</string>
-  <string name="add_profile_error_name_only_letters">Os nomes podem ter apenas letras. Tente outro nome.</string>
+  <string name="add_profile_error_name_empty">Por favor, insira um nome válido para este perfil.</string>
+  <string name="add_profile_error_name_only_letters">Por favor, escolha um nome de perfil que não inclua números ou símbolos.</string>
   <string name="add_profile_error_pin_length">Seu PIN deve ter 3 dígitos.</string>
   <string name="add_profile_error_pin_confirm_wrong">Certifique-se de que os dois PINs coincidam.</string>
   <string name="add_profile_info_content_description">Mais informações sobre PINs de 3 dígitos.</string>
@@ -261,14 +261,17 @@
   <string name="pin_password_user_enter">Por favor, insira seu PIN.</string>
   <string name="input_pin_password_as_admin">PIN de 5 dígitos do administrador.</string>
   <string name="input_pin_password_as_user">PIN de 3 dígitos do usuário.</string>
-  <string name="pin_password_forgot_pin" fuzzy="true">Eu esqueci meu pin.</string>
+  <string name="pin_password_forgot_pin">Esqueceu o PIN?</string>
   <string name="pin_password_incorrect_pin">PIN incorreto.</string>
   <string name="pin_password_show">Mostrar</string>
   <string name="pin_password_hide">Esconder</string>
   <string name="pin_password_close">Fechar</string>
   <string name="pin_password_success">A alteração do PIN foi bem-sucedida</string>
   <string name="pin_password_forgot_title">Esqueceu o PIN?</string>
-  <string name="admin_forgot_pin_message" fuzzy="true">Para redefinir seu PIN, desinstale %s e reinstale-o.\n\nLembre-se de que, se o dispositivo não estiver online, você pode perder o progresso do usuário em várias contas.</string>
+  <string name="admin_forgot_pin_message">Para redefinir seu PIN, você precisará limpar todos os dados salvos de %s.\n\nLembre-se de que essa ação fará com que todos os perfis e o progresso do usuário sejam excluídos e não pode ser desfeito. Além disso, o aplicativo será fechado quando isso for concluído e precisará ser reaberto.</string>
+  <string name="admin_forgot_pin_reset_app_data_button_text">Redefinir dados de %s.</string>
+  <string name="admin_confirm_app_wipe_title">Confirmar redefinição de dados de %s</string>
+  <string name="admin_confirm_app_wipe_message">Tem certeza de que deseja excluir todos os perfis %s neste dispositivo? Esta ação não poderá ser desfeita.</string>
   <string name="admin_confirm_app_wipe_positive_button_text">Sim</string>
   <string name="admin_confirm_app_wipe_negative_button_text">Não</string>
   <string name="show_hide_password_icon">Mostrar/Esconder ícone da senha</string>
@@ -369,7 +372,7 @@
   <string name="welcome">\"Bem-vindo %s!\"</string>
   <string name="what_do_you_want_to_learn">O que você quer aprender?</string>
   <string name="great">Ótimo</string>
-  <string name="lets_get_started" fuzzy="true">Vamos começar.</string>
+  <string name="lets_get_started">Vamos começar.</string>
   <string name="yes">Sim</string>
   <string name="no">Não...</string>
   <string name="pick_a_different_topic">Escolha um\ntópico diferente.</string>
@@ -420,8 +423,16 @@
   <string name="unsupported_app_version_dialog_title">Versão do aplicativo não suportada</string>
   <string name="unsupported_app_version_dialog_message">Esta versão do aplicativo não é mais suportada. Atualize-a na Play Store.</string>
   <string name="unsupported_app_version_dialog_close_button_text">Fechar aplicativo</string>
+  <string name="splash_screen_developer_label">Versão do desenvolvedor</string>
+  <string name="splash_screen_alpha_label">Alfa</string>
   <string name="splash_screen_beta_label">Beta</string>
+  <string name="beta_notice_dialog_title">Aviso Beta</string>
+  <string name="beta_notice_dialog_message">Olá! Seu aplicativo está sendo atualizado para a versão Beta. Se você tiver problemas ao usar o aplicativo ou tiver dúvidas, entre em contato conosco em android-feedback@oppia.org.</string>
+  <string name="beta_notice_dialog_do_not_show_again_text">Não exibir esta mensagem novamente</string>
   <string name="beta_notice_dialog_close_button_text">OK</string>
+  <string name="general_availability_notice_dialog_title">Aviso de disponibilidade geral</string>
+  <string name="general_availability_notice_dialog_message">Olá! Seu aplicativo está sendo atualizado para a versão de disponibilidade geral. Se você tiver problemas ao usar o aplicativo ou tiver dúvidas, entre em contato conosco em android-feedback@oppia.org.</string>
+  <string name="general_availability_notice_dialog_do_not_show_again_text">Não exibir esta mensagem novamente</string>
   <string name="general_availability_notice_dialog_close_button_text">OK</string>
   <string name="ratio_content_description_separator">para</string>
   <string name="ratio_default_hint_text">Insira uma razão no formato x:y.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f2051c2c934..666992bef7a 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -271,7 +271,7 @@
   <string name="add_profile_error_image_failed_store">We failed to store your avatar image. Please try again.</string>
   <string name="add_profile_error_name_not_unique">This name is already in use by another profile.</string>
   <string name="add_profile_error_name_empty">Please enter a valid name for this profile.</string>
-  <string name="add_profile_error_name_only_letters">Names can only have letters. Try another name?</string>
+  <string name="add_profile_error_name_only_letters">Please choose a profile name that doesn\'t include numbers or symbols.</string>
   <string name="add_profile_error_pin_length">Your PIN should be 3 digits long.</string>
   <string name="add_profile_error_pin_confirm_wrong">Please make sure that both PINs match.</string>
   <string name="add_profile_info_content_description">More information on 3-digit PINs.</string>
diff --git a/utility/src/test/java/org/oppia/android/util/profile/ProfileNameValidatorTest.kt b/utility/src/test/java/org/oppia/android/util/profile/ProfileNameValidatorTest.kt
index 129bf69807e..7dbbceee779 100644
--- a/utility/src/test/java/org/oppia/android/util/profile/ProfileNameValidatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/profile/ProfileNameValidatorTest.kt
@@ -33,7 +33,7 @@ class ProfileNameValidatorTest {
   lateinit var name: String
 
   @Before
-  fun setup() {
+  fun setUp() {
     setUpTestApplicationComponent()
   }
 
diff --git a/version.bzl b/version.bzl
index 06510b95a88..ac790ba712c 100644
--- a/version.bzl
+++ b/version.bzl
@@ -7,14 +7,13 @@ their device qualifies for more than one choice.
 """
 
 MAJOR_VERSION = 0
-MINOR_VERSION = 8
+MINOR_VERSION = 9
 
 # TODO(#4419): Remove the Kenya-specific alpha version code.
-# TODO(#4348): Offset these version codes by '+1' for the next release.
-OPPIA_DEV_KITKAT_VERSION_CODE = 27
-OPPIA_DEV_VERSION_CODE = 28
-OPPIA_ALPHA_KITKAT_VERSION_CODE = 29
-OPPIA_ALPHA_VERSION_CODE = 30
-OPPIA_ALPHA_KENYA_VERSION_CODE = 31
-OPPIA_BETA_VERSION_CODE = 32
-OPPIA_GA_VERSION_CODE = 33
+OPPIA_DEV_KITKAT_VERSION_CODE = 34
+OPPIA_DEV_VERSION_CODE = 35
+OPPIA_ALPHA_KITKAT_VERSION_CODE = 36
+OPPIA_ALPHA_VERSION_CODE = 37
+OPPIA_ALPHA_KENYA_VERSION_CODE = 38
+OPPIA_BETA_VERSION_CODE = 39
+OPPIA_GA_VERSION_CODE = 40