Skip to content

Commit 3cb39f3

Browse files
surinder-tsyssurinder-tsys
committed
Customized bottom sheet.
1 parent def5dba commit 3cb39f3

18 files changed

+292
-73
lines changed

‎app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import android.view.View
3333
import android.view.ViewGroup
3434
import android.widget.Toast
3535
import androidx.annotation.IdRes
36-
import androidx.appcompat.content.res.AppCompatResources
3736
import androidx.core.os.bundleOf
3837
import androidx.core.view.isEmpty
38+
import androidx.core.content.res.ResourcesCompat
3939
import androidx.core.view.isVisible
4040
import androidx.fragment.app.FragmentManager
4141
import androidx.fragment.app.setFragmentResult
@@ -44,7 +44,6 @@ import androidx.lifecycle.ViewModelProvider
4444
import com.google.android.material.bottomsheet.BottomSheetBehavior
4545
import com.google.android.material.bottomsheet.BottomSheetDialog
4646
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
47-
import com.nextcloud.android.common.ui.theme.utils.ColorRole
4847
import com.nextcloud.client.account.CurrentAccountProvider
4948
import com.nextcloud.client.di.Injectable
5049
import com.nextcloud.client.di.ViewModelFactory
@@ -160,7 +159,11 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
160159

161160
private fun setMultipleFilesThumbnail() {
162161
context?.let {
163-
val drawable = viewThemeUtils.platform.tintDrawable(it, R.drawable.file_multiple, ColorRole.PRIMARY)
162+
//NMC Customization
163+
val drawable = viewThemeUtils.platform.colorDrawable(
164+
ResourcesCompat.getDrawable(it.resources, R.drawable.file_multiple, null)!!,
165+
it.resources.getColor(R.color.primary, null)
166+
)
164167
binding.thumbnailLayout.thumbnail.setImageDrawable(drawable)
165168
}
166169
}
@@ -196,7 +199,6 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
196199
if (state is FileActionsViewModel.UiState.Loading) {
197200
binding.bottomSheetLoading.isVisible = true
198201
binding.bottomSheetContent.isVisible = false
199-
viewThemeUtils.platform.colorCircularProgressBar(binding.bottomSheetLoading, ColorRole.PRIMARY)
200202
} else {
201203
binding.bottomSheetLoading.isVisible = false
202204
binding.bottomSheetContent.isVisible = true
@@ -293,12 +295,8 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
293295
}
294296
text.setText(action.title)
295297
if (action.icon != null) {
296-
val drawable =
297-
viewThemeUtils.platform.tintDrawable(
298-
requireContext(),
299-
AppCompatResources.getDrawable(requireContext(), action.icon)!!
300-
)
301-
icon.setImageDrawable(drawable)
298+
//NMC customization
299+
icon.setImageResource(action.icon)
302300
}
303301
}
304302
return itemBinding.root

‎app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@ class GalleryFragmentBottomSheetDialog(
5959
}
6060

6161
fun setupLayout() {
62-
listOf(
63-
binding.tickMarkShowImages,
64-
binding.tickMarkShowVideo,
65-
binding.hideImagesImageview,
66-
binding.hideVideoImageView,
67-
binding.selectMediaFolderImageView
68-
).forEach {
69-
viewThemeUtils.platform.colorImageView(it)
70-
}
71-
7262
when (currentMediaState) {
7363
MediaState.MEDIA_STATE_PHOTOS_ONLY -> {
7464
binding.tickMarkShowImages.visibility = View.VISIBLE

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,6 @@ protected void onCreate(Bundle savedInstanceState) {
8989
binding = FileListActionsBottomSheetFragmentBinding.inflate(getLayoutInflater());
9090
setContentView(binding.getRoot());
9191

92-
viewThemeUtils.platform.colorImageView(binding.menuIconUploadFiles);
93-
viewThemeUtils.platform.colorImageView(binding.menuIconUploadFromApp);
94-
viewThemeUtils.platform.colorImageView(binding.menuIconDirectCameraUpload);
95-
viewThemeUtils.platform.colorImageView(binding.menuIconScanDocUpload);
96-
viewThemeUtils.platform.colorImageView(binding.menuIconMkdir);
97-
viewThemeUtils.platform.colorImageView(binding.menuIconAddFolderInfo);
98-
9992
binding.addToCloud.setText(getContext().getResources().getString(R.string.add_to_cloud,
10093
themeUtils.getDefaultDisplayNameForRootFolder(getContext())));
10194

@@ -149,8 +142,9 @@ protected void onCreate(Bundle savedInstanceState) {
149142
binding.menuDirectCameraUpload.setVisibility(View.GONE);
150143
}
151144

145+
// not required for NMC
152146
// create rich workspace
153-
if (editorUtils.isEditorAvailable(user,
147+
/* if (editorUtils.isEditorAvailable(user,
154148
MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN) &&
155149
file != null && !file.isEncrypted()) {
156150
// richWorkspace
@@ -167,7 +161,7 @@ protected void onCreate(Bundle savedInstanceState) {
167161
} else {
168162
binding.menuCreateRichWorkspace.setVisibility(View.GONE);
169163
binding.menuCreateRichWorkspaceDivider.setVisibility(View.GONE);
170-
}
164+
} */
171165

172166
setupClickListener();
173167
}

‎app/src/main/res/drawable/ic_encrypted_folder.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M4,21.75a3,3 0,0 1,-3 -3L1,2.25L7.5,2.25a3.65,3.65 0,0 1,2.7 1.2l0.45,0.45a1.43,1.43 0,0 0,0.85 0.35L23,4.25v14.5a3,3 0,0 1,-3 3ZM2.5,18.75a1.46,1.46 0,0 0,1.43 1.5L20,20.25a1.47,1.47 0,0 0,1.5 -1.44L21.5,5.75h-10A2.57,2.57 0,0 1,9.6 4.9l-0.45,-0.45a2.38,2.38 0,0 0,-1.65 -0.7h-5Z"
8+
android:fillColor="#262626"/>
9+
<path
10+
android:pathData="M14.14,16.56L9.86,16.56a1.07,1.07 0,0 1,-1.07 -1.08L8.79,12.09h0.89v-0.71a2.32,2.32 0,0 1,4.64 0v0.71h0.89v3.39A1.07,1.07 0,0 1,14.14 16.56ZM12,13.56a0.54,0.54 0,0 0,-0.54 0.53,0.55 0.55,0 0,0 0.18,0.4v0.68h0.72v-0.68a0.53,0.53 0,0 0,0 -0.75A0.52,0.52 0,0 0,12 13.52ZM12,9.63a1.79,1.79 0,0 0,-1.79 1.79v0.71h3.58v-0.71A1.79,1.79 0,0 0,12 9.59Z"
11+
android:fillColor="#262626"/>
12+
</vector>

‎app/src/main/res/drawable/ic_file_collection.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M17.75,0.5L8,0.5L8,3.5L5,3.5L5,6.5L2,6.5L2,21.25C2,22.4925 3.0075,23.5 4.25,23.5L13.25,23.5C14.4925,23.5 15.5,22.4925 15.5,21.25L15.5,20.5L16.25,20.5C17.4925,20.5 18.5,19.4925 18.5,18.25L18.5,17.5L19.25,17.5C20.4925,17.5 21.5,16.4925 21.5,15.25L21.5,4.3635L17.75,0.5ZM14,21.25C14,21.6635 13.6635,22 13.25,22L4.25,22C3.8365,22 3.5,21.6635 3.5,21.25L3.5,8L5,8L5,18.25C5,19.4925 6.0075,20.5 7.25,20.5L14,20.5L14,21.25ZM17,18.25C17,18.6635 16.6635,19 16.25,19L7.25,19C6.8365,19 6.5,18.6635 6.5,18.25L6.5,5L8,5L8,15.25C8,16.4925 9.0075,17.5 10.25,17.5L17,17.5L17,18.25ZM19.25,16L10.25,16C9.8365,16 9.5,15.6635 9.5,15.25L9.5,2L16,2L16,4.1705C16,4.9045 16.595,5.5 17.3295,5.5L20,5.5L20,15.25C20,15.6635 19.6635,16 19.25,16Z"
8+
android:strokeWidth="1"
9+
android:fillColor="#262626"
10+
android:fillType="nonZero"
11+
android:strokeColor="#00000000"/>
12+
</vector>

‎app/src/main/res/drawable/ic_upload_file.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M2.5,1L2.5,20C2.5,21.65 3.85,23 5.5,23L15.5,23L20.5,18L20.5,1L2.5,1ZM4,20L4,2.5L19,2.5L19,17L16,17C15.15,17 14.5,17.65 14.5,18.5L14.5,21.5L5.5,21.5C4.65,21.5 4,20.85 4,20Z"
8+
android:strokeWidth="1"
9+
android:fillColor="#262626"
10+
android:fillType="evenOdd"
11+
android:strokeColor="#00000000"/>
12+
</vector>

‎app/src/main/res/layout/file_actions_bottom_sheet.xml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
android:layout_width="match_parent"
2727
android:layout_height="match_parent"
2828
android:orientation="vertical"
29+
android:background="@color/bottom_sheet_bg_color"
2930
android:minHeight="@dimen/bottom_sheet_min_height"
3031
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
3132

@@ -63,18 +64,19 @@
6364
layout="@layout/file_thumbnail" />
6465
</FrameLayout>
6566

66-
<TextView
67-
android:id="@+id/title"
68-
android:layout_width="0dp"
69-
android:layout_height="wrap_content"
70-
android:ellipsize="middle"
71-
android:lines="1"
72-
android:padding="@dimen/standard_padding"
73-
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
74-
app:layout_constraintEnd_toEndOf="parent"
75-
app:layout_constraintStart_toEndOf="@id/thumbnail_container"
76-
app:layout_constraintTop_toTopOf="parent"
77-
tools:text="Test file name which is very very very very very long.pdf" />
67+
<TextView
68+
android:id="@+id/title"
69+
android:layout_width="0dp"
70+
android:layout_height="wrap_content"
71+
android:ellipsize="middle"
72+
android:lines="1"
73+
android:padding="@dimen/standard_padding"
74+
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
75+
app:layout_constraintEnd_toEndOf="parent"
76+
app:layout_constraintStart_toEndOf="@id/thumbnail_container"
77+
app:layout_constraintTop_toTopOf="parent"
78+
android:textColor="@color/bottom_sheet_txt_color"
79+
tools:text="Test file name which is very very very very very long.pdf" />
7880

7981
</androidx.constraintlayout.widget.ConstraintLayout>
8082

‎app/src/main/res/layout/file_actions_bottom_sheet_item.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_width="@dimen/iconized_single_line_item_icon_size"
4545
android:layout_height="@dimen/iconized_single_line_item_icon_size"
4646
android:contentDescription="@null"
47-
app:tint="@color/primary"
47+
app:tint="@color/bottom_sheet_icon_color"
4848
tools:src="@drawable/ic_delete" />
4949

5050
<LinearLayout
@@ -59,7 +59,7 @@
5959
android:layout_height="wrap_content"
6060
android:layout_gravity="center_vertical"
6161
android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
62-
android:textColor="@color/text_color"
62+
android:textColor="@color/bottom_sheet_txt_color"
6363
android:textSize="@dimen/bottom_sheet_text_size"
6464
tools:text="Delete file" />
6565

‎app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@
2222

2323
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2424
xmlns:tools="http://schemas.android.com/tools"
25+
xmlns:app="http://schemas.android.com/apk/res-auto"
2526
android:id="@+id/creator_container"
2627
android:layout_width="match_parent"
2728
android:layout_height="@dimen/bottom_sheet_item_height"
2829
android:background="?android:attr/selectableItemBackground"
2930
android:gravity="center_vertical"
3031
android:orientation="horizontal"
32+
android:paddingTop="@dimen/standard_half_padding"
33+
android:paddingBottom="@dimen/standard_half_padding"
3134
android:paddingLeft="@dimen/standard_padding"
3235
android:paddingRight="@dimen/standard_padding"
3336
tools:ignore="UseCompoundDrawables">
@@ -36,8 +39,7 @@
3639
android:id="@+id/creator_thumbnail"
3740
android:layout_width="24dp"
3841
android:layout_height="24dp"
39-
android:layout_marginTop="@dimen/standard_margin"
40-
android:layout_marginBottom="@dimen/standard_margin"
42+
app:tint="@color/bottom_sheet_icon_color"
4143
android:contentDescription="@null"
4244
android:src="@drawable/file_ppt" />
4345

@@ -46,8 +48,8 @@
4648
android:layout_width="wrap_content"
4749
android:layout_height="wrap_content"
4850
android:layout_gravity="center_vertical"
49-
android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
51+
android:layout_marginStart="@dimen/standard_margin"
5052
android:text="@string/create_new_presentation"
51-
android:textColor="@color/text_color"
53+
android:textColor="@color/bottom_sheet_txt_color"
5254
android:textSize="@dimen/bottom_sheet_text_size" />
5355
</LinearLayout>

0 commit comments

Comments
 (0)