Skip to content

Commit

Permalink
Merge branch 'release/tchap_v2.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Renaud committed Aug 16, 2022
2 parents 134174b + c254f23 commit 75e8112
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 9 deletions.
13 changes: 13 additions & 0 deletions TCHAP_CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
Changes in Tchap 2.4.1 (2022-08-16)
===================================

Improvements 🙌
--------------
- Auto-capitalize the room creation title field ([#687](https://github.com/tchapgouv/tchap-android-v2/issues/687))

Other changes
-------------
- Rename the action "Remove this room from the forums directory" to "Convert to private room (irreversible)" ([#669](https://github.com/tchapgouv/tchap-android-v2/issues/669))
- [Menu - Report Bug] Do not select "send screenshot" by default ([#686](https://github.com/tchapgouv/tchap-android-v2/issues/686))
- Remove Android Auto support ([#703](https://github.com/tchapgouv/tchap-android-v2/issues/703))

Changes in Tchap 2.4.0 (2022-08-03)
===================================

Expand Down
2 changes: 1 addition & 1 deletion towncrier.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.towncrier]
version = "2.4.0"
version = "2.4.1"
directory = "changelog.d"
filename = "TCHAP_CHANGES.md"
name = "Changes in Tchap"
Expand Down
2 changes: 1 addition & 1 deletion vector/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ext.versionMinor = 4
// Note: even values are reserved for regular release, odd values for hotfix release.
// When creating a hotfix, you should decrease the value, since the current value
// is the value for the next regular release.
ext.versionPatch = 0
ext.versionPatch = 1

static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,8 @@ class HomeActivity :
return true
}
R.id.menu_home_report_bug -> {
bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT)
// Tchap: Disable default value for screenshot
bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT, withScreenshot = false)
return true
}
R.id.menu_home_init_sync_legacy -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class RoomSettingsController @Inject constructor(
val host = this
buildProfileAction(
id = "removeFromRoomsDirectory",
title = stringProvider.getString(R.string.tchap_room_settings_remove_from_directory),
title = stringProvider.getString(R.string.tchap_room_settings_convert_to_private),
divider = true,
destructive = true,
editable = false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class RoomSettingsFragment @Inject constructor(
override fun onRemoveFromRoomsDirectory() {
MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
.setTitle(R.string.dialog_title_warning)
.setMessage(getString(R.string.tchap_room_settings_remove_from_directory_prompt_msg))
.setMessage(getString(R.string.tchap_room_settings_convert_to_private_prompt_msg))
.setPositiveButton(R.string.yes) { _, _ ->
viewModel.handle(RoomSettingsAction.RemoveFromRoomsDirectory)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone"
android:inputType="textCapSentences"
tools:hint="@string/create_room_name_hint" />

</com.google.android.material.textfield.TextInputLayout>
Expand Down
4 changes: 2 additions & 2 deletions vector/src/main/res/values-fr/strings_tchap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<string name="tchap_scan_media_error_file_is_infected">Le fichier est infecté, impossible de le télécharger.</string>

<!-- tchap room settings -->
<string name="tchap_room_settings_remove_from_directory">Retirer ce salon de la liste des forums</string>
<string name="tchap_room_settings_remove_from_directory_prompt_msg"><b>Cette action est irréversible.</b>\nVoulez-vous vraiment retirer ce salon de la liste des forums ?</string>
<string name="tchap_room_settings_convert_to_private">Convertir en salon privé (irréversible)</string>
<string name="tchap_room_settings_convert_to_private_prompt_msg"><b>Cette action est irréversible.</b>\nVoulez-vous vraiment convertir ce forum en salon privé ?</string>
<string name="tchap_room_settings_room_access_title">Gestion des comptes externes</string>
<string name="tchap_room_settings_room_access_restricted">Les externes ne sont pas autorisés à rejoindre ce salon</string>
<string name="tchap_room_settings_room_access_unrestricted">Les externes sont autorisés à rejoindre ce salon</string>
Expand Down
4 changes: 2 additions & 2 deletions vector/src/main/res/values/strings_tchap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<string name="tchap_scan_media_error_file_is_infected">We have detected that this file is infected, so it cannot be downloaded.</string>

<!-- tchap room settings -->
<string name="tchap_room_settings_remove_from_directory">Remove this room from the forums directory</string>
<string name="tchap_room_settings_remove_from_directory_prompt_msg"><b>This action is irreversible.</b>\nAre you sure you want to remove this room from the forums directory?</string>
<string name="tchap_room_settings_convert_to_private">Convert to private room (irreversible)</string>
<string name="tchap_room_settings_convert_to_private_prompt_msg"><b>This action is irreversible.</b>\nAre you sure you want to convert this forum into a private room?</string>
<string name="tchap_room_settings_room_access_title">External accounts handling</string>
<string name="tchap_room_settings_room_access_restricted">The externals are not allowed to join this room</string>
<string name="tchap_room_settings_room_access_unrestricted">The externals are allowed to join this room</string>
Expand Down

0 comments on commit 75e8112

Please sign in to comment.