Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 53 additions & 2 deletions owncloudApp/src/main/res/layout/members_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,63 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/members_recycler_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:scrollbars="vertical"
android:visibility="visible"
tools:visibility="visible"/>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/actionbar_start_color">

<TextView
android:id="@+id/public_links_title"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_centerVertical="true"
android:gravity="center"
android:text="@string/share_via_link_section_title"
android:layout_marginStart="@dimen/standard_half_margin"
android:textAllCaps="true"
android:textColor="@color/white"
android:textStyle="bold"
android:accessibilityHeading="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/public_links_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/warning_background_color"
android:paddingTop="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_padding"
android:paddingStart="@dimen/standard_half_padding"
android:paddingEnd="@dimen/standard_half_padding"
android:text="@string/share_warning_about_forwarding_space_public_links"
android:textColor="@color/warning_grey_text"
android:textSize="15sp" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/public_links_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical" />

<TextView
android:id="@+id/no_public_links_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_padding"
android:paddingStart="@dimen/standard_half_padding"
android:paddingEnd="@dimen/standard_half_padding"
android:text="@string/share_no_public_links"
android:textSize="15sp" />

</LinearLayout>

</ScrollView>
1 change: 1 addition & 0 deletions owncloudApp/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,7 @@
<string name="share_no_public_links">No public links created yet.</string>
<string name="share_no_link_in_this_share">This share has no link.</string>
<string name="share_warning_about_forwarding_public_links">Anyone with the link has access to the file/folder.</string>
<string name="share_warning_about_forwarding_space_public_links">Anyone with the link has access to the space.</string>
<string name="share_via_link_default_password">*****</string>
<string name="share_via_link_password_enforced_label">"Password *"</string>
<string name="share_via_link_expiration_date_enforced_label">"Expiration *"</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ data class SpecialFolderResponse(

@JsonClass(generateAdapter = true)
data class PermissionsResponse(
// Member response
val id: String?,
val expirationDateTime: String?,

// Member response
val grantedToV2: GrantedToV2Response?,
val id: String?,
val roles: List<String>?,

// Link response
val createDateTime: String?,
val hasPassword: Boolean?,
val createdDateTime: String?,
val link: LinkInfoResponse?
)

Expand Down Expand Up @@ -142,9 +142,6 @@ data class SpacePermissionsResponse(
data class LinkInfoResponse(
@Json(name = "@libre.graph.displayName")
val displayName: String,
@Json(name = "@libre.graph.quickLink")
val quickLink: Boolean,
val preventsDownload: Boolean,
val type: String,
val webUrl: String,
)
Expand Down
Loading