forked from nextcloud/android
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Nmc/1929 Collabora #70
Closed
+168
−10
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
113 changes: 113 additions & 0 deletions
113
app/src/androidTest/java/com/nmc/android/OCFileListBottomSheetDialogIT.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| package com.nmc.android | ||
|
|
||
| import android.os.Looper | ||
| import androidx.activity.result.contract.ActivityResultContract | ||
| import androidx.test.espresso.Espresso.onView | ||
| import androidx.test.espresso.assertion.ViewAssertions.matches | ||
| import androidx.test.espresso.intent.rule.IntentsTestRule | ||
| import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed | ||
| import androidx.test.espresso.matcher.ViewMatchers.withText | ||
| import com.google.android.material.bottomsheet.BottomSheetBehavior | ||
| import com.google.gson.Gson | ||
| import com.nextcloud.client.device.DeviceInfo | ||
| import com.nextcloud.client.documentscan.AppScanOptionalFeature | ||
| import com.nextcloud.utils.EditorUtils | ||
| import com.owncloud.android.AbstractIT | ||
| import com.owncloud.android.datamodel.ArbitraryDataProvider | ||
| import com.owncloud.android.datamodel.ArbitraryDataProviderImpl | ||
| import com.owncloud.android.datamodel.OCFile | ||
| import com.owncloud.android.lib.common.Creator | ||
| import com.owncloud.android.lib.common.DirectEditing | ||
| import com.owncloud.android.lib.resources.status.CapabilityBooleanType | ||
| import com.owncloud.android.ui.activity.FileDisplayActivity | ||
| import com.owncloud.android.ui.fragment.OCFileListBottomSheetActions | ||
| import com.owncloud.android.ui.fragment.OCFileListBottomSheetDialog | ||
| import com.owncloud.android.utils.MimeTypeUtil | ||
| import com.owncloud.android.utils.theme.CapabilityUtils | ||
| import org.junit.Before | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.mockito.Mock | ||
| import org.mockito.MockitoAnnotations | ||
|
|
||
| class OCFileListBottomSheetDialogIT : AbstractIT() { | ||
|
|
||
| @Mock | ||
| private lateinit var actions: OCFileListBottomSheetActions | ||
|
|
||
| @get:Rule | ||
| val activityRule = IntentsTestRule(FileDisplayActivity::class.java, true, true) | ||
|
|
||
| @Before | ||
| fun setUp() { | ||
| MockitoAnnotations.initMocks(this) | ||
| } | ||
|
|
||
| @Test | ||
| fun validateCreateTextDocumentMenuOption() { | ||
| if (Looper.myLooper() == null) { | ||
| Looper.prepare() | ||
| } | ||
|
|
||
| val info = DeviceInfo() | ||
| val ocFile = OCFile("/test.md") | ||
|
|
||
| // add direct editing info | ||
| val creatorMap = mutableMapOf<String, Creator>() | ||
| creatorMap["1"] = Creator( | ||
| "1", | ||
| "md", | ||
| "markdown file", | ||
| ".md", | ||
| MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN, | ||
| false | ||
| ) | ||
|
|
||
| val directEditing = DirectEditing( | ||
| creators = creatorMap | ||
| ) | ||
|
|
||
| val json = Gson().toJson(directEditing) | ||
| ArbitraryDataProviderImpl(targetContext).storeOrUpdateKeyValue( | ||
| user.accountName, | ||
| ArbitraryDataProvider.DIRECT_EDITING, | ||
| json | ||
| ) | ||
|
|
||
| val capability = activityRule.activity.capabilities | ||
| capability.richDocuments = CapabilityBooleanType.TRUE | ||
| capability.richDocumentsDirectEditing = CapabilityBooleanType.TRUE | ||
| capability.richDocumentsTemplatesAvailable = CapabilityBooleanType.TRUE | ||
| capability.accountName = user.accountName | ||
| CapabilityUtils.updateCapability(capability) | ||
|
|
||
| val appScanOptionalFeature: AppScanOptionalFeature = object : AppScanOptionalFeature() { | ||
| override fun getScanContract(): ActivityResultContract<Unit, String?> { | ||
| throw UnsupportedOperationException("Document scan is not available") | ||
| } | ||
| } | ||
|
|
||
| val editorUtils = EditorUtils(ArbitraryDataProviderImpl(targetContext)) | ||
| val sut = OCFileListBottomSheetDialog( | ||
| activityRule.activity, | ||
| actions, | ||
| info, | ||
| user, | ||
| ocFile, | ||
| activityRule.activity.themeUtils, | ||
| activityRule.activity.viewThemeUtils, | ||
| editorUtils, | ||
| appScanOptionalFeature | ||
| ) | ||
|
|
||
| activityRule.activity.runOnUiThread { sut.show() } | ||
|
|
||
| waitForIdleSync() | ||
|
|
||
| sut.behavior.state = BottomSheetBehavior.STATE_EXPANDED | ||
|
|
||
| shortSleep() | ||
|
|
||
| onView(withText("Create text document")).check(matches(isCompletelyDisplayed())) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <group> | ||
| <clip-path | ||
| android:pathData="M3,1l17.9997,0l0,22l-17.9997,0z"/> | ||
| <path | ||
| android:pathData="M4.4997,20C4.4997,20.828 5.1717,21.5 5.9997,21.5L14.9997,21.5L14.9997,18.5C14.9997,17.672 15.6717,17 16.4997,17L19.4997,17L19.4997,2.5L4.4997,2.5L4.4997,20ZM5.9997,23C4.3437,23 2.9997,21.657 2.9997,20L2.9997,1L20.9997,1L20.9997,18L15.9997,23L5.9997,23Z" | ||
| android:strokeWidth="1" | ||
| android:fillColor="#262626" | ||
| android:fillType="evenOdd" | ||
| android:strokeColor="#00000000"/> | ||
| </group> | ||
| <path | ||
| android:pathData="M8.0817,14.8262C7.6757,14.8262 7.3467,14.4972 7.3467,14.0912C7.3467,13.6842 7.6757,13.3552 8.0817,13.3552L15.9187,13.3552C16.3247,13.3552 16.6537,13.6842 16.6537,14.0912C16.6537,14.4972 16.3247,14.8262 15.9187,14.8262L8.0817,14.8262Z" | ||
| android:strokeWidth="1" | ||
| android:fillColor="#262626" | ||
| android:fillType="evenOdd" | ||
| android:strokeColor="#00000000"/> | ||
| <path | ||
| android:pathData="M8.0817,11.397C7.6757,11.397 7.3467,11.068 7.3467,10.662C7.3467,10.256 7.6757,9.927 8.0817,9.927L15.9187,9.927C16.3247,9.927 16.6537,10.256 16.6537,10.662C16.6537,11.068 16.3247,11.397 15.9187,11.397L8.0817,11.397Z" | ||
| android:strokeWidth="1" | ||
| android:fillColor="#262626" | ||
| android:fillType="evenOdd" | ||
| android:strokeColor="#00000000"/> | ||
| <path | ||
| android:pathData="M8.0817,7.9678C7.6757,7.9678 7.3477,7.6388 7.3477,7.2338C7.3477,6.8278 7.6757,6.4988 8.0817,6.4988L15.9187,6.4988C16.3237,6.4988 16.6527,6.8278 16.6527,7.2338C16.6527,7.6388 16.3237,7.9678 15.9187,7.9678L8.0817,7.9678Z" | ||
| android:strokeWidth="1" | ||
| android:fillColor="#262626" | ||
| android:fillType="evenOdd" | ||
| android:strokeColor="#00000000"/> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my test this now shows "create text document" with new icon, but when clicking on it, it still suggests to create "empty file.md".
(as this is done by server always a Markdown file will be created)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes that's right clicking action is same we have just changed new text and icon for it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
then please change this directly in strings.xml and simply change xml icon file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will be added at run time when the creators have the data. And it is using LinearLayout to add the views.
So if i will add text and icon in xml then i will have to comment the creators logic.