Browse Source

Merge pull request #2865 from nextcloud/feature/2819/addCallRecordingsToSharedItems

Feature/2819/add call recordings to shared items
Marcel Hibbe 2 years ago
parent
commit
5899583b9f

+ 9 - 0
app/src/main/java/com/nextcloud/talk/shareditems/activities/SharedItemsActivity.kt

@@ -3,6 +3,8 @@
  *
  * @author Tim Krüger
  * @author Álvaro Brey
+ * @author Marcel Hibbe
+ * Copyright (C) 2023 Marcel Hibbe <dev@mhibbe.de>
  * Copyright (C) 2022 Álvaro Brey
  * Copyright (C) 2022 Tim Krüger <t@timkrueger.me>
  *
@@ -189,6 +191,13 @@ class SharedItemsActivity : AppCompatActivity() {
             binding.sharedItemsTabs.addTab(tabAudio)
         }
 
+        if (sharedItemTypes.contains(SharedItemType.RECORDING)) {
+            val tabRecording: TabLayout.Tab = binding.sharedItemsTabs.newTab()
+            tabRecording.tag = SharedItemType.RECORDING
+            tabRecording.setText(R.string.shared_items_recording)
+            binding.sharedItemsTabs.addTab(tabRecording)
+        }
+
         if (sharedItemTypes.contains(SharedItemType.VOICE)) {
             val tabVoice: TabLayout.Tab = binding.sharedItemsTabs.newTab()
             tabVoice.tag = SharedItemType.VOICE

+ 3 - 0
app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItemType.kt

@@ -3,6 +3,8 @@
  *
  * @author Tim Krüger
  * @author Álvaro Brey
+ * @author Marcel Hibbe
+ * Copyright (C) 2023 Marcel Hibbe <dev@mhibbe.de>
  * Copyright (C) 2022 Álvaro Brey
  * Copyright (C) 2022 Tim Krüger <t@timkrueger.me>
  *
@@ -29,6 +31,7 @@ enum class SharedItemType {
     AUDIO,
     FILE,
     MEDIA,
+    RECORDING,
     VOICE,
     LOCATION,
     DECKCARD,

+ 3 - 1
app/src/main/res/layout/activity_shared_items.xml

@@ -3,6 +3,8 @@
   ~
   ~ @author Tim Krüger
   ~ @author Andy Scherzinger
+  ~ @author Marcel Hibbe
+  ~ Copyright (C) 2023 Marcel Hibbe <dev@mhibbe.de>
   ~ Copyright (C) 2022 Tim Krüger <t@timkrueger.me>
   ~ Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
   ~
@@ -50,7 +52,7 @@
             android:layout_height="@dimen/min_size_clickable_area"
             android:background="@color/appbar"
             app:tabGravity="fill"
-            app:tabMode="fixed"
+            app:tabMode="scrollable"
             app:tabMaxWidth="0dp"
             app:tabTextAppearance="@style/TextAppearanceTab" />
 

+ 6 - 7
app/src/main/res/values/strings.xml

@@ -481,13 +481,6 @@ How to translate with transifex:
     <string name="nc_share_contact">Share contact</string>
     <string name="nc_share_contact_permission">Permission to read contacts is required</string>
 
-    <!-- shared items -->
-    <string name="nc_shared_items">Shared items</string>
-    <string name="nc_shared_items_description">Images, files, voice messages …</string>
-    <string name="nc_shared_items_empty">No shared items</string>
-    <string name="nc_shared_items_location">Location</string>
-    <string name="nc_shared_items_deck_card">Deck card</string>
-
     <!-- share to screen -->
     <string name="nc_share_to_choose_account">Choose account</string>
 
@@ -592,12 +585,18 @@ How to translate with transifex:
     <string name="record_failed_info">The recording failed. Please contact your administrator.</string>
 
     <!-- Shared items -->
+    <string name="nc_shared_items">Shared items</string>
+    <string name="nc_shared_items_description">Images, files, voice messages …</string>
+    <string name="nc_shared_items_empty">No shared items</string>
     <string name="shared_items_media">Media</string>
     <string name="shared_items_file">File</string>
+    <string name="shared_items_recording">Call recording</string>
     <string name="shared_items_audio">Audio</string>
     <string name="shared_items_voice">Voice</string>
     <string name="shared_items_other">Other</string>
     <string name="shared_items_poll">Poll</string>
+    <string name="nc_shared_items_location">Location</string>
+    <string name="nc_shared_items_deck_card">Deck card</string>
 
     <!-- Message search -->
     <string name="messages">Messages</string>