Merge pull request #4480 from owncloud/release/4.4.0

[RELEASE] 4.4.0
owncloud · Sep 30, 2024 · aca79e8 · aca79e8
2 parents c8921b7 + 4efce33
commit aca79e8
Show file tree

Hide file tree

Showing 34 changed files with 42 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Table of Contents
 
-* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
+* [Changelog for 4.4.0](#changelog-for-owncloud-android-client-440-2024-09-30)
 * [Changelog for 4.3.1](#changelog-for-owncloud-android-client-431-2024-07-22)
 * [Changelog for 4.3.0](#changelog-for-owncloud-android-client-430-2024-07-01)
 * [Changelog for 4.2.2](#changelog-for-owncloud-android-client-422-2024-05-30)
@@ -23,12 +23,12 @@
 * [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
 * [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
 * [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
-# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
+# Changelog for ownCloud Android Client [4.4.0] (2024-09-30)
 
-The following sections list the changes in ownCloud Android Client unreleased relevant to
+The following sections list the changes in ownCloud Android Client 4.4.0 relevant to
 ownCloud admins and users.
 
-[unreleased]: https://github.com/owncloud/android/compare/v4.3.1...master
+[4.4.0]: https://github.com/owncloud/android/compare/v4.3.1...v4.4.0
 
 ## Summary
 
@@ -37,6 +37,7 @@ ownCloud admins and users.
 * Bugfix - List filtering not working after rotating device: [#4441](https://github.com/owncloud/android/issues/4441)
 * Bugfix - The color of some elements is set up correctly: [#4442](https://github.com/owncloud/android/issues/4442)
 * Bugfix - Audio player does not work: [#4474](https://github.com/owncloud/android/issues/4474)
+* Bugfix - Buttons visibility in name conflicts dialog: [#4480](https://github.com/owncloud/android/pull/4480)
 * Enhancement - Improved "Remove from original folder" option in auto-upload: [#4357](https://github.com/owncloud/android/issues/4357)
 * Enhancement - Improved accessibility of information and relationships: [#4362](https://github.com/owncloud/android/issues/4362)
 * Enhancement - Changed the color of some elements to improve accessibility: [#4364](https://github.com/owncloud/android/issues/4364)
@@ -91,6 +92,14 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4474
    https://github.com/owncloud/android/pull/4479
 
+* Bugfix - Buttons visibility in name conflicts dialog: [#4480](https://github.com/owncloud/android/pull/4480)
+
+   In some languages, labels for the buttons in the name conflicts dialog were too
+   long and their visibility was very poor. These buttons have been placed in
+   vertical instead of horizontal to avoid this problem.
+
+   https://github.com/owncloud/android/pull/4480
+
 * Enhancement - Improved "Remove from original folder" option in auto-upload: [#4357](https://github.com/owncloud/android/issues/4357)
 
    The file will be deleted locally after it has been uploaded to the server,

diff --git a/changelog/unreleased/4429 → changelog/4.4.0_2024-09-30/4429 b/changelog/unreleased/4429 → changelog/4.4.0_2024-09-30/4429
diff --git a/changelog/unreleased/4433 → changelog/4.4.0_2024-09-30/4433 b/changelog/unreleased/4433 → changelog/4.4.0_2024-09-30/4433
diff --git a/changelog/unreleased/4435 → changelog/4.4.0_2024-09-30/4435 b/changelog/unreleased/4435 → changelog/4.4.0_2024-09-30/4435
diff --git a/changelog/unreleased/4437 → changelog/4.4.0_2024-09-30/4437 b/changelog/unreleased/4437 → changelog/4.4.0_2024-09-30/4437
diff --git a/changelog/unreleased/4438 → changelog/4.4.0_2024-09-30/4438 b/changelog/unreleased/4438 → changelog/4.4.0_2024-09-30/4438
diff --git a/changelog/unreleased/4448 → changelog/4.4.0_2024-09-30/4448 b/changelog/unreleased/4448 → changelog/4.4.0_2024-09-30/4448
diff --git a/changelog/unreleased/4454 → changelog/4.4.0_2024-09-30/4454 b/changelog/unreleased/4454 → changelog/4.4.0_2024-09-30/4454
diff --git a/changelog/unreleased/4455 → changelog/4.4.0_2024-09-30/4455 b/changelog/unreleased/4455 → changelog/4.4.0_2024-09-30/4455
diff --git a/changelog/unreleased/4463 → changelog/4.4.0_2024-09-30/4463 b/changelog/unreleased/4463 → changelog/4.4.0_2024-09-30/4463
diff --git a/changelog/unreleased/4467 → changelog/4.4.0_2024-09-30/4467 b/changelog/unreleased/4467 → changelog/4.4.0_2024-09-30/4467
diff --git a/changelog/unreleased/4470 → changelog/4.4.0_2024-09-30/4470 b/changelog/unreleased/4470 → changelog/4.4.0_2024-09-30/4470
diff --git a/changelog/unreleased/4472 → changelog/4.4.0_2024-09-30/4472 b/changelog/unreleased/4472 → changelog/4.4.0_2024-09-30/4472
diff --git a/changelog/unreleased/4479 → changelog/4.4.0_2024-09-30/4479 b/changelog/unreleased/4479 → changelog/4.4.0_2024-09-30/4479
diff --git a/changelog/4.4.0_2024-09-30/4480 b/changelog/4.4.0_2024-09-30/4480
@@ -0,0 +1,7 @@
+Bugfix: Buttons visibility in name conflicts dialog
+
+In some languages, labels for the buttons in the name conflicts dialog were too long and their
+visibility was very poor. These buttons have been placed in vertical instead of horizontal to avoid
+this problem.
+
+https://github.com/owncloud/android/pull/4480
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_login.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_login.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_list_view.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_list_view.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_grid_view.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_grid_view.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_drawer.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_drawer.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5_spaces.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_spaces.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6_uploads.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6_uploads.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7_share.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7_share.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/8.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/8.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/8_settings.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/8_settings.png
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
@@ -96,8 +96,8 @@ android {
 
         testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
 
-        versionCode = 43000101
-        versionName = "4.4.0-beta.1"
+        versionCode = 44000000
+        versionName = "4.4.0"
 
         buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
         buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""

diff --git a/...App/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt b/...App/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt
@@ -50,21 +50,11 @@ class ReleaseNotesViewModel(
                 subtitle = R.string.release_notes_4_4_0_subtitle_improved_from_original_folder_auto_upload,
                 type = ReleaseNoteType.ENHANCEMENT
             ),
-            ReleaseNote(
-                title = R.string.release_notes_4_3_0_title_accessibility_improvements,
-                subtitle = R.string.release_notes_4_3_0_subtitle_accessibility_improvements,
-                type = ReleaseNoteType.ENHANCEMENT
-            ),
             ReleaseNote(
                 title = R.string.release_notes_4_4_0_title_resharing_capability,
                 subtitle = R.string.release_notes_4_4_0_subtitle_resharing_capability,
                 type = ReleaseNoteType.ENHANCEMENT
             ),
-            ReleaseNote(
-                title = R.string.release_notes_bugfixes_title,
-                subtitle = R.string.release_notes_bugfixes_subtitle,
-                type = ReleaseNoteType.BUGFIX
-            ),
             ReleaseNote(
                 title = R.string.release_notes_4_4_6_4_bugfixes_title,
                 subtitle = R.string.release_notes_4_4_6_4_bugfixes_subtitle,
@@ -75,6 +65,16 @@ class ReleaseNotesViewModel(
                 subtitle = R.string.release_notes_4_4_0_subtitle_audio_player_android14,
                 type = ReleaseNoteType.BUGFIX
             ),
+            ReleaseNote(
+                title = R.string.release_notes_4_3_0_title_accessibility_improvements,
+                subtitle = R.string.release_notes_4_3_0_subtitle_accessibility_improvements,
+                type = ReleaseNoteType.ENHANCEMENT
+            ),
+            ReleaseNote(
+                title = R.string.release_notes_bugfixes_title,
+                subtitle = R.string.release_notes_bugfixes_subtitle,
+                type = ReleaseNoteType.BUGFIX
+            ),
         )
     }
 }
diff --git a/owncloudApp/src/main/res/layout/dialog_file_already_exists.xml b/owncloudApp/src/main/res/layout/dialog_file_already_exists.xml
@@ -53,28 +53,31 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/activity_horizontal_margin"
                 android:gravity="end"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
                 <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/dialog_file_already_exists_skip"
+                    android:id="@+id/dialog_file_already_exists_replace"
                     style="@style/Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/welcome_feature_skip_button" />
+                    android:gravity="end|center_vertical"
+                    android:text="@string/conflict_replace" />
 
                 <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/dialog_file_already_exists_replace"
+                    android:id="@+id/dialog_file_already_exists_keep_both"
                     style="@style/Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/conflict_replace" />
+                    android:gravity="end|center_vertical"
+                    android:text="@string/conflict_keep_both" />
 
                 <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/dialog_file_already_exists_keep_both"
+                    android:id="@+id/dialog_file_already_exists_skip"
                     style="@style/Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/conflict_keep_both" />
+                    android:gravity="end|center_vertical"
+                    android:text="@string/welcome_feature_skip_button" />
 
             </LinearLayout>
         </LinearLayout>