Reliable uploads #919
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/errorTextView" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" /> | ||
|
|
||
| </ScrollView> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| This must be a clone of list_fragment.xml | ||
|
|
||
| EXCEPT: ExpandableListView must be used for @+id/swipe_refresh_files_emptyView | ||
| --> | ||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="0dp" | ||
| android:layout_height="match_parent" | ||
| android:layout_weight="1" > | ||
|
|
||
| <android.support.v4.widget.SwipeRefreshLayout | ||
| android:id="@+id/swipe_refresh_files" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" > | ||
|
|
||
| <ExpandableListView | ||
| android:id="@+id/list_root" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" /> | ||
|
|
||
| </android.support.v4.widget.SwipeRefreshLayout> | ||
|
|
||
| <android.support.v4.widget.SwipeRefreshLayout | ||
| android:id="@+id/swipe_refresh_files_emptyView" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:visibility="gone" > | ||
|
|
||
| <ScrollView | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/empty_list_view" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center_vertical|center_horizontal" | ||
| android:text="@string/empty" | ||
| android:layout_gravity="center" | ||
| android:visibility="visible" /> | ||
|
|
||
| </ScrollView> | ||
| </android.support.v4.widget.SwipeRefreshLayout> | ||
| </FrameLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:paddingTop="3dp" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/uploadListGroupName" | ||
| style="?android:attr/listSeparatorTextViewStyle" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_vertical" | ||
| android:layout_toLeftOf="@+id/upload_group_right_button" | ||
| android:divider="@null" | ||
| android:dividerHeight="0dp" | ||
| android:ellipsize="middle" | ||
| android:showDividers="none" | ||
| /> | ||
|
|
||
| <!-- This would be just too many buttons. | ||
| <Button | ||
| android:id="@+id/upload_group_right_button" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
| android:layout_alignBottom="@+id/uploadListGroupName" | ||
| android:layout_alignParentRight="true" | ||
| android:layout_alignParentTop="true" | ||
| style="?android:attr/buttonStyleSmall" | ||
| android:focusable="false" | ||
| android:focusableInTouchMode="false" | ||
| android:text="CLEAR" | ||
| /> | ||
| --> | ||
|
|
||
|
|
||
| </RelativeLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:id="@+id/ListItemLayout" | ||
| android:layout_width="fill_parent" | ||
| android:orientation="horizontal" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <FrameLayout | ||
| android:layout_width="56dp" | ||
| android:layout_height="match_parent" | ||
| android:focusable="false" | ||
| android:focusableInTouchMode="false"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/imageView1" | ||
| android:layout_width="@dimen/file_icon_size" | ||
| android:layout_height="@dimen/file_icon_size" | ||
| android:layout_gravity="center" | ||
| android:src="@drawable/ic_menu_archive" /> | ||
|
|
||
| </FrameLayout> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_weight="1" | ||
| android:gravity="center_vertical" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/upload_name" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_vertical" | ||
| android:ellipsize="middle" | ||
| android:singleLine="true" | ||
| android:textColor="#303030" | ||
| android:textSize="16dip" /> | ||
|
|
||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:weightSum="1"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/upload_local_path" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_weight=".5" | ||
| android:textColor="@color/list_item_lastmod_and_filesize_text" | ||
| android:textSize="12dip"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/upload_file_size" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="right" | ||
| android:textColor="@color/list_item_lastmod_and_filesize_text" | ||
| android:layout_weight=".5" | ||
| android:textSize="12dip"/> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <ProgressBar | ||
| android:id="@+id/upload_progress_bar" | ||
| style="?android:attr/progressBarStyleHorizontal" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:visibility="gone" | ||
| /> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:weightSum="1"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/upload_status" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_weight=".5" | ||
| android:textColor="@color/list_item_lastmod_and_filesize_text" | ||
| android:textSize="12dip"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/upload_date" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="right" | ||
| android:textColor="@color/list_item_lastmod_and_filesize_text" | ||
| android:layout_weight=".5" | ||
| android:textSize="12dip"/> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
|
|
||
| <FrameLayout | ||
| android:layout_width="40dp" | ||
| android:layout_height="match_parent" | ||
| android:focusable="false" | ||
| android:focusableInTouchMode="false" | ||
| android:paddingLeft="8dp" | ||
| > | ||
|
|
||
| <Button | ||
| android:id="@+id/upload_right_button" | ||
| android:background ="@drawable/btn_small_round" | ||
| android:layout_width="30dp" | ||
| android:layout_height="30dp" | ||
| android:layout_gravity="center" | ||
| android:focusable="false" | ||
| android:focusableInTouchMode="false" | ||
| /> | ||
|
|
||
| </FrameLayout> | ||
|
|
||
|
|
||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" > | ||
|
|
||
| <fragment | ||
| android:id="@+id/UploadListFragment" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:paddingLeft="25dp" | ||
| android:paddingRight="25dp" | ||
| android:layout_marginLeft="10dp" | ||
| android:layout_marginRight="10dp" | ||
| class="com.owncloud.android.ui.fragment.UploadListFragment" /> | ||
|
|
||
| </FrameLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <menu xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
|
||
| <item android:id="@+id/action_open_file_with" android:title="@string/actionbar_open_with" android:icon="@android:drawable/ic_menu_set_as" android:orderInCategory="1" /> | ||
| <item android:id="@+id/action_cancel_upload" android:title="@string/common_cancel_upload" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:orderInCategory="1" /> | ||
| <item android:id="@+id/action_remove_upload" android:title="@string/common_remove_upload" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:orderInCategory="1" /> | ||
| <item android:id="@+id/action_retry_upload" android:title="@string/common_retry_upload" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:orderInCategory="1" /> | ||
| <item android:id="@+id/action_see_details" android:title="@string/actionbar_see_details" android:icon="@android:drawable/ic_menu_info_details" android:orderInCategory="1" /> | ||
|
|
||
| </menu> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ownCloud Android client application | ||
|
|
||
| Copyright (C) 2012 Bartek Przybylski | ||
| Copyright (C) 2012-2013 ownCloud Inc. | ||
|
|
||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License version 2, | ||
| as published by the Free Software Foundation. | ||
|
|
||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
|
|
||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| --> | ||
| <menu xmlns:android="http://schemas.android.com/apk/res/android" > | ||
|
|
||
| <item | ||
| android:id="@+id/action_retry_uploads" | ||
| android:title="Retry current uploads"/> | ||
| <item | ||
| android:id="@+id/action_clear_failed_uploads" | ||
| android:title="Clear failed uploads"/> | ||
| <item | ||
| android:id="@+id/action_clear_finished_uploads" | ||
| android:title="Clear finished uploads"/> | ||
| </menu> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very good feelings here.