diff --git a/.gitignore b/.gitignore index 4b5b3506432..1dccbf8edb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -# built application files -*.apk -*.ap_ - # files for the dex VM *.dex @@ -14,6 +10,7 @@ build/ *.iml gen/ target/ +build/ # Local configuration files (sdk path, etc) local.properties @@ -37,4 +34,4 @@ tests/proguard-project.txt .gradle .idea *.iml -build \ No newline at end of file +build diff --git a/.travis.yml b/.travis.yml index 15902b42855..50f29e8403d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ android: - sys-img-armeabi-v7a-android-23 before_install: - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M - - emulator -avd test -no-skin -no-audio -no-window & - - chmod +x ./wait_for_emulator.sh - - ./wait_for_emulator.sh +# - emulator -avd test -no-skin -no-audio -no-window & +# - chmod +x ./wait_for_emulator.sh +# - ./wait_for_emulator.sh script: # build app and assemble APK, in debug mode - ./gradlew assembleDebug diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c8731bdf88c..df8619e2825 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,8 +19,8 @@ --> + android:versionCode="20160606" + android:versionName="20160606" > = 23; the app needs to handle this --> + @@ -54,26 +55,34 @@ + + + + android:label="ownCloud beta" + android:theme="@style/Theme.ownCloud.Toolbar" + android:manageSpaceActivity="com.owncloud.android.ui.activity.ManageSpaceActivity"> + android:label="ownCloud beta" > + android:theme="@style/Theme.ownCloud.Toolbar.Drawer"> + - + + + android:excludeFromRecents="true" + android:label="ownCloud beta"> @@ -98,7 +107,7 @@ android:theme="@style/Theme.ownCloud.Overlay" /> + + + + + + + + + + android:theme="@style/Theme.ownCloud.Toolbar" > @@ -170,6 +197,7 @@ + @@ -208,16 +236,16 @@ + android:label="Copy link" /> + android:label="ownCloud beta" /> + android:label="ownCloud beta" /> @@ -228,7 +256,7 @@ android:resource="@xml/users_and_groups_searchable"/> diff --git a/CHANGELOG.md b/CHANGELOG.md index 65f8c7bef8b..e94e868bbe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,91 +1,102 @@ -## 2.0.0 (April 2016) -- Uploads view: track the progress of your uploads and handle failures -- Federated sharing: share files with users in other ownCloud servers -- Improvements on the UI following material design lines -- Set a shared-by-link folder as editable -- Wifi-only for instant uploads stop on Wifi loss -- Be warned of server certificate changed in any action -- Improvements when other apps send files to ownCloud -- Bug fixing - -## 1.9.1 (February 2016) -- Set and edit permissions on internal shared data -- Instant uploads: avoid file duplications, set policy in app settings -- Control duplication of files uploaded via 'Upload' button -- Select view mode: either list or grid per folder -- More Material Design: buttons and checkboxes -- Fixed battery drain in automatic synchronization -- Security fixes related to passcode -- Wording fixes - -## 1.9.0 (December 2015) -- Share privately with users or groups in your server -- Share link with password protection and expiration date -- Fully sync a folder in two ways (manually) -- Detect share configuration in server -- Fingerprints in untrusted certificate dialog -- Thumbnail in details view -- OC color in notifications -- Fixed video preview -- Fixed sorting with accents -- Error shown when no app can "open with" a file -- Fixed relative date in some languages -- Media scanner triggered after uploads - -## 1.8.0 (September 2015) -- New MATERIAL DESIGN theme -- Updated FILE TYPE ICONS -- Preview TXT files within the app -- COPY files & folders -- Preview the full file/folder name from the long press menu -- Set a file as FAVORITE (kept-in-sync) from the CONTEXT MENU -- Updated CONFLICT RESOLUTION dialog (wording) -- Updated background for images with TRANSPARENCY in GALLERY -- Hidden files will not enforce list view instead of GRID VIEW (folders from Picasa & others) -- Security: - + Updated network stack with security fixes (Jackrabbit 2.10.1) -- Bugs fixed: - + Fixed crash when ETag is lost - + Passcode creation not restarted on device rotation - + Recovered share icon shown on folders 'shared with me' - + User name added to subject when sending a share link through e-mail (fixed on SAMLed apps) - -## 1.7.2 (July 2015) -- New navigation drawer -- Improved Passcode -- Automatic grid view just for folders full of images -- More characters allowed in file names -- Support for servers in same domain, different path -- Bugs fixed: - + Frequent crashes in folder with several images - + Sync error in servers with huge quota and external storage enable - + Share by link error - + Some other crashes and minor bugs - -## 1.7.1 (April 2015) - -- Share link even with password enforced by server -- Get the app ready for oc 8.1 servers -- Added option to create new folder in uploads from external apps -- Improved management of deleted users -- Bugs fixed - + Fixed crash on Android 2.x devices - + Improvements on uploads - -## 1.7.0 (February 2015) - -- Download full folders -- Grid view for images -- Remote thumbnails (OC Server 8.0+) -- Added number of files and folders at the end of the list -- "Open with" in contextual menu -- Downloads added to Media Provider -- Uploads: - + Local thumbnails in section "Files" - + Multiple selection in "Content from other apps" (Android 4.3+) -- Gallery: - + proper handling of EXIF - + obey sorting in the list of files -- Settings view updated -- Improved subjects in e-mails -- Bugs fixed +# 2016-04-13 +- PR [#1552] (https://github.com/owncloud/android/pull/1552) " moved logs from drawer menu to the settings" merged +- PR [#1559] (https://github.com/owncloud/android/pull/1559) "Toolbar, new Drawer and new Account Manager" merged + +# 2016-03-05 +- PR [#1493] (https://github.com/owncloud/android/pull/1493) "Reliable uploads - UPLOADS VIEW" merged +- update all other PR + +# 2016-02-06 +- check boxes fixed for multi select on dark images + +# 2016-01-20 +- update master +- PR: 1413_share_view_enhancement + +# 2016-01-12 +- PR [#1424] (https://github.com/owncloud/android/pull/1424) "semi transparent checkmark" merged +- PR [#1416] (https://github.com/owncloud/android/pull/1416) "share view enhancement" merged + +# 2016-01-03 +- update all PR +- PR [#1399] (https://github.com/owncloud/android/pull/399) Upload shows files + +# 2015-11-28 +- fix #1381 +- updated PR [#1220] (https://github.com/owncloud/android/pull/1220) fixing file access on Marshmallow devices (upload/download) + +# 2015-12-22 +- always show log in navigation drawer + +# 2015-12-20 +- update all PR +- added fix_NPE_in_instant_uploads + +# 2015-12-13 +- update all PR + +# 2015-11-28 +- update all PR +- PR [#1191] (https://github.com/owncloud/android/pull/1191) "Cancel upload on wlan exit" merged +- PR [#1220] (https://github.com/owncloud/android/pull/1220) "Move to compile target Marshmallow (Android 6 - v23)" merged + +# 2015-11-21 +- fix #1297 +- update all PR +- try for #1278 + +# 2015-11-20 +- PR [#1293] (https://github.com/owncloud/android/pull/1293) "External SD by przybylski" merged +- PR [#1296] (https://github.com/owncloud/android/pull/1296) "Don't allow to remove passcode without entering it. Don't allow to set incomplete passcode by przybylski" merged + +# 2015-11-18 +- update all PR +- fix #1259 + +# 2015-11-13 +- update all PR + +# 2015-11-10 +- update master +- PR [#1277] (https://github.com/owncloud/android/pull/1277) "Optimized uploader layout and user configured sorting" merged + +# 2015-11-05 +- update master +- fix #1244 +- add changelog +- add check for update of beta version + +# 2015-11-02 +- PR [#1240](https://github.com/owncloud/android/pull/1240) "Set as wallpaper" merged +- updated other PRs + +# 2015-11-01 +- PR [#1236](https://github.com/owncloud/android/pull/1236) "Streaming video/audio" merged +- PR [#1035](https://github.com/owncloud/android/pull/1035) "Enable video thumbnail" merged + +# 2015-10-31 +- updated all PR +- bugfix: #1234, #1230 +- implement Crash Handler +- implement direct download of latest apk in settings -> last item on bottom + +# 2015-10-30 +- fixed problem with Authority + +# 2015-10-29 +- PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged +- PR [#1100](https://github.com/owncloud/android/pull/1100) "Material FAB with speed dial implementation" merged +- PR [#1209](https://github.com/owncloud/android/pull/1209) "Material buttons - before in #1090" merged +- PR [#1205](https://github.com/owncloud/android/pull/1205) "Switch between online and offline files" merged +- PR [#1195](https://github.com/owncloud/android/pull/1195) "Resize Cache" merged +- PR [#1187](https://github.com/owncloud/android/pull/1187) "Video: Big thumbnails" merged +- PR [#1058](https://github.com/owncloud/android/pull/1058) "add sort to UploadFileActiviy" merged +- PR [#1168](https://github.com/owncloud/android/pull/1168) "Avoid duplicate files" merged +- PR [#1176](https://github.com/owncloud/android/pull/1176) "Multi select" merged + + +# 2015-10-26 +- start of branch +- PR [#745](https://github.com/owncloud/android/pull/745) merged +- PR [#1044](https://github.com/owncloud/android/pull/1044) merged: < 8.1: GalleryPlus app needed, >= 8.2 Gallery app needed +- PR [#1111](https://github.com/owncloud/android/pull/1111) merged \ No newline at end of file diff --git a/README.md b/README.md index 1fc54a10826..6958fe49c6b 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,27 @@ -# [ownCloud](https://owncloud.org) Android app -[![](https://owncloud.org/wp-content/themes/owncloudorgnew/assets/img/clients/buttons/googleplay.png)](https://play.google.com/store/apps/details?id=com.owncloud.android) +#This is the BETA Android client for [ownCloud][0] -[![](https://lh3.googleusercontent.com/dJv5wNQ-_pm8QR25lbcwrSAJ_8TPDlk4z9B5CADN40A9KWWoDmGuchK3rMkKthBBTw=h500)](https://play.google.com/store/apps/details?id=com.owncloud.android) [![](https://lh3.googleusercontent.com/v8I1GBePMpg-68TTTcal2LrNLHK1dmKWULxpNgZyGPu0LpXkbUWZooKiLrw331z9Q-c=h500)](https://play.google.com/store/apps/details?id=com.owncloud.android) [![](https://lh3.googleusercontent.com/NsSPoFha6hqyukQKAKSZWPNo_vt6gshMBlHjnlpowUCHO8-ZLjeslPh82nAttoA-Au8=h500)](https://play.google.com/store/apps/details?id=com.owncloud.android) +The BETA app is only intended to be used by experienced users that want to use and test the latest features. +All pull requests labeled "3 - to review" or higher will be included into the branch. + +If you find a bug please verify first if it is *really* a bug in beta, then comment in the corresponding pull request or create a new issue with the prefix "Beta YYYY-MM-DD:". + +The compiled APKs can be found [here][2] -## Join development! +The changelog is found [here][3] + +[![](https://lh3.googleusercontent.com/dJv5wNQ-_pm8QR25lbcwrSAJ_8TPDlk4z9B5CADN40A9KWWoDmGuchK3rMkKthBBTw=h500)](https://play.google.com/store/apps/details?id=com.owncloud.android) [![](https://lh3.googleusercontent.com/v8I1GBePMpg-68TTTcal2LrNLHK1dmKWULxpNgZyGPu0LpXkbUWZooKiLrw331z9Q-c=h500)](https://play.google.com/store/apps/details?id=com.owncloud.android) [![](https://lh3.googleusercontent.com/NsSPoFha6hqyukQKAKSZWPNo_vt6gshMBlHjnlpowUCHO8-ZLjeslPh82nAttoA-Au8=h500)](https://play.google.com/store/apps/details?id=com.owncloud.android) -**Build status:** master ![](https://api.travis-ci.org/owncloud/android.svg?branch=master) stable ![](https://api.travis-ci.org/owncloud/android.svg?branch=stable) +## Build Status on +Git beta: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=beta) **Start contributing:** Make sure you read [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) when you start working on this project. Basically: Fork this repository and contribute back using pull requests to the master branch. Easy starting points are also reviewing [pull requests](https://github.com/owncloud/android/pulls) and working on [junior jobs](https://github.com/owncloud/android/issues?q=is%3Aopen+is%3Aissue+label%3A%22Junior+Job%22). **IRC channel:** [#owncloud-android](https://webchat.freenode.net/?channels=owncloud-android) on freenode IRC -**Beta version** [beta version](https://github.com/owncloud/android/raw/beta/apks/latest.apk) +[0]: https://github.com/owncloud/core +[1]: https://github.com/owncloud/android/blob/master/SETUP.md +[2]: https://github.com/owncloud/android/tree/beta/apks/ +[3]: https://github.com/owncloud/android/blob/beta/CHANGELOG.md **License:** [GPLv2](https://github.com/owncloud/android/blob/master/LICENSE.txt) diff --git a/android-release.apk b/android-release.apk new file mode 100644 index 00000000000..ad7447198d9 Binary files /dev/null and b/android-release.apk differ diff --git a/apks/latest b/apks/latest new file mode 100644 index 00000000000..602e5397582 --- /dev/null +++ b/apks/latest @@ -0,0 +1 @@ +20160606 diff --git a/apks/latest.apk b/apks/latest.apk new file mode 100644 index 00000000000..375c94e09c0 Binary files /dev/null and b/apks/latest.apk differ diff --git a/apks/owncloud-beta-20160321.apk b/apks/owncloud-beta-20160321.apk new file mode 100644 index 00000000000..c98ce517c4a Binary files /dev/null and b/apks/owncloud-beta-20160321.apk differ diff --git a/apks/owncloud-beta-20160410.apk b/apks/owncloud-beta-20160410.apk new file mode 100644 index 00000000000..936baf6b0f6 Binary files /dev/null and b/apks/owncloud-beta-20160410.apk differ diff --git a/apks/owncloud-beta-20160419.apk b/apks/owncloud-beta-20160419.apk new file mode 100644 index 00000000000..9ae6a77ea1f Binary files /dev/null and b/apks/owncloud-beta-20160419.apk differ diff --git a/apks/owncloud-beta-20160427.apk b/apks/owncloud-beta-20160427.apk new file mode 100644 index 00000000000..03339a7271e Binary files /dev/null and b/apks/owncloud-beta-20160427.apk differ diff --git a/apks/owncloud-beta-20160606.apk b/apks/owncloud-beta-20160606.apk new file mode 100644 index 00000000000..375c94e09c0 Binary files /dev/null and b/apks/owncloud-beta-20160606.apk differ diff --git a/build.gradle b/build.gradle index 20cadd08277..97d835e86c7 100644 --- a/build.gradle +++ b/build.gradle @@ -71,12 +71,16 @@ android { buildToolsVersion "23.0.3" defaultConfig { - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - // arguments to be passed to functional tests - testInstrumentationRunnerArgument "TEST_USER", "\"$System.env.OCTEST_APP_USERNAME\"" - testInstrumentationRunnerArgument "TEST_PASSWORD", "\"$System.env.OCTEST_APP_PASSWORD\"" - testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\"" +// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" +// +// // arguments to be passed to functional tests +// testInstrumentationRunnerArgument "TEST_USER", "\"$System.env.OCTEST_APP_USERNAME\"" +// testInstrumentationRunnerArgument "TEST_PASSWORD", "\"$System.env.OCTEST_APP_PASSWORD\"" +// testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\"" + + applicationId "com.owncloud.android.beta" + versionCode 20160606 + versionName "20160606" } // adapt structure from Eclipse to Gradle/Android Studio expectations; @@ -123,4 +127,19 @@ android { exclude 'META-INF/LICENSE.txt' } -} \ No newline at end of file + signingConfigs { + release { + storeFile file(RELEASE_STORE_FILE) + storePassword RELEASE_STORE_PASSWORD + keyAlias RELEASE_KEY_ALIAS + keyPassword RELEASE_KEY_PASSWORD + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + } + } + +} diff --git a/libs/org.apache.http.legacy.jar b/libs/org.apache.http.legacy.jar new file mode 100644 index 00000000000..3705bf1a42e Binary files /dev/null and b/libs/org.apache.http.legacy.jar differ diff --git a/owncloud-android-library b/owncloud-android-library index 785562038e5..005db63786e 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 785562038e5b2c9847e8eb5f550065d05fd8137c +Subproject commit 005db63786e0a9c7ac4c189eb8711d0632e99b7e diff --git a/res/drawable-hdpi/ic_account_plus.png b/res/drawable-hdpi/ic_account_plus.png new file mode 100644 index 00000000000..f3fc7aa18e8 Binary files /dev/null and b/res/drawable-hdpi/ic_account_plus.png differ diff --git a/res/drawable-hdpi/ic_action_download_grey.png b/res/drawable-hdpi/ic_action_download_grey.png new file mode 100644 index 00000000000..4ac1e261c0c Binary files /dev/null and b/res/drawable-hdpi/ic_action_download_grey.png differ diff --git a/res/drawable-hdpi/ic_copy.png b/res/drawable-hdpi/ic_copy.png new file mode 100644 index 00000000000..5c63970adb1 Binary files /dev/null and b/res/drawable-hdpi/ic_copy.png differ diff --git a/res/drawable-hdpi/ic_delete.png b/res/drawable-hdpi/ic_delete.png new file mode 100644 index 00000000000..1e937c87759 Binary files /dev/null and b/res/drawable-hdpi/ic_delete.png differ diff --git a/res/drawable-hdpi/ic_down.png b/res/drawable-hdpi/ic_down.png new file mode 100644 index 00000000000..5cd8ab6613d Binary files /dev/null and b/res/drawable-hdpi/ic_down.png differ diff --git a/res/drawable-hdpi/ic_export.png b/res/drawable-hdpi/ic_export.png new file mode 100644 index 00000000000..f50d417b92d Binary files /dev/null and b/res/drawable-hdpi/ic_export.png differ diff --git a/res/drawable-hdpi/ic_key.png b/res/drawable-hdpi/ic_key.png new file mode 100644 index 00000000000..73bf0c00e0e Binary files /dev/null and b/res/drawable-hdpi/ic_key.png differ diff --git a/res/drawable-hdpi/ic_pencil.png b/res/drawable-hdpi/ic_pencil.png new file mode 100644 index 00000000000..7c6a745434e Binary files /dev/null and b/res/drawable-hdpi/ic_pencil.png differ diff --git a/res/drawable-hdpi/ic_share.png b/res/drawable-hdpi/ic_share.png new file mode 100644 index 00000000000..11a9cae9c63 Binary files /dev/null and b/res/drawable-hdpi/ic_share.png differ diff --git a/res/drawable-hdpi/ic_up.png b/res/drawable-hdpi/ic_up.png new file mode 100644 index 00000000000..a17476a712a Binary files /dev/null and b/res/drawable-hdpi/ic_up.png differ diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png index 6fe153bb6ed..2430c9478da 100644 Binary files a/res/drawable-hdpi/icon.png and b/res/drawable-hdpi/icon.png differ diff --git a/res/drawable-hdpi/view_play.png b/res/drawable-hdpi/view_play.png new file mode 100644 index 00000000000..53717245fed Binary files /dev/null and b/res/drawable-hdpi/view_play.png differ diff --git a/res/drawable-mdpi/ic_account_plus.png b/res/drawable-mdpi/ic_account_plus.png new file mode 100644 index 00000000000..8db5d3198a0 Binary files /dev/null and b/res/drawable-mdpi/ic_account_plus.png differ diff --git a/res/drawable-mdpi/ic_action_download_grey.png b/res/drawable-mdpi/ic_action_download_grey.png new file mode 100644 index 00000000000..29103c54f98 Binary files /dev/null and b/res/drawable-mdpi/ic_action_download_grey.png differ diff --git a/res/drawable-mdpi/ic_copy.png b/res/drawable-mdpi/ic_copy.png new file mode 100644 index 00000000000..afd28ddd4a3 Binary files /dev/null and b/res/drawable-mdpi/ic_copy.png differ diff --git a/res/drawable-mdpi/ic_delete.png b/res/drawable-mdpi/ic_delete.png new file mode 100644 index 00000000000..9b0e2dbd298 Binary files /dev/null and b/res/drawable-mdpi/ic_delete.png differ diff --git a/res/drawable-mdpi/ic_down.png b/res/drawable-mdpi/ic_down.png new file mode 100644 index 00000000000..23d8de81070 Binary files /dev/null and b/res/drawable-mdpi/ic_down.png differ diff --git a/res/drawable-mdpi/ic_export.png b/res/drawable-mdpi/ic_export.png new file mode 100644 index 00000000000..55b9b4f8b81 Binary files /dev/null and b/res/drawable-mdpi/ic_export.png differ diff --git a/res/drawable-mdpi/ic_key.png b/res/drawable-mdpi/ic_key.png new file mode 100644 index 00000000000..dcf345be5d7 Binary files /dev/null and b/res/drawable-mdpi/ic_key.png differ diff --git a/res/drawable-mdpi/ic_pencil.png b/res/drawable-mdpi/ic_pencil.png new file mode 100644 index 00000000000..7c6a745434e Binary files /dev/null and b/res/drawable-mdpi/ic_pencil.png differ diff --git a/res/drawable-mdpi/ic_share.png b/res/drawable-mdpi/ic_share.png new file mode 100644 index 00000000000..1cafd21351a Binary files /dev/null and b/res/drawable-mdpi/ic_share.png differ diff --git a/res/drawable-mdpi/ic_up.png b/res/drawable-mdpi/ic_up.png new file mode 100644 index 00000000000..b932a12a9d0 Binary files /dev/null and b/res/drawable-mdpi/ic_up.png differ diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png index 9008b9d332e..2d7ab660536 100644 Binary files a/res/drawable-mdpi/icon.png and b/res/drawable-mdpi/icon.png differ diff --git a/res/drawable-mdpi/view_play.png b/res/drawable-mdpi/view_play.png new file mode 100644 index 00000000000..77b202725e1 Binary files /dev/null and b/res/drawable-mdpi/view_play.png differ diff --git a/res/drawable-xhdpi/ic_account_plus.png b/res/drawable-xhdpi/ic_account_plus.png new file mode 100644 index 00000000000..b4319c352e9 Binary files /dev/null and b/res/drawable-xhdpi/ic_account_plus.png differ diff --git a/res/drawable-xhdpi/ic_action_download_grey.png b/res/drawable-xhdpi/ic_action_download_grey.png new file mode 100644 index 00000000000..29103c54f98 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_download_grey.png differ diff --git a/res/drawable-xhdpi/ic_action_settings.png b/res/drawable-xhdpi/ic_action_settings.png new file mode 100644 index 00000000000..a19fc5c312e Binary files /dev/null and b/res/drawable-xhdpi/ic_action_settings.png differ diff --git a/res/drawable-xhdpi/ic_copy.png b/res/drawable-xhdpi/ic_copy.png new file mode 100644 index 00000000000..afd28ddd4a3 Binary files /dev/null and b/res/drawable-xhdpi/ic_copy.png differ diff --git a/res/drawable-xhdpi/ic_delete.png b/res/drawable-xhdpi/ic_delete.png new file mode 100644 index 00000000000..9b0e2dbd298 Binary files /dev/null and b/res/drawable-xhdpi/ic_delete.png differ diff --git a/res/drawable-xhdpi/ic_down.png b/res/drawable-xhdpi/ic_down.png new file mode 100644 index 00000000000..efc69c4a51a Binary files /dev/null and b/res/drawable-xhdpi/ic_down.png differ diff --git a/res/drawable-xhdpi/ic_export.png b/res/drawable-xhdpi/ic_export.png new file mode 100644 index 00000000000..55b9b4f8b81 Binary files /dev/null and b/res/drawable-xhdpi/ic_export.png differ diff --git a/res/drawable-xhdpi/ic_key.png b/res/drawable-xhdpi/ic_key.png new file mode 100644 index 00000000000..8b44a818160 Binary files /dev/null and b/res/drawable-xhdpi/ic_key.png differ diff --git a/res/drawable-xhdpi/ic_pencil.png b/res/drawable-xhdpi/ic_pencil.png new file mode 100644 index 00000000000..7c6a745434e Binary files /dev/null and b/res/drawable-xhdpi/ic_pencil.png differ diff --git a/res/drawable-xhdpi/ic_share.png b/res/drawable-xhdpi/ic_share.png new file mode 100644 index 00000000000..1cafd21351a Binary files /dev/null and b/res/drawable-xhdpi/ic_share.png differ diff --git a/res/drawable-xhdpi/ic_up.png b/res/drawable-xhdpi/ic_up.png new file mode 100644 index 00000000000..c2a8163d51c Binary files /dev/null and b/res/drawable-xhdpi/ic_up.png differ diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png index 041efc6b473..a135cc269e8 100644 Binary files a/res/drawable-xhdpi/icon.png and b/res/drawable-xhdpi/icon.png differ diff --git a/res/drawable-xhdpi/view_play.png b/res/drawable-xhdpi/view_play.png new file mode 100644 index 00000000000..8482788e88e Binary files /dev/null and b/res/drawable-xhdpi/view_play.png differ diff --git a/res/drawable-xxhdpi/ic_account_plus.png b/res/drawable-xxhdpi/ic_account_plus.png new file mode 100644 index 00000000000..ba4edbd0545 Binary files /dev/null and b/res/drawable-xxhdpi/ic_account_plus.png differ diff --git a/res/drawable-xxhdpi/ic_action_download_grey.png b/res/drawable-xxhdpi/ic_action_download_grey.png new file mode 100644 index 00000000000..c4d0b0ce37a Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_download_grey.png differ diff --git a/res/drawable-xxhdpi/ic_settings.png b/res/drawable-xxhdpi/ic_action_settings.png similarity index 100% rename from res/drawable-xxhdpi/ic_settings.png rename to res/drawable-xxhdpi/ic_action_settings.png diff --git a/res/drawable-xxhdpi/ic_copy.png b/res/drawable-xxhdpi/ic_copy.png new file mode 100644 index 00000000000..c170a270d0c Binary files /dev/null and b/res/drawable-xxhdpi/ic_copy.png differ diff --git a/res/drawable-xxhdpi/ic_delete.png b/res/drawable-xxhdpi/ic_delete.png new file mode 100644 index 00000000000..21287cbd0e6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_delete.png differ diff --git a/res/drawable-xxhdpi/ic_down.png b/res/drawable-xxhdpi/ic_down.png new file mode 100644 index 00000000000..cacbf3e5162 Binary files /dev/null and b/res/drawable-xxhdpi/ic_down.png differ diff --git a/res/drawable-xxhdpi/ic_export.png b/res/drawable-xxhdpi/ic_export.png new file mode 100644 index 00000000000..4d22a273592 Binary files /dev/null and b/res/drawable-xxhdpi/ic_export.png differ diff --git a/res/drawable-xxhdpi/ic_key.png b/res/drawable-xxhdpi/ic_key.png new file mode 100644 index 00000000000..27f889e984c Binary files /dev/null and b/res/drawable-xxhdpi/ic_key.png differ diff --git a/res/drawable-xxhdpi/ic_pencil.png b/res/drawable-xxhdpi/ic_pencil.png new file mode 100644 index 00000000000..2beb2b4279e Binary files /dev/null and b/res/drawable-xxhdpi/ic_pencil.png differ diff --git a/res/drawable-xxhdpi/ic_share.png b/res/drawable-xxhdpi/ic_share.png new file mode 100644 index 00000000000..0c460c479db Binary files /dev/null and b/res/drawable-xxhdpi/ic_share.png differ diff --git a/res/drawable-xxhdpi/ic_up.png b/res/drawable-xxhdpi/ic_up.png new file mode 100644 index 00000000000..f35d9fc95dc Binary files /dev/null and b/res/drawable-xxhdpi/ic_up.png differ diff --git a/res/drawable-xxhdpi/icon.png b/res/drawable-xxhdpi/icon.png new file mode 100644 index 00000000000..ad0fd25fb6e Binary files /dev/null and b/res/drawable-xxhdpi/icon.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png index 2444d8361bd..c0102e66b41 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png index 35ca0a76270..9a05a95a35b 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png index 94b63b5ca06..e16be25c8f2 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png index efe4948de02..39eec04f9b5 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png index e91efc5e7bd..d028289d17f 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png index 815d093b2d1..d6f4f947543 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png index c78647de59b..0a5db16c4ba 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png differ diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png index 1edad5a7037..a6111c305e1 100644 Binary files a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png differ diff --git a/res/drawable-xxhdpi/view_play.png b/res/drawable-xxhdpi/view_play.png new file mode 100644 index 00000000000..fea738b98da Binary files /dev/null and b/res/drawable-xxhdpi/view_play.png differ diff --git a/res/drawable-xxxhdpi/icon.png b/res/drawable-xxxhdpi/icon.png new file mode 100644 index 00000000000..c0ec25c1ae5 Binary files /dev/null and b/res/drawable-xxxhdpi/icon.png differ diff --git a/res/drawable-xxxhdpi/view_play.png b/res/drawable-xxxhdpi/view_play.png new file mode 100644 index 00000000000..3786b4d0b9a Binary files /dev/null and b/res/drawable-xxxhdpi/view_play.png differ diff --git a/res/drawable/actionbar_progress_horizontal.xml b/res/drawable/actionbar_progress_horizontal.xml index 6c3c0f184d2..3a5e78ea994 100644 --- a/res/drawable/actionbar_progress_horizontal.xml +++ b/res/drawable/actionbar_progress_horizontal.xml @@ -4,15 +4,15 @@ + android:drawable="@color/primary" /> diff --git a/res/drawable/select_all.png b/res/drawable/select_all.png new file mode 100644 index 00000000000..10f4f80a46e Binary files /dev/null and b/res/drawable/select_all.png differ diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml index 68757cef023..8014fecf50b 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -18,10 +18,10 @@ along with this program. If not, see . --> - - + + - - - - - - + /> + + + + + + - - + + - - + + - + - + + /> + + + + + + - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml new file mode 100644 index 00000000000..9094173a688 --- /dev/null +++ b/res/layout/account_item.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml index 5a808b899a6..57d0c7aacfb 100644 --- a/res/layout/account_setup.xml +++ b/res/layout/account_setup.xml @@ -85,7 +85,8 @@ android:textColor="@color/login_text_color" android:textColorHint="@color/login_text_hint_color" android:contentDescription="@string/auth_host_address" - > + android:autoLink="web" + android:clickable="true"> + android:contentDescription="@string/auth_testing_connection" + android:autoLink="web" + /> + + + + + + + + + diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml index 9360db0ec52..843a1ebdf3d 100644 --- a/res/layout/drawer.xml +++ b/res/layout/drawer.xml @@ -16,88 +16,17 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:theme="@style/NavigationView_ItemTextAppearance" + app:headerLayout="@layout/drawer_header" + app:menu="@menu/drawer_menu"/> - - - \ No newline at end of file diff --git a/res/layout/drawer_account_group.xml b/res/layout/drawer_account_group.xml deleted file mode 100644 index 85a1c753c67..00000000000 --- a/res/layout/drawer_account_group.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - \ No newline at end of file diff --git a/res/layout/drawer_header.xml b/res/layout/drawer_header.xml new file mode 100644 index 00000000000..1b573d63335 --- /dev/null +++ b/res/layout/drawer_header.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml deleted file mode 100644 index 25415accfe5..00000000000 --- a/res/layout/drawer_list_item.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - diff --git a/res/layout/error_send.xml b/res/layout/error_send.xml new file mode 100644 index 00000000000..7a80166b87e --- /dev/null +++ b/res/layout/error_send.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + +