Skip to content
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

#1413 share view enhancement - REDONE #1551

Merged
merged 14 commits into from
Mar 22, 2016
Merged
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
2 changes: 1 addition & 1 deletion AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<activity
android:name=".ui.activity.ShareActivity"
android:label="@string/share_dialog_title"
android:theme="@style/Theme.ownCloud.Dialog"
android:theme="@style/Theme.ownCloud.Dialog.NoTitle"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustResize" >
<intent-filter>
Expand Down
Binary file added res/drawable-hdpi/ic_close.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/ic_group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/ic_search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/ic_user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_close.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_close.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_close.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 33 additions & 11 deletions res/layout/edit_share_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,41 @@
<LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/editShareTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/share_with_edit_title"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:padding="@dimen/standard_padding"
android:singleLine="true"
android:ellipsize="middle"
/>

<View
android:id="@+id/share_header_divider"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/owncloud_blue"
/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_margin">

<Switch
<android.support.v7.widget.SwitchCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/two_line_primary_text_size"
android:text="@string/share_privilege_can_edit"
android:id="@+id/canEditSwitch"
android:layout_gravity="start"
android:padding="@dimen/standard_half_padding"
android:layout_marginTop="@dimen/standard_half_margin"
android:background="@color/actionbar_start_color"
android:textColor="@color/white"
android:textColor="@color/color_accent"
android:paddingLeft="0dp"
style="?android:attr/listSeparatorTextViewStyle"
/>

<CheckBox
Expand All @@ -65,19 +88,18 @@
android:visibility="gone"
/>

<Switch
<android.support.v7.widget.SwitchCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/two_line_primary_text_size"
android:text="@string/share_privilege_can_share"
android:id="@+id/canShareSwitch"
android:layout_gravity="start"
android:padding="@dimen/standard_half_padding"
android:layout_marginTop="@dimen/standard_half_margin"
android:background="@color/actionbar_start_color"
android:textColor="@color/white"
android:textColor="@color/color_accent"
android:paddingLeft="0dp"
style="?android:attr/listSeparatorTextViewStyle"
/>

</LinearLayout>
</LinearLayout>

</ScrollView>
3 changes: 2 additions & 1 deletion res/layout/password_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword">
android:inputType="textPassword"
android:layout_margin="@dimen/standard_margin">
</EditText>

</LinearLayout>
21 changes: 17 additions & 4 deletions res/layout/search_users_groups_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,31 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/search_layout"
android:minWidth="200dp">
android:minWidth="200dp"
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginBottom="20dp">

<SearchView
<TextView
android:id="@+id/searchUserGroupsTitle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/share_with_title"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:padding="@dimen/standard_padding"/>

<android.support.v7.widget.SearchView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/searchView"
android:hint="@string/share_search"/>
android:hint="@string/share_search"
style="@style/ownCloud.SearchView"/>

<ListView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/searchUsersListView"
android:scrollbars="vertical"/>
android:scrollbars="vertical"
android:layout_marginLeft="20dp"
android:layout_marginRight="@dimen/standard_half_margin"/>

</LinearLayout>
Loading