Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature - Add Tag Color #14339

Merged
merged 15 commits into from
Jan 21, 2025
Merged

Feature - Add Tag Color #14339

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6cba3ab
add system tag color
alperozturk96 Jan 8, 2025
b269a44
revert
alperozturk96 Jan 8, 2025
d03c4a1
add tag colors to the file details
alperozturk96 Jan 8, 2025
89854f4
fix after rebase
tobiasKaminsky Jan 14, 2025
8853808
spotbugs
tobiasKaminsky Jan 14, 2025
ed4049e
use tag
alperozturk96 Jan 21, 2025
3ed763f
update the lib
alperozturk96 Jan 21, 2025
fea9359
update tests
alperozturk96 Jan 21, 2025
1fcb481
fix code analytics
alperozturk96 Jan 21, 2025
d8483df
update the library
alperozturk96 Jan 21, 2025
e655e85
Revert "revert"
alperozturk96 Jan 21, 2025
18c1e09
Update app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAd…
alperozturk96 Jan 21, 2025
57ff3cd
Update app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAd…
alperozturk96 Jan 21, 2025
d313605
Update app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAd…
alperozturk96 Jan 21, 2025
0387dd1
Update app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAd…
alperozturk96 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.owncloud.android.AbstractIT
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.resources.shares.ShareType
import com.owncloud.android.lib.resources.shares.ShareeUser
import com.owncloud.android.lib.resources.tags.Tag
import com.owncloud.android.utils.MimeType
import com.owncloud.android.utils.ScreenshotTest
import org.junit.Assert
Expand Down Expand Up @@ -50,7 +51,7 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
fileLength = 3072000
modificationTimestamp = 746443755000
parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
tags = listOf("Top secret")
tags = listOf(Tag("", "Top secret", null))
sut.storageManager.saveFile(this)
}

Expand All @@ -72,7 +73,7 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
fileLength = 12092000
modificationTimestamp = 746143952000
parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
tags = listOf("Confidential", "+5")
tags = listOf(Tag("", "Confidential", null), Tag("", "+5", null))
sut.storageManager.saveFile(this)
}

Expand Down
16 changes: 2 additions & 14 deletions app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
import com.owncloud.android.lib.resources.status.E2EVersion;
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.lib.resources.tags.Tag;
import com.owncloud.android.operations.RemoteOperationFailedException;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimeType;
Expand Down Expand Up @@ -240,19 +241,6 @@ public void addRenameFileOfflineOperation(OCFile file, String newName) {
offlineOperationDao.insert(entity);
}

public String getFileNameBasedOnEncryptionStatus(OCFile file) {
FileEntity entity = fileDao.getFileById(file.getFileId());
if (entity == null) {
return file.getFileName();
}

if (file.isEncrypted()) {
return entity.getEncryptedName();
} else {
return entity.getName();
}
}

