Button functionality added

Author: fesave

owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -33,6 +33,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -153,6 +154,7 @@ public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container,
         }
 
         updateFileDetails(false, false);
+        setButtonsClickListener();
         return mView;
     }
 
@@ -281,7 +283,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return true;
             }
             case R.id.action_open_file_with: {
-                mContainerActivity.getFileOperationsHelper().openFile(getFile());
+                openWith();
                 return true;
             }
             case R.id.action_remove_file: {
@@ -300,17 +302,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
             }
             case R.id.action_download_file:
             case R.id.action_sync_file: {
-                mContainerActivity.getFileOperationsHelper().syncFile(getFile());
+                downloadFile();
                 return true;
             }
             case R.id.action_send_file: {
-                // Obtain the file
-                if (!getFile().isDown()) {  // Download the file                    
-                    Timber.d("%s : File must be downloaded", getFile().getRemotePath());
-                    ((FileDisplayActivity) mContainerActivity).startDownloadForSending(getFile());
-                } else {
-                    mContainerActivity.getFileOperationsHelper().sendDownloadedFile(getFile());
-                }
+                sendFile();
                 return true;
             }
             case R.id.action_set_available_offline: {
@@ -326,6 +322,24 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
+    private void openWith() {
+        mContainerActivity.getFileOperationsHelper().openFile(getFile());
+    }
+
+    private void downloadFile() {
+        mContainerActivity.getFileOperationsHelper().syncFile(getFile());
+    }
+
+    private void sendFile() {
+        // Obtain the file
+        if (!getFile().isDown()) {  // Download the file
+            Timber.d("%s : File must be downloaded", getFile().getRemotePath());
+            ((FileDisplayActivity) mContainerActivity).startDownloadForSending(getFile());
+        } else {
+            mContainerActivity.getFileOperationsHelper().sendDownloadedFile(getFile());
+        }
+    }
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -335,6 +349,25 @@ public void onClick(View v) {
             }
             case R.id.fdIcon: {
                 displayFile(getFile());
+
+                break;
+            }
+            case R.id.button_file_detail_download: {
+                OCFile file = getFile();
+                if (file.isDown()) {
+
+                } else {
+                    downloadFile();
+                }
+                break;
+            }
+            case R.id.button_file_detail_open_with: {
+                openWith();
+                break;
+            }
+            case R.id.button_file_detail_send: {
+                sendFile();
+                break;
             }
             default:
                 Timber.e("Incorrect view clicked!");
@@ -426,6 +459,7 @@ private void updateFileDetails(boolean forcedTransferring, boolean refresh) {
                 setButtonsForRemote();
             }
         }
+        setOpenOrDownloadButtonAction();
         getView().invalidate();
     }
 
@@ -575,4 +609,29 @@ private void setButtonsForRemote() {
         }
     }
 
+    private void setButtonsClickListener() {
+        Button buttonDownload = getView().findViewById(R.id.button_file_detail_download);
+        Button buttonOpenWith = getView().findViewById(R.id.button_file_detail_open_with);
+        Button buttonSend = getView().findViewById(R.id.button_file_detail_send);
+
+        buttonDownload.setOnClickListener(this);
+        buttonOpenWith.setOnClickListener(this);
+        buttonSend.setOnClickListener(this);
+
+        setOpenOrDownloadButtonAction();
+    }
+
+    private void setOpenOrDownloadButtonAction() {
+        OCFile file = getFile();
+        Button button = getView().findViewById(R.id.button_file_detail_download);
+
+        if (file.isDown()) {
+            button.setText(getString(R.string.filedetails_open));
+            button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_open_in_new, 0, 0, 0);
+        } else {
+            button.setText(getString(R.string.filedetails_download));
+            button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_cloud_download, 0, 0, 0);
+        }
+    }
+
 }

owncloudApp/src/main/res/layout/file_details_fragment.xml

@@ -170,10 +170,10 @@
             style="@style/Button.FileDetail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_cloud_download"
-            android:text="@string/filedetails_download"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_file_detail_separator" />
+            app:layout_constraintTop_toBottomOf="@id/view_file_detail_separator"
+            tools:drawableStart="@drawable/ic_cloud_download"
+            tools:text="@string/filedetails_download" />
 
         <Button
             android:id="@+id/button_file_detail_open_with"
@@ -186,15 +186,15 @@
             app:layout_constraintTop_toBottomOf="@id/button_file_detail_download" />
 
         <Button
-            android:id="@+id/button_file_detail_open_send"
+            android:id="@+id/button_file_detail_send"
             style="@style/Button.FileDetail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/ic_send"
             android:text="@string/filedetails_send"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/button_file_detail_open_with"
-            app:layout_constraintRight_toLeftOf="@id/barrier"/>
+            app:layout_constraintRight_toLeftOf="@id/barrier"
+            app:layout_constraintTop_toBottomOf="@id/button_file_detail_open_with" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier"

owncloudApp/src/main/res/values/strings.xml

@@ -169,6 +169,7 @@
     <string name="filedetails_modified">Modified:</string>
     <string name="filedetails_download">Download</string>
     <string name="filedetails_open_with">Open with</string>
+    <string name="filedetails_open">Open</string>
     <string name="filedetails_send">Send</string>
     <string name="filedetails_file_image_content_description">File Image</string>
     <string name="filedetails_cancel_btn_content_description">Cancel download button</string>