Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
cf27c2c
add database for synced folders
tobiasKaminsky Sep 19, 2016
30669c9
initial navigation setup for menu and activity
AndyScherzinger Sep 19, 2016
db67a4f
header fix
AndyScherzinger Sep 21, 2016
b27b5a4
sync config icons
AndyScherzinger Sep 21, 2016
c1c7d23
initial add for recycler view implementation with headers (WIP)
AndyScherzinger Sep 21, 2016
36280b9
rudimentary media loader implementation (file thumbnails and any acti…
AndyScherzinger Sep 22, 2016
4c31ca1
initial v1 for grid view
AndyScherzinger Sep 22, 2016
c0afddd
proper thumbnails, image counter, darkening etc.
AndyScherzinger Sep 22, 2016
038f316
initial link of menu buttons
AndyScherzinger Sep 22, 2016
27cb68b
initial navigation setup for menu and activity
AndyScherzinger Sep 19, 2016
d2aa22f
initial add for recycler view implementation with headers (WIP)
AndyScherzinger Sep 21, 2016
12e4532
wip
tobiasKaminsky Sep 22, 2016
59da136
wip
tobiasKaminsky Sep 22, 2016
281f970
wip
tobiasKaminsky Sep 25, 2016
25117bc
ignore gradle.properties for git
AndyScherzinger Sep 26, 2016
dc1b7b3
layout tweaking, better listener support, loading visualization
AndyScherzinger Sep 26, 2016
dd35c49
renamed upload action column, extended SyncFolder POJO, createdd a dr…
AndyScherzinger Sep 28, 2016
a883dfc
make SyncedFolderObserverService use SyncedFolderProvider (todo also …
AndyScherzinger Sep 28, 2016
512b7ad
hardening provider implementation + javadoc
AndyScherzinger Sep 29, 2016
9f67ced
add database for synced folders
tobiasKaminsky Sep 19, 2016
cf4498d
initial navigation setup for menu and activity
AndyScherzinger Sep 19, 2016
61244d0
header fix
AndyScherzinger Sep 21, 2016
2334e06
sync config icons
AndyScherzinger Sep 21, 2016
20dbdb8
initial add for recycler view implementation with headers (WIP)
AndyScherzinger Sep 21, 2016
9874b09
rudimentary media loader implementation (file thumbnails and any acti…
AndyScherzinger Sep 22, 2016
0e6d395
initial v1 for grid view
AndyScherzinger Sep 22, 2016
ef53c97
proper thumbnails, image counter, darkening etc.
AndyScherzinger Sep 22, 2016
6369364
initial link of menu buttons
AndyScherzinger Sep 22, 2016
34cae92
initial navigation setup for menu and activity
AndyScherzinger Sep 19, 2016
db87263
initial add for recycler view implementation with headers (WIP)
AndyScherzinger Sep 21, 2016
99a8278
wip
tobiasKaminsky Sep 22, 2016
7fef98c
wip
tobiasKaminsky Sep 22, 2016
77353f6
wip
tobiasKaminsky Sep 25, 2016
6774a00
ignore gradle.properties for git
AndyScherzinger Sep 26, 2016
a1931ed
layout tweaking, better listener support, loading visualization
AndyScherzinger Sep 26, 2016
67d7ec9
renamed upload action column, extended SyncFolder POJO, createdd a dr…
AndyScherzinger Sep 28, 2016
78dfb7c
make SyncedFolderObserverService use SyncedFolderProvider (todo also …
AndyScherzinger Sep 28, 2016
a04682f
hardening provider implementation + javadoc
AndyScherzinger Sep 29, 2016
f868e0d
Merge branch 'syncedFolders' of https://github.com/nextcloud/android …
AndyScherzinger Sep 29, 2016
17b9eae
initial code to read (yet empty DB) and display settings screen (non-…
AndyScherzinger Sep 29, 2016
b9c15c1
toggle folder's sync on/off - wip since state persistence is not work…
AndyScherzinger Sep 30, 2016
d7f461a
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 6, 2016
b607a77
minor layout optimization
AndyScherzinger Oct 6, 2016
c4c1b6b
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 6, 2016
4796633
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 6, 2016
ccb16b7
initial wip implementation of config element click listeners
AndyScherzinger Oct 6, 2016
5214659
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 9, 2016
b557b07
remote folder can now be changed, all config changes for a synced fol…
AndyScherzinger Oct 9, 2016
e1273ee
ellipsizing
AndyScherzinger Oct 9, 2016
48d3ef6
removed toast
AndyScherzinger Oct 9, 2016
0454c24
bump gradle plugin to 2.2.1
AndyScherzinger Oct 10, 2016
52fdc31
better empty message
AndyScherzinger Oct 10, 2016
db96fe0
media folder sorting (enabled, alphanumerical) + javadoc
AndyScherzinger Oct 10, 2016
179c695
removed dummy synced folder entry
tobiasKaminsky Oct 12, 2016
c3a8b0c
update job to obey syncedfolder settings
tobiasKaminsky Oct 12, 2016
0889f8a
grid spacing added + negative/shortened margins for containers for ni…
AndyScherzinger Oct 13, 2016
6783a1c
minor persistence bugfix
AndyScherzinger Oct 13, 2016
bf39292
persistence fix
AndyScherzinger Oct 17, 2016
e053caf
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 19, 2016
c714779
fix wlan upload
tobiasKaminsky Oct 21, 2016
a4a41a6
enforce camera folder top position
AndyScherzinger Oct 24, 2016
6afeee7
hide instant upload icon on Android pre-lollipop
AndyScherzinger Oct 24, 2016
eff5d9e
Order images by date (to always show the latest pictures taken)
AndyScherzinger Oct 24, 2016
e68c547
fix default upload behavior for synced folder
AndyScherzinger Oct 24, 2016
223e29d
hide legacy instant upload preferences on Android 5+
AndyScherzinger Oct 24, 2016
c30dcd4
minor renamings & javadoc
AndyScherzinger Oct 24, 2016
faea2f0
dynamic media grid width sizing and revampedd instant upload icon
AndyScherzinger Oct 24, 2016
85b2223
fix copyright note
AndyScherzinger Oct 24, 2016
9efa7de
fix synced folder settings dialog theming + code cleanup
AndyScherzinger Oct 24, 2016
a3cf129
initially show instant upload feature revamp message if instant uploa…
AndyScherzinger Oct 24, 2016
cf28cdb
better legacy shared prefereenced cleanup
AndyScherzinger Oct 24, 2016
fbca8cd
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 24, 2016
d2d8352
recyclerview/media-folder optimized thumbnail cache/async task implem…
AndyScherzinger Oct 25, 2016
cc45b0f
added possibility to enable/disable sync folder in the settings screen
AndyScherzinger Oct 26, 2016
e3bd1ce
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 26, 2016
e879517
removed final declaration
AndyScherzinger Oct 26, 2016
29d5e1e
tweaked layout for preferences
AndyScherzinger Oct 26, 2016
235b01b
fixed review comments
AndyScherzinger Oct 26, 2016
3c62f41
observers are restarted after changing a setting
tobiasKaminsky Oct 26, 2016
10cc73c
header
AndyScherzinger Oct 26, 2016
624e222
beatufied code
AndyScherzinger Oct 26, 2016
66c4a57
added javadoc
AndyScherzinger Oct 26, 2016
34003e9
moved to switch instead of icon
AndyScherzinger Oct 27, 2016
a720561
only show folder path on topo with synced folder made bold
AndyScherzinger Oct 27, 2016
67672c5
proper formatting
AndyScherzinger Oct 27, 2016
e0eb7fb
fix media queries escaping folder names and respecting folders with s…
AndyScherzinger Oct 27, 2016
0b26154
Instant Upload --> Instant upload
AndyScherzinger Oct 31, 2016
d49d248
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Oct 31, 2016
9a6bf6e
Instant upload --> Auto upload
AndyScherzinger Nov 1, 2016
fc6e3fc
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Nov 1, 2016
d912bd2
Fixes after rebase
AndyScherzinger Nov 1, 2016
d713294
further merge fixes
AndyScherzinger Nov 1, 2016
fee2521
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Nov 2, 2016
a737c09
fixes for preferences after merge
AndyScherzinger Nov 2, 2016
9d7c953
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Nov 2, 2016
ccccbbb
dirty fix for null occurence
tobiasKaminsky Oct 27, 2016
af859df
fix wrong upload behaviour
tobiasKaminsky Nov 6, 2016
c3eb12c
fix crash when exposing URI on Android 7+
AndyScherzinger Nov 6, 2016
ff6b07b
Avoid instantiating Boolean objects; reference Boolean.TRUE or Boolea…
AndyScherzinger Nov 6, 2016
560f5a7
simplified boolean check
AndyScherzinger Nov 6, 2016
46d0f01
removal of code warnings
AndyScherzinger Nov 7, 2016
500707c
brackets
AndyScherzinger Nov 7, 2016
df60c9c
fixing codacy warnings
AndyScherzinger Nov 7, 2016
4c56ce2
fix only one picture is uploaded
tobiasKaminsky Nov 10, 2016
fb4fe46
Merge remote-tracking branch 'origin/syncedFolders' into syncedFolders2
tobiasKaminsky Nov 10, 2016
6c8bbd6
Merge branch 'master' of https://github.com/nextcloud/android into sy…
AndyScherzinger Nov 10, 2016
e13a85f
fix access
AndyScherzinger Nov 10, 2016
0bff899
show pending jobs
tobiasKaminsky Nov 16, 2016
e33f946
ignore media folders within our own app
tobiasKaminsky Nov 16, 2016
718c1cc
remove debugging output
tobiasKaminsky Nov 16, 2016
34e85d0
sorting of media folder is now case insensitive
tobiasKaminsky Nov 16, 2016
47c8afd
hide Auto Sync for pre Nougat version
tobiasKaminsky Nov 16, 2016
5c0f8da
Merge remote-tracking branch 'origin/syncedFolders' into syncedFolders2
tobiasKaminsky Nov 16, 2016
93e861c
hide Auto Sync for pre Nougat version
tobiasKaminsky Nov 16, 2016
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ tests/proguard-project.txt
.gradle
.idea
*.iml
build
build
/gradle.properties
7 changes: 7 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@
</activity>
<activity android:name=".ui.activity.ManageAccountsActivity" />
<activity android:name=".ui.activity.ParticipateActivity" />
<activity android:name=".ui.activity.FolderSyncActivity" />
<activity android:name=".ui.activity.UploadFilesActivity" />
<activity android:name=".ui.activity.ReceiveExternalFilesActivity"

android:taskAffinity=""
android:excludeFromRecents="true"
android:theme="@style/Theme.ownCloud.NoActionBar">
Expand Down Expand Up @@ -122,6 +124,7 @@
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/authenticator" />
</service>
<service android:name=".services.observer.SyncedFolderObserverService"/>
<service
android:name=".syncadapter.FileSyncService"
android:exported="true" >
Expand All @@ -133,6 +136,10 @@
android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter_files" />
</service>
<service
android:name=".services.SyncedFolderJobService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="true"/>

<provider
android:name=".providers.FileContentProvider"
Expand Down
Binary file added res/drawable-hdpi/ic_cellphone.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_cloud_check.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_cloud_outline.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_cloud_sync_off.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_cloud_sync_on.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_cloud_upload.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_dots_vertical.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_uploads.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_cellphone.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_cloud_check.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_cloud_outline.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_cloud_sync_off.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_cloud_sync_on.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_cloud_upload.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_dots_vertical.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_cellphone.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_cloud_check.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_cloud_outline.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_cloud_sync_off.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_cloud_sync_on.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_cloud_upload.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_dots_vertical.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_cellphone.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_cloud_check.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_cloud_outline.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_cloud_sync_off.png
Binary file added res/drawable-xxhdpi/ic_cloud_sync_on.png
Binary file added res/drawable-xxhdpi/ic_cloud_upload.png
Binary file added res/drawable-xxhdpi/ic_dots_vertical.png
Binary file added res/drawable-xxxhdpi/ic_cellphone.png
Binary file added res/drawable-xxxhdpi/ic_cloud_check.png
Binary file added res/drawable-xxxhdpi/ic_cloud_outline.png
Binary file added res/drawable-xxxhdpi/ic_cloud_sync_off.png
Binary file added res/drawable-xxxhdpi/ic_cloud_sync_on.png
Binary file added res/drawable-xxxhdpi/ic_cloud_upload.png
Binary file added res/drawable-xxxhdpi/ic_dots_vertical.png
5 changes: 2 additions & 3 deletions res/layout/drawer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<!--
Nextcloud Android client application

Copyright (C) 2015 Andy Scherzinger
Copyright (C) 2016 Nextcloud
Copyright (C) 2015 ownCloud
Copyright (C) 2016 Andy Scherzinger
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
Expand Down
5 changes: 2 additions & 3 deletions res/layout/drawer_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<!--
Nextcloud Android client application

Copyright (C) 2015 Andy Scherzinger
Copyright (C) 2016 Nextcloud
Copyright (C) 2015 ownCloud
Copyright (C) 2016 Andy Scherzinger
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
Expand Down
70 changes: 70 additions & 0 deletions res/layout/folder_sync_item_header.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application

Copyright (C) 2016 Andy Scherzinger
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero General Public
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/alternate_half_padding"
android:paddingBottom="@dimen/alternate_half_padding"
android:paddingLeft="@dimen/standard_padding">

<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/buttonBar"
android:layout_alignParentLeft="true"
android:layout_alignTop="@+id/buttonBar"
android:layout_toLeftOf="@+id/buttonBar"
android:ellipsize="middle"
android:gravity="start|center_vertical"
android:text="Header Text"
android:textColor="?android:textColorPrimary"
android:textStyle="bold"/>

<LinearLayout
android:id="@+id/buttonBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true">

<ImageButton
android:id="@+id/syncStatusButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:clickable="true"
android:padding="@dimen/standard_half_padding"
android:src="@drawable/ic_cloud_sync_off"/>

<ImageButton
android:id="@+id/settingsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:clickable="true"
android:paddingBottom="@dimen/standard_half_padding"
android:paddingLeft="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:src="@drawable/ic_dots_vertical"/>
</LinearLayout>

</RelativeLayout>
98 changes: 98 additions & 0 deletions res/layout/folder_sync_layout.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application

Copyright (C) 2016 Andy Scherzinger
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero General Public
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true">

<!-- The main content view -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<include
layout="@layout/toolbar_standard"/>

<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<android.support.v7.widget.RecyclerView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
android:visibility="visible"
android:layout_marginRight="-3dp"
android:layout_marginLeft="-3dp"
android:layout_marginBottom="-3dp"/>

<LinearLayout
android:id="@android:id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
android:visibility="gone">

<ProgressBar
android:id="@+id/folderSyncProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"/>

<TextView
android:id="@+id/progressText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="@dimen/standard_half_margin"
android:text="@string/folder_sync_loading_folders"
android:textColor="@color/secondaryTextColor"
android:textStyle="italic"/>
</LinearLayout>

<TextView
android:id="@android:id/empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/standard_margin"
android:gravity="center"
android:textColor="@color/secondaryTextColor"
android:text="@string/folder_sync_no_results"
android:visibility="gone" />
</FrameLayout>

</LinearLayout>

<include
layout="@layout/drawer"
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"/>

</android.support.v4.widget.DrawerLayout>
Loading