public String getFilenameConsideringOfflineOperation(OCFile file) {
String filename = file.getDecryptedFileName();
OfflineOperationEntity renameEntity = offlineOperationDao.getByPath(file.getDecryptedRemotePath());
Expand Down Expand Up @@ -1283,7 +1271,7 @@ private OCFile createFileInstance(FileEntity fileEntity) {
ocFile.setTags(new ArrayList<>());
} else {
try {
String[] tagsArray = gson.fromJson(tags, String[].class);
Tag[] tagsArray = gson.fromJson(tags, Tag[].class);
ocFile.setTags(new ArrayList<>(Arrays.asList(tagsArray)));
} catch (JsonSyntaxException e) {
// ignore saved value due to api change
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/owncloud/android/datamodel/OCFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.owncloud.android.lib.resources.files.model.ImageDimension;
import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
import com.owncloud.android.lib.resources.shares.ShareeUser;
import com.owncloud.android.lib.resources.tags.Tag;
import com.owncloud.android.utils.MimeType;

import java.io.File;
Expand Down Expand Up @@ -117,7 +118,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
private long e2eCounter = -1;
@Nullable
private GeoLocation geolocation;
private List<String> tags = new ArrayList<>();
private List<Tag> tags = new ArrayList<>();
private Long internalFolderSyncTimestamp = -1L;
private String internalFolderSyncResult = "";

Expand Down Expand Up @@ -1047,11 +1048,11 @@ public GeoLocation getGeoLocation() {
return geolocation;
}

public List<String> getTags() {
public List<Tag> getTags() {
return tags;
}

public void setTags(List<String> tags) {
public void setTags(List<Tag> tags) {
this.tags = tags;
}

Expand Down
98 changes: 44 additions & 54 deletions app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ private Activity getActivity() {
public void onAccountChosen(@NonNull User user) {
setAccount(user.toPlatformAccount(), false);
initTargetFolder();
populateDirectoryList(null);
populateDirectoryList();
}

@Override
Expand All @@ -258,7 +258,7 @@ private void browseToFolderIfItExists() {
final OCFile fileByPath = getStorageManager().getFileByPath(full_path);
if (fileByPath != null) {
startSyncFolderOperation(fileByPath);
populateDirectoryList(null);
populateDirectoryList();
} else {
browseToRoot();
preferences.setLastUploadPath(OCFile.ROOT_PATH);
Expand Down Expand Up @@ -290,7 +290,7 @@ protected void onDestroy() {
public void onSortingOrderChosen(FileSortOrder newSortOrder) {
preferences.setSortOrder(mFile, newSortOrder);
sortButton.setText(DisplayUtils.getSortOrderStringId(newSortOrder));
populateDirectoryList(null);
populateDirectoryList();
}

@Override
Expand All @@ -310,10 +310,8 @@ public void selectFile(OCFile file) {
}

startSyncFolderOperation(file);

String filename = fileDataStorageManager.getFileNameBasedOnEncryptionStatus(file);
mParents.push(filename);
populateDirectoryList(file);
mParents.push(file.getFileName());
populateDirectoryList();
}
}

Expand Down Expand Up @@ -708,7 +706,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// account at this point
// since account setup can set only one account at time
setAccount(accounts[0], false);
populateDirectoryList(null);
populateDirectoryList();
}
}
}
Expand All @@ -723,7 +721,7 @@ private void setupActionBarSubtitle() {
}
}

private void populateDirectoryList(OCFile file) {
private void populateDirectoryList() {
setupEmptyList();
setupToolbar();
ActionBar actionBar = getSupportActionBar();
Expand All @@ -739,11 +737,7 @@ private void populateDirectoryList(OCFile file) {
if (TextUtils.isEmpty(current_dir)) {
viewThemeUtils.files.themeActionBar(this, actionBar, R.string.uploader_top_message);
} else {
if (file != null) {
viewThemeUtils.files.themeActionBar(this, actionBar, file.getFileName());
} else {
viewThemeUtils.files.themeActionBar(this, actionBar, current_dir);
}
viewThemeUtils.files.themeActionBar(this, actionBar, current_dir);
}

actionBar.setDisplayHomeAsUpEnabled(notRoot);
Expand All @@ -754,44 +748,37 @@ private void populateDirectoryList(OCFile file) {

Log_OC.d(TAG, "Populating view with content of : " + full_path);

if (file != null) {
mFile = file;
} else {
mFile = getStorageManager().getFileByPath(full_path);
}

if (mFile == null) {
return;
}

List<OCFile> files = getStorageManager().getFolderContent(mFile, false);
mFile = getStorageManager().getFileByPath(full_path);
if (mFile != null) {
List<OCFile> files = getStorageManager().getFolderContent(mFile, false);

if (files.isEmpty()) {
setMessageForEmptyList(R.string.file_list_empty_headline, R.string.empty,
R.drawable.uploads);
mEmptyListContainer.setVisibility(View.VISIBLE);
binding.list.setVisibility(View.GONE);
} else {
mEmptyListContainer.setVisibility(View.GONE);
files = sortFileList(files);
setupReceiveExternalFilesAdapter(files);
}
if (files.isEmpty()) {
setMessageForEmptyList(R.string.file_list_empty_headline, R.string.empty,
R.drawable.uploads);
mEmptyListContainer.setVisibility(View.VISIBLE);
binding.list.setVisibility(View.GONE);
} else {
mEmptyListContainer.setVisibility(View.GONE);
files = sortFileList(files);
setupReceiveExternalFilesAdapter(files);
}

MaterialButton btnChooseFolder = binding.uploaderChooseFolder;
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(btnChooseFolder);
btnChooseFolder.setOnClickListener(this);
MaterialButton btnChooseFolder = binding.uploaderChooseFolder;
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(btnChooseFolder);
btnChooseFolder.setOnClickListener(this);

btnChooseFolder.setEnabled(mFile.canWrite());
btnChooseFolder.setEnabled(mFile.canWrite());

viewThemeUtils.platform.themeStatusBar(this);
viewThemeUtils.platform.themeStatusBar(this);

viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.uploaderCancel);
binding.uploaderCancel.setOnClickListener(this);
viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.uploaderCancel);
binding.uploaderCancel.setOnClickListener(this);

sortButton = binding.toolbarLayout.sortButton;
FileSortOrder sortOrder = preferences.getSortOrderByFolder(mFile);
sortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder));
sortButton.setOnClickListener(l -> openSortingOrderDialogFragment(getSupportFragmentManager(), sortOrder));
sortButton = binding.toolbarLayout.sortButton;
FileSortOrder sortOrder = preferences.getSortOrderByFolder(mFile);
sortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder));
sortButton.setOnClickListener(l -> openSortingOrderDialogFragment(getSupportFragmentManager(), sortOrder));
}
}

private void setupReceiveExternalFilesAdapter(List<OCFile> files) {
Expand Down Expand Up @@ -982,15 +969,19 @@ public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationRe
* @param operation Creation operation performed.
* @param result Result of the creation.
*/
private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {
private void onCreateFolderOperationFinish(CreateFolderOperation operation,
RemoteOperationResult result) {
if (result.isSuccess()) {
String remotePath = operation.getRemotePath().substring(0, operation.getRemotePath().length() - 1);
String newFolder = remotePath.substring(remotePath.lastIndexOf('/') + 1);
mParents.push(newFolder);
populateDirectoryList(null);
populateDirectoryList();
} else {
try {
DisplayUtils.showSnackMessage(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()));
DisplayUtils.showSnackMessage(
this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources())
);

} catch (NotFoundException e) {
Log_OC.e(TAG, "Error while trying to show fail message ", e);
}
Expand Down Expand Up @@ -1042,10 +1033,8 @@ public boolean onCreateOptionsMenu(Menu menu) {

setupSearchView(menu);

if (mFile != null) {
alperozturk96 marked this conversation as resolved.
Show resolved Hide resolved
MenuItem newFolderMenuItem = menu.findItem(R.id.action_create_dir);
newFolderMenuItem.setEnabled(mFile.canWrite());
}
MenuItem newFolderMenuItem = menu.findItem(R.id.action_create_dir);
newFolderMenuItem.setEnabled(mFile.canWrite());

return true;
}
Expand Down Expand Up @@ -1156,8 +1145,9 @@ public void onReceive(Context context, Intent intent) {
}

if (currentDir.getRemotePath().equals(syncFolderRemotePath)) {
populateDirectoryList(currentFile);
populateDirectoryList();
}
mFile = currentFile;
}

mSyncInProgress = !FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
Expand Down
26 changes: 23 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.ContentValues;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Color;
Expand All @@ -30,6 +31,7 @@
import android.widget.LinearLayout;

import com.elyeproj.loaderviewlibrary.LoaderImageView;
import com.google.android.material.chip.Chip;
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
import com.nextcloud.client.account.User;
import com.nextcloud.client.database.entity.OfflineOperationEntity;
Expand Down Expand Up @@ -62,6 +64,7 @@
import com.owncloud.android.lib.resources.shares.OCShare;
import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.resources.shares.ShareeUser;
import com.owncloud.android.lib.resources.tags.Tag;
import com.owncloud.android.operations.RefreshFolderOperation;
import com.owncloud.android.operations.RemoteOperationFailedException;
import com.owncloud.android.ui.activity.ComponentsGetter;
Expand Down Expand Up @@ -580,12 +583,11 @@ private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {
holder.getSecondTag().setVisibility(View.GONE);
holder.getTagMore().setVisibility(View.GONE);

holder.getFirstTag().setText(file.getTags().get(0));
applyChipVisuals(holder.getFirstTag(),file.getTags().get(0));
alperozturk96 marked this conversation as resolved.
Show resolved Hide resolved

if (file.getTags().size() > 1) {
viewThemeUtils.material.themeChipSuggestion(holder.getSecondTag());
holder.getSecondTag().setVisibility(View.VISIBLE);
holder.getSecondTag().setText(file.getTags().get(1));
applyChipVisuals(holder.getSecondTag(),file.getTags().get(1));
alperozturk96 marked this conversation as resolved.
Show resolved Hide resolved
}

if (file.getTags().size() > 2) {
Expand Down Expand Up @@ -649,6 +651,24 @@ private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {
configureThumbnail(holder, file);
}

private void applyChipVisuals(Chip chip, Tag tag) {
viewThemeUtils.material.themeChipSuggestion(chip);
chip.setText(tag.getName());

alperozturk96 marked this conversation as resolved.
Show resolved Hide resolved
String tagColor = tag.getColor();
if (tagColor == null || tagColor.isEmpty()) {
alperozturk96 marked this conversation as resolved.
Show resolved Hide resolved
return;
}

try {
int color = Color.parseColor(tagColor);
chip.setChipStrokeColor(ColorStateList.valueOf(color));
chip.setTextColor(color);
} catch (IllegalArgumentException e) {
Log_OC.d(TAG, "Exception applyChipVisuals: " + e);
}
}

private void prepareFileSize(ListItemViewHolder holder, OCFile file, long size) {
holder.getFileSize().setVisibility(View.VISIBLE);
String fileSizeText = getFileSizeText(file, size);
Expand Down
13 changes: 11 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
Expand Down Expand Up @@ -50,6 +51,7 @@
import com.owncloud.android.lib.resources.files.ToggleFavoriteRemoteOperation;
import com.owncloud.android.lib.resources.shares.OCShare;
import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.resources.tags.Tag;
import com.owncloud.android.ui.activity.DrawerActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.activity.ToolbarActivity;
Expand Down Expand Up @@ -241,16 +243,23 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
if (getFile().getTags().isEmpty()) {
binding.tagsGroup.setVisibility(View.GONE);
} else {
for (String tag : getFile().getTags()) {
for (Tag tag : getFile().getTags()) {
Chip chip = new Chip(context);
chip.setText(tag);
chip.setText(tag.getName());
chip.setChipBackgroundColor(ColorStateList.valueOf(getResources().getColor(R.color.bg_default,
context.getTheme())));
chip.setShapeAppearanceModel(chip.getShapeAppearanceModel().toBuilder().setAllCornerSizes((100.0f))
.build());
chip.setEnsureMinTouchTargetSize(false);
chip.setClickable(false);
viewThemeUtils.material.themeChipSuggestion(chip);

if (tag.getColor() != null) {
int color = Color.parseColor(tag.getColor());
chip.setChipStrokeColor(ColorStateList.valueOf(color));
chip.setTextColor(color);
}

binding.tagsGroup.addView(chip);
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
buildscript {
ext {
androidLibraryVersion ="4c07e6a69e8a8bab43ca9406ea546613e90d934b"
androidLibraryVersion ="40fea7dfa5"
androidPluginVersion = '8.8.0'
androidxMediaVersion = '1.5.1'
androidxTestVersion = "1.6.1"
Expand Down
Loading
Loading