Skip to content

feat(unified-share): ui #16865

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

Draft
alperozturk96 wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

feat(unified-share): ui #16865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e57dccb
feat(unified-share): ui
alperozturk96 Apr 16, 2026
03a4064
feat(unified-share): ui
alperozturk96 Apr 16, 2026
b3f554a
add todos
alperozturk96 Apr 17, 2026
8ae279f
add todos
alperozturk96 Apr 17, 2026
fa91fdd
add todos
alperozturk96 Apr 17, 2026
3b21b6a
wip
alperozturk96 Apr 17, 2026
fb0e68b
wip
alperozturk96 Apr 17, 2026
6563046
wip
alperozturk96 Apr 17, 2026
1f6c7f3
wip
alperozturk96 Apr 17, 2026
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
1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ dependencies {
implementation(libs.compose.activity)
implementation(libs.compose.ui.tooling.preview)
implementation(libs.foundation)
implementation(libs.material3)
debugImplementation(libs.compose.ui.tooling)
// endregion

Expand Down
30 changes: 29 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
import com.owncloud.android.ui.fragment.share.RemoteShareRepository;
import com.owncloud.android.ui.fragment.share.ShareRepository;
import com.owncloud.android.ui.fragment.share.UnifiedShareViewKt;
import com.owncloud.android.ui.fragment.util.FileDetailSharingFragmentHelper;
import com.owncloud.android.ui.helpers.FileOperationsHelper;
import com.owncloud.android.utils.ClipboardUtil;
Expand All @@ -92,6 +93,7 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;

public class FileDetailSharingFragment extends Fragment implements ShareeListAdapterListener,
DisplayUtils.AvatarGenerationListener,
Expand Down Expand Up @@ -162,7 +164,33 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
}

fileDataStorageManager = fileActivity.getStorageManager();
fetchSharees();
}

@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);

// TODO: REPLACE FAKE CONDITION
if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_34) || 2 < 4) {
showUnifiedShare();
} else {
fetchSharees();
}
}

private void showUnifiedShare() {
if (binding == null) {
return;
}

binding.shareContainer.setVisibility(View.GONE);
binding.unifiedShare.setVisibility(View.VISIBLE);

final LinearLayout shimmerLayout = binding.shimmerLayout.getRoot();
shimmerLayout.clearAnimation();
shimmerLayout.setVisibility(View.GONE);

UnifiedShareViewKt.setupUnifiedShare(binding.unifiedShare, viewThemeUtils, requireContext());
}

private void fetchSharees() {
Expand Down
Loading
Loading