mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
22384 commits 227 branches 1574 tags 621 MiB
Commit graph

22384 commits

This branch
This branch
All branches
Author SHA1 Message Date
alperozturk
63ee2cc009
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:11 +01:00
alperozturk
d3de88addb
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:03 +01:00
alperozturk
6e3de92ab2
Fix FileFeaturesLayout visibility 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:35:05 +01:00
alperozturk
38d8e24ba6
Merge remote-tracking branch 'origin/feature/new_grid-layout' into feature/new_grid-layout 
# Conflicts:
#	app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
#	app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
 2023-12-20 15:25:29 +01:00
alperozturk
7d0db80f4d
Fix FileFeaturesLayout visibility 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:23:14 +01:00
alperozturk
c4aca7c7ce
fix import 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:34 +01:00
alperozturk
8a5ef54e79
Fix share icon 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:34 +01:00
alperozturk
aa7bab0fae
Sync with master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:34 +01:00
alperozturk
e176059406
Change selectedItemBackgroundColorId for dark mode 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
76bfefb491
Add checkbox top left corner 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
ee520598b5
Hide more button when multi select enabled 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
27b0694671
Align grid item in center 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
118a62232d
Add filename for media files 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
fa8a055152
Rename, use resources 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
a45268f398
Simplify code 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
836c0fd3b5
Add margin for grid layout 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
alperozturk
1adc326d4b
Add corner radius to item layout 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
alperozturk
6c1b29010e
Cleanup bind function 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
alperozturk
447349cb40
Rebase fix 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
ZetaTom
e6a677eede
Fix suggestion 
- see cb329b1e37
- suggestion missed one line

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
 2023-12-20 14:49:40 +01:00
Nextcloud bot
54077fce38
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-20 02:34:23 +00:00
Nextcloud bot
15a721bfcb
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-20 02:33:56 +00:00
Andy Scherzinger
5e70209263
Merge pull request #12307 from nextcloud/chore/noid/projectIcon 
Add AS project logo
 2023-12-19 16:53:03 +01:00
Andy Scherzinger
f9074196e2
Add AS project logo 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2023-12-19 16:51:55 +01:00
Andy Scherzinger
f2e1de029c
Merge pull request #12301 from nextcloud/dependabot/github_actions/gradle/gradle-build-action-2.11.0 
Build(deps): Bump gradle/gradle-build-action from 2.10.0 to 2.11.0
 2023-12-19 08:56:00 +01:00
Andy Scherzinger
dc6e016807
Merge pull request #12302 from nextcloud/dependabot/github_actions/actions/upload-artifact-4.0.0 
Build(deps): Bump actions/upload-artifact from 3.1.3 to 4.0.0
 2023-12-19 08:55:15 +01:00
Tobias Kaminsky
f430bf18c5
Merge pull request #12287 from nextcloud/refactor/remove-deprecated-argument-passing 
Replace Deprecated Argument Passing
 2023-12-19 07:59:38 +01:00
Nextcloud bot
b653711be2
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-19 02:35:36 +00:00
Nextcloud bot
d6685468eb
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-19 02:35:10 +00:00
Alper Öztürk
224c2e64ea Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
I tested. Looks like not needed.

Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:13 +00:00
Alper Öztürk
8c43463df0 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:13 +00:00
Alper Öztürk
9874673f74 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:13 +00:00
Alper Öztürk
cb329b1e37 Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
6718a36933 Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
61251b650e Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
5ff5d60db1 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
ea013b0cb3 Update app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
b980f552c8 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
alperozturk
e8ff0380f0 Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
4483ca16db Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
fae5f69154 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
03114c1863 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
5aeac16efd Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
da6477fd4d Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
e9e425d879 Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
b37f00e24d Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
1973a20710 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
32fd626f77 Fix merge conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
1b399b2b9c Fix merge conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
10c564dc86 Reduce dodgy code 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00