mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 21:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

OC bottom list improvement

Browse source 
- same padding
- add "create new" for creators

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2020-01-21 13:01:28 +01:00
parent 4532c5b1c0
commit 289a83635d
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
4 changed files with 67 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
View file

@ -74,6 +74,9 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog {
@BindView(R.id.creators)
public LinearLayout creators;
@BindView(R.id.creators_container)
public LinearLayout creatorsContainer;
@BindView(R.id.menu_direct_camera_upload)
public View cameraView;
@ -135,13 +138,16 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog {
DirectEditing directEditing = new Gson().fromJson(json, DirectEditing.class);
if (!directEditing.getCreators().isEmpty()) {
creators.setVisibility(View.VISIBLE);
creatorsContainer.setVisibility(View.VISIBLE);
LayoutInflater vi = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
for (Creator creator : directEditing.getCreators().values()) {
View creatorView = vi.inflate(R.layout.file_list_actions_bottom_sheet_creator, null);
((TextView) creatorView.findViewById(R.id.creator_name)).setText(creator.getName());
((TextView) creatorView.findViewById(R.id.creator_name)).setText(
String.format(fileActivity.getString(R.string.editor_placeholder),
fileActivity.getString(R.string.create_new),
creator.getName()));
ImageView thumbnail = creatorView.findViewById(R.id.creator_thumbnail);
thumbnail.setImageDrawable(MimeTypeUtil.getFileTypeIcon(creator.getMimetype(),

2
src/main/res/layout/file_list_actions_bottom_sheet_creator.xml
View file

@ -28,7 +28,7 @@
android:paddingLeft="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables">
<ImageView

107
src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
View file

@ -94,16 +94,6 @@
</LinearLayout>
<View
android:id="@+id/dividerCameraUpload"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:background="@color/list_divider_background" />
<LinearLayout
android:id="@+id/menu_direct_camera_upload"
android:layout_width="match_parent"
@ -153,7 +143,7 @@
android:paddingLeft="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables">
<ImageView
@ -176,6 +166,15 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:background="@color/list_divider_background" />
<LinearLayout
android:id="@+id/templates"
android:layout_width="match_parent"
@ -183,43 +182,33 @@
android:orientation="vertical"
android:visibility="gone">
<View
android:id="@+id/dividerCreateTemplates"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="@dimen/standard_half_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:background="@color/list_divider_background"/>
<LinearLayout
android:id="@+id/menu_new_document"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/standard_padding"
android:paddingLeft="@dimen/standard_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/menu_icon_new_document"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@null"
android:src="@drawable/file_doc"/>
android:src="@drawable/file_doc" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:text="@string/create_new_document"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"/>
android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout>
<LinearLayout
@ -227,28 +216,28 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/standard_padding"
android:paddingLeft="@dimen/standard_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/menu_icon_new_spreadsheet"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@null"
android:src="@drawable/file_xls"/>
android:src="@drawable/file_xls" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:text="@string/create_new_spreadsheet"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"/>
android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout>
<LinearLayout
@ -256,37 +245,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/standard_padding"
android:paddingLeft="@dimen/standard_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/menu_icon_new_presentation"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@null"
android:src="@drawable/file_ppt"/>
android:src="@drawable/file_ppt" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:text="@string/create_new_presentation"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"/>
android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/creators"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<View
android:layout_width="match_parent"
@ -296,7 +277,31 @@
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:background="@color/list_divider_background" />
</LinearLayout>
<LinearLayout
android:id="@+id/creators_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:id="@+id/creators"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:background="@color/list_divider_background" />
</LinearLayout>
<LinearLayout
@ -307,7 +312,7 @@
android:paddingLeft="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
android:paddingBottom="@dimen/standard_padding"
tools:ignore="UseCompoundDrawables">
<ImageView

2
src/main/res/values/strings.xml
View file

@ -911,4 +911,6 @@
<string name="create_rich_workspace">Add folder info</string>
<string name="creates_rich_workspace">creates folder info</string>
<string name="edit_rich_workspace">edit folder info</string>
<string name="create_new">Create new</string>
<string name="editor_placeholder" translatable="false">%1$s %2$s</string>
</resources>