Filebrowser: Allow shown filename multiline expansion, by @gsantner, …

…discussions #1557 #1558 #1559
gsantner · Jan 9, 2022 · 02cd0c3 · 02cd0c3
1 parent 0dca87e
commit 02cd0c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/app/src/main/java/net/gsantner/opoc/ui/FilesystemViewerAdapter.java b/app/src/main/java/net/gsantner/opoc/ui/FilesystemViewerAdapter.java
@@ -320,7 +320,7 @@ public boolean isCurrentFolderWriteable() {
     @SuppressWarnings("UnnecessaryReturnStatement")
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.ui__filesystem_item__root: {
+            case R.id.opoc_filesystem_item__root: {
                 // A own item was clicked
                 TagContainer data = (TagContainer) view.getTag();
                 if (data != null && data.file != null) {
@@ -452,7 +452,7 @@ public boolean canGoUp(File currentFolder) {
     @Override
     public boolean onLongClick(View view) {
         switch (view.getId()) {
-            case R.id.ui__filesystem_item__root: {
+            case R.id.opoc_filesystem_item__root: {
                 TagContainer data = (TagContainer) view.getTag();
                 toggleSelection(data);
                 _dopt.listener.onFsViewerItemLongPressed(data.file, _dopt.doSelectMultiple);
@@ -696,13 +696,13 @@ static class FilesystemViewerViewHolder extends RecyclerView.ViewHolder {
         //########################
         //## UI Binding
         //########################
-        @BindView(R.id.ui__filesystem_item__root)
+        @BindView(R.id.opoc_filesystem_item__root)
         LinearLayout itemRoot;
-        @BindView(R.id.ui__filesystem_item__image)
+        @BindView(R.id.opoc_filesystem_item__image)
         ImageView image;
-        @BindView(R.id.ui__filesystem_item__title)
+        @BindView(R.id.opoc_filesystem_item__title)
         TextView title;
-        @BindView(R.id.ui__filesystem_item__description)
+        @BindView(R.id.opoc_filesystem_item__description)
         TextView description;
 
         //########################

diff --git a/app/src/main/res/layout/file_info_dialog.xml b/app/src/main/res/layout/file_info_dialog.xml
@@ -12,7 +12,7 @@
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ui__filesystem_item__root"
+    android:id="@+id/opoc_filesystem_item__root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?android:attr/selectableItemBackground"

diff --git a/app/src/main/res/layout/opoc_filesystem_item.xml b/app/src/main/res/layout/opoc_filesystem_item.xml
@@ -12,7 +12,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ui__filesystem_item__root"
+    android:id="@+id/opoc_filesystem_item__root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="8dp"
@@ -22,7 +22,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:id="@+id/ui__filesystem_item__image"
+        android:id="@+id/opoc_filesystem_item__image"
         android:layout_width="28dp"
         android:layout_height="28dp"
         android:layout_gravity="center_vertical|start"
@@ -37,19 +37,18 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/ui__filesystem_item__title"
+            android:id="@+id/opoc_filesystem_item__title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:ellipsize="end"
             android:importantForAccessibility="no"
-            android:lines="1"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
             android:textSize="19sp"
             tools:text="how to write a readme.md" />
 
         <TextView
-            android:id="@+id/ui__filesystem_item__description"
+            android:id="@+id/opoc_filesystem_item__description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"