From 094caa1fa2c2da10801a92d829aa9567ad016da5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 1 Apr 2021 17:45:16 +0200
Subject: [PATCH] Added file name in app file viewers

---
 .../activities/main/files/fragments/TopBarFragment.kt | 11 +++++++++++
 .../main/res/layout/file_viewer_top_bar_fragment.xml  |  9 +++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
index b377e4a5c..3e993fb1d 100644
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
@@ -65,6 +65,16 @@ class TopBarFragment : GenericFragment<FileViewerTopBarFragmentBinding>() {
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putString("FilePath", plainFilePath)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onViewStateRestored(savedInstanceState: Bundle?) {
+        super.onViewStateRestored(savedInstanceState)
+        plainFilePath = savedInstanceState?.getString("FilePath") ?: plainFilePath
+    }
+
     override fun onDestroyView() {
         if (plainFilePath.isNotEmpty() && plainFilePath != content?.filePath.orEmpty()) {
             Log.i("[File Viewer] Destroying plain file path: $plainFilePath")
@@ -76,5 +86,6 @@ class TopBarFragment : GenericFragment<FileViewerTopBarFragmentBinding>() {
     fun setContent(c: Content) {
         Log.i("[File Viewer] Content file path is: ${c.filePath}")
         content = c
+        binding.fileName.text = c.name
     }
 }
diff --git a/app/src/main/res/layout/file_viewer_top_bar_fragment.xml b/app/src/main/res/layout/file_viewer_top_bar_fragment.xml
index 8943beb5d..855d8885f 100644
--- a/app/src/main/res/layout/file_viewer_top_bar_fragment.xml
+++ b/app/src/main/res/layout/file_viewer_top_bar_fragment.xml
@@ -20,7 +20,6 @@
         android:orientation="horizontal">
 
         <ImageView
-            android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:contentDescription="@string/content_description_go_back"
             android:layout_width="0dp"
@@ -30,14 +29,16 @@
             android:padding="18dp"
             android:src="@drawable/back" />
 
-        <View
+        <org.linphone.views.MarqueeTextView
+            android:id="@+id/file_name"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.6"
-            android:visibility="invisible" />
+            style="@style/toolbar_small_title_font"
+            android:singleLine="true"
+            android:gravity="center"/>
 
         <ImageView
-            android:id="@+id/export"
             android:onClick="@{exportClickListener}"
             android:contentDescription="@string/content_description_export"
             android:layout_width="0dp"