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

[COMPOSE] Share fragment #1

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

[COMPOSE] Share fragment #1

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f770a43
Avoid "Leak Canary"
JuancaG05 Apr 13, 2022
f2c29b0
Initial Compose structure
JuancaG05 Apr 19, 2022
82adf72
File part of the ShareFileFragment moved to Compose
JuancaG05 Apr 28, 2022
5a350e8
Added ownCloud header in ShareFileComposeFragment
JuancaG05 Apr 28, 2022
3e7c760
Added previous documentation in ShareFileComposeFragment
JuancaG05 Apr 28, 2022
37a2763
Added account and filter touches when obscured to ShareFileComposeFra…
JuancaG05 Apr 28, 2022
3367648
UI of ShareFileFragment totally moved to Compose
JuancaG05 May 11, 2022
1686330
Added onClick listeners for buttons in the screen
JuancaG05 May 16, 2022
07df106
Added LiveData observers
JuancaG05 May 24, 2022
e28da5d
Added private shares list and modularized composables
JuancaG05 May 30, 2022
8fd0df1
Added public shares list
JuancaG05 May 30, 2022
8d13343
Respect accessibility guidelines
JuancaG05 May 30, 2022
3daf2a7
Polish code
JuancaG05 May 30, 2022
1229647
Update library
JuancaG05 May 30, 2022
c2c8483
CR suggestions applied
JuancaG05 May 31, 2022
f7c4c99
Last tiny improvement
JuancaG05 May 31, 2022
d2feb2b
Remove warnings in code
JuancaG05 Jun 19, 2022
3960acd
Corrected paddings in SectionHeader composable
JuancaG05 Jun 20, 2022
702311d
Removed unnecessary line
JuancaG05 Jun 21, 2022
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
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ buildscript {
lifecycleLiveData = "2.4.1"
biometricVersion="1.1.0"
androidX = '1.0.0'
compose_version = '1.1.1'

// Kotlin
kotlinVersion = "1.6.21"
kotlinVersion = "1.6.10"
coroutinesVersion = "1.6.1"

// Koin
Expand Down
19 changes: 18 additions & 1 deletion owncloudApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,19 @@ dependencies {
implementation "androidx.core:core-ktx:$ktxCoreVersion"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$ktxViewModelVersion"
implementation "androidx.fragment:fragment-ktx:$ktxFragmentVersion"
implementation "androidx.compose.runtime:runtime-livedata:1.1.1"

// Preferences
implementation 'androidx.preference:preference-ktx:1.2.0'

// MDM feedback
implementation 'androidx.enterprise:enterprise-feedback:1.1.0'

// Jetpack Compose
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation 'androidx.activity:activity-compose:1.4.0'

// Tests
testImplementation project(':owncloudTestUtil')
testImplementation "junit:junit:$junitVersion"
Expand Down Expand Up @@ -93,7 +99,10 @@ dependencies {

debugImplementation "androidx.fragment:fragment-testing:1.4.1"
debugImplementation 'com.facebook.stetho:stetho:1.6.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
//debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'

// Jetpack Compose
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
}

android {
Expand All @@ -117,6 +126,14 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

buildFeatures {
compose true
}

composeOptions {
kotlinCompilerExtensionVersion compose_version
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
Expand Down
3 changes: 2 additions & 1 deletion owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import com.owncloud.android.presentation.providers.sharing.UsersAndGroupsSearchP
import com.owncloud.android.presentation.ui.sharing.fragments.EditPrivateShareFragment
import com.owncloud.android.presentation.ui.sharing.fragments.PublicShareDialogFragment
import com.owncloud.android.presentation.ui.sharing.fragments.SearchShareesFragment
import com.owncloud.android.presentation.ui.sharing.fragments.ShareFileComposeFragment
import com.owncloud.android.presentation.ui.sharing.fragments.ShareFileFragment
import com.owncloud.android.presentation.ui.sharing.fragments.ShareFragmentListener
import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
Expand Down Expand Up @@ -73,7 +74,7 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
supportFragmentManager.transaction {
if (savedInstanceState == null && file != null && account != null) {
// Add Share fragment on first creation
val fragment = ShareFileFragment.newInstance(file, account!!)
val fragment = ShareFileComposeFragment.newInstance(file, account)
replace(
R.id.share_fragment_container, fragment,
TAG_SHARE_FRAGMENT
Expand Down
Loading