shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Edit and delete a file (#626)

Browse Source 
update if file is modified on resume

implementation of edit file

Merge branch 'master' into 44-delete-file

Merge branch '44-delete-file' of codeberg.org:gitnex/GitNex into 44-delete-file

Merge branch 'master' into 44-delete-file

# Conflicts:
#	app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
#	app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
#	app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
#	app/src/main/java/org/mian/gitnex/fragments/BottomSheetFileViewerFragment.java

Merge branch 'master' into 44-delete-file

implement delete file

add links to bottomsheet

Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/626
This commit is contained in:
M M Arif
2020-08-18 16:37:10 +02:00
co-authored by M M Arif 6543
parent 76137c56bc
commit 7caff70946
10 changed files with 468 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_new_file.xml
+3 -2
View File
@@ -30,7 +30,7 @@
android:src="@drawable/ic_close" />
<TextView
android:id="@+id/toolbar_title"
android:id="@+id/toolbarTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -78,6 +78,7 @@
android:inputType="textCapSentences|text" />
<TextView
android:id="@+id/fileNameHint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/newFileNameHintMessage"
@@ -214,7 +215,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/characters255Limit"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/hintColor"
android:textSize="12sp"
android:paddingStart="10dp"
android:paddingEnd="5dp"
app/src/main/res/layout/bottom_sheet_file_viewer.xml
+24
View File
@@ -17,6 +17,30 @@
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:id="@+id/editFile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/editFile"
android:drawableStart="@drawable/ic_edit"
android:drawablePadding="24dp"
android:padding="12dp"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/deleteFile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/deleteFile"
android:drawableStart="@drawable/ic_delete"
android:drawablePadding="24dp"
android:padding="12dp"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/downloadFile"
android:layout_width="match_parent"
app/src/main/res/values/strings.xml
+6
View File
@@ -566,6 +566,12 @@
<string name="waitLoadingDownloadFile">Please wait for the file to load to memory</string>
<string name="downloadFileSaved">File saved successfully</string>
<string name="excludeFilesInFileviewer">This file type is not supported in file viewer. Download it instead from the three dotted menu?</string>
<string name="deleteFile">Delete This File</string>
<string name="editFile">Edit This File</string>
<string name="deleteFileText">Delete %1$s</string>
<string name="deleteFileMessage">File is set for deletion by branch %1$s</string>
<string name="editFileText">Edit %1$s</string>
<string name="editFileMessage">File is modified by branch %1$s</string>
<string name="sizeCopy">Size</string>
<string name="shareIssue">Share Issue</string>