Skip to content

Commit

Permalink
Remove Coordinator Layout due to background color conflict
Browse files Browse the repository at this point in the history 
Signed-off-by: alperozturk <[email protected]>
  • Loading branch information
@alperozturk96 @AndyScherzinger
alperozturk96 authored and AndyScherzinger committed Oct 31, 2023
1 parent 1991506 commit 9ecfc1a
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 55 deletions.
3 changes: 0 additions & 3 deletions app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import android.content.Context
import android.content.res.ColorStateList
import android.graphics.Typeface
import android.graphics.drawable.Drawable
import android.graphics.drawable.GradientDrawable
import android.os.Bundle
import android.text.style.StyleSpan
import android.view.LayoutInflater
Expand All @@ -45,7 +44,6 @@ import androidx.lifecycle.ViewModelProvider
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.google.android.material.shape.CornerFamily
import com.nextcloud.android.common.ui.theme.utils.ColorRole
import com.nextcloud.client.account.CurrentAccountProvider
import com.nextcloud.client.di.Injectable
Expand All @@ -61,7 +59,6 @@ import com.owncloud.android.lib.resources.files.model.FileLockType
import com.owncloud.android.ui.activity.ComponentsGetter
import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.DisplayUtils.AvatarGenerationListener
import com.owncloud.android.utils.DisplayUtils.convertDpToPixel
import com.owncloud.android.utils.theme.ViewThemeUtils
import javax.inject.Inject

Expand Down
97 changes: 45 additions & 52 deletions app/src/main/res/layout/file_actions_bottom_sheet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,75 +19,68 @@
~ License along with this program. If not, see <http://www.gnu.org/licenses/>.
~
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@android:color/transparent"
style="@style/Widget.Material3.BottomSheet"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">

<FrameLayout
style="@style/Widget.Material3.BottomSheet"
<LinearLayout
android:id="@+id/bottom_sheet"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
android:layout_height="wrap_content"
android:orientation="vertical">

<LinearLayout
android:id="@+id/bottom_sheet"
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/bottom_sheet_loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_gravity="center"
android:layout_marginBottom="@dimen/standard_margin"
android:indeterminate="true"
tools:visibility="gone" />

<com.google.android.material.bottomsheet.BottomSheetDragHandleView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/bottom_sheet_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_margin"
android:gravity="center"
android:orientation="horizontal"
android:visibility="visible">

<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/bottom_sheet_loading"
<include
android:id="@+id/thumbnail_layout"
layout="@layout/file_thumbnail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
android:layout_marginBottom="@dimen/standard_margin"
tools:visibility="gone" />

<LinearLayout
android:id="@+id/bottom_sheet_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="@dimen/standard_margin"
android:gravity="center"
android:visibility="visible">

<include
android:id="@+id/thumbnail_layout"
layout="@layout/file_thumbnail"
android:layout_width="wrap_content"
android:layout_marginStart="12dp"
android:layout_height="wrap_content" />

<TextView
android:id="@+id/title"
android:layout_marginStart="24dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:lines="1"
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
tools:text="Test file name which is very very very very very long.pdf" />

</LinearLayout>
android:layout_marginStart="12dp" />

<LinearLayout
android:id="@+id/file_actions_list"
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
android:layout_marginStart="24dp"
android:ellipsize="middle"
android:lines="1"
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
tools:text="Test file name which is very very very very very long.pdf" />

</LinearLayout>

</FrameLayout>
<LinearLayout
android:id="@+id/file_actions_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />

</LinearLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>

0 comments on commit 9ecfc1a

Please sign in to comment.