diff --git a/.gitignore b/.gitignore index 0d18cdf6bb3a..286efb42c731 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ # built application files -*.apk -*.ap_ # files for the dex VM *.dex diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e8c1a2842147..bdaadec0f16c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,8 +20,8 @@ --> + android:versionCode="20170213" + android:versionName="20170213" > = 23; the app needs to handle this --> + @@ -55,17 +56,19 @@ + @@ -74,6 +77,7 @@ + @@ -81,6 +85,7 @@ android:taskAffinity="" android:excludeFromRecents="true" + android:label="Nextcloud beta" android:theme="@style/Theme.ownCloud.NoActionBar"> @@ -102,7 +107,7 @@ android:theme="@style/Theme.ownCloud.Overlay" /> @@ -171,6 +176,12 @@ android:resource="@xml/exposed_filepaths" /> + + + + - + + - + @@ -250,16 +263,16 @@ + android:label="Copy link" /> + android:label="Nextcloud beta" /> + android:label="Nextcloud beta" /> @@ -270,7 +283,7 @@ android:resource="@xml/users_and_groups_searchable"/> diff --git a/CHANGELOG.md b/CHANGELOG.md index 508db35489a9..0d5d53230d96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,79 +1,195 @@ -## 1.4.1 (January 27, 2017) -- Share URLs to Nextcloud -- Improve performance of Auto Upload view -- Fix for removing files -- Proper email sharee handling -- Navigation drawer: Fix lag on older devices -- Android 7: Pending jobs in upload view -- Android 7: Auto upload: ignore ".tmp" files and folders -- Bugfixes and design improvements - -## 1.4.0 (December 8, 2016) - -- External SD card support -- Auto Upload (Android 7+) -- What's new start screen -- Show/hide hidden folders & files -- Upload view: switch between grid/list view -- Descend into folder after creating it in uploader -- Provisioning links to launch and prefill app with login data -- Add open URL file feature -- Sort favorite files first in list -- Account switcher optimizations -- Bugfixes and design improvements -- Update library to 1.0.9 - -## 1.3.1 (September 20, 2016) - -- Move action hard to discover - difference between single/multi selection -- Show move/copy context in toolbar title -- Share file with dictadroid to Nextcloud -- Don't show upload failure notification for already deleted files - -## 1.3.0 (September 17, 2016) - -- Files drop permission in share viewe -- Display quota if configured/available in navigation drawer -- Resume chunked uploads instead of complete restarts -- Filter remote and local file lists -- Simple integration with DAVdroid for calender and contacts sync -- Mix folders and files on sort by date -- Upload when charging option -- Revamp upload options Move/Copy/Just-Upload -- Text can be selected and shared to Nextcloud -- Respect metered wifi and block instant uploads -- Proper handling of .djvu files -- Bugfixes and design improvements - -## 1.2.0 (July 29, 2016) - -- Multi select capabilities -- Confirmation dialog on account removal -- Offline available filter in main menu -- Sorting capability when choosing files to be uploaded -- Video thumbnails if activated on server -- Thumbnails during upload -- Fixed user agent for file firewalling -- Showing server side folder sizes -- Text in test preview can now be selected -- Search suggestions fixed for user/group search during sharing -- Minor bugfixes - -## 1.1.0 (July 6, 2016) - -- New main menu to switch accounts easily -- Ability to open Nextcloud hosted files (read-only) from other apps that support the standard file chooser (requires Android 4.4 / KitKat or higher) -- "Select all files" for upload within a folder -- Optional feature to auto-create monthly folders for your instant uploads -- Revamped login screen -- Minor bugfixes - -## 1.0.1 (June 20, 2016) - -- Fix thumbnail preview support for new files -- Add support for animated GIFs -- Optimized uploader layout - -## 1.0.0 (June 12, 2016) - -- Initial release of the Nextcloud Android app +## 2017-02-13 + +-Beta branch was updated successfully] updated + +## 2017-02-13 + +-Beta branch was updated successfully] updated +- Master (nextcloud/master) [https://github.com/nextcloud/android] updated + +## 2017-02-13 +- Fix for #448. Rotation change in FolderPicker caused app crash. (carstendev/rotation-crash-fix) [https://github.com/nextcloud/android/pull/649] added + +- Fix for #448. Rotation change in FolderPicker caused app crash. (carstendev/rotation-crash-fix) [https://github.com/nextcloud/android/pull/649] updated +- New sorting order dialog (nextcloud/newSortingLayout) [https://github.com/nextcloud/android/pull/575] updated + +## 2017-02-12 + + +## 2017-02-11 + +-Beta branch was updated successfully] updated + +## 2017-02-11 + +-Beta branch was updated successfully] updated + +## 2017-02-11 + + +## 2017-02-10 +- Fix file modification date on upload (nextcloud/fix_file_modification_date_on_upload) [https://github.com/nextcloud/android/pull/451] added + +-Beta branch was updated successfully] updated +- Fix file modification date on upload (nextcloud/fix_file_modification_date_on_upload) [https://github.com/nextcloud/android/pull/451] updated + +## 2017-02-09 + +-Beta branch was updated successfully] updated + +## 2017-02-08 + +-Beta branch was updated successfully] updated + +## 2017-02-07 + +-Beta branch was updated successfully] updated + +## 2017-02-06 + +- New sorting order dialog (nextcloud/newSortingLayout) [https://github.com/nextcloud/android/pull/575] updated + +## 2017-02-05 + +- Master (nextcloud/master) [https://github.com/nextcloud/android] updated + +## 2017-02-04 +- Master (nextcloud/master) [https://github.com/nextcloud/android] added + +-Beta branch was updated successfully] updated +- Master (nextcloud/master) [https://github.com/nextcloud/android] updated + +## 2017-02-03 + + +## 2017-02-02 + +-Beta branch was updated successfully] updated + +## 2017-01-30 +- New sorting order dialog (nextcloud/newSortingLayout) [https://api.github.com/repos/nextcloud/android/pulls/575] added +- Properly encode the share link password (nextcloud/encodeShareLinkPassword) [https://api.github.com/repos/nextcloud/android/pulls/510] added +- New sorting order dialog (nextcloud/newSortingLayout) [https://api.github.com/repos/nextcloud/android/pulls/575] updated +- Properly encode the share link password (nextcloud/encodeShareLinkPassword) [https://api.github.com/repos/nextcloud/android/pulls/510] updated +- Fix DavDroid integration append necessary addition to mURI (justin-sleep/upstream) [https://api.github.com/repos/nextcloud/android/pulls/401] updated + +## 2017-01-22 +- prevent NoClassDefFound #547 + +## 2017-01-17 +- Fix quota display #544 + +## 2017-01-10 +- Fix NPE an improve performance of Auto Upload view #530 + +## 2016-12-31 +- Proper email sharee handling #492 +- Disable handling broadcast on Nougat and better #488 +- Pending jobs in upload view #487 +- Ignore files ending with ".tmp" #485 +- Fixed removing files #473 #479 +- Auto upload: delay job, check file #472 +- Auto upload: only files, no folders #469 + +## 2016-12-22 +- Add upload URL file feature #327 + +## 2016-12-15 +- Minor Usability improvements #449 +- Fix file modification date on upload #451 + +## 2016-11-22 +- Updated federated sharing edit options #395 + +## 2016-11-08 +- Streaming #183 + +## 2016-10-26 +- New Instant Upload (Android 5+) #358 + +## 2016-10-19 +- Fix user info route (https://github.com/nextcloud/android-library/pull/21) +- Begin debug logs when build type is debug #335 +- Account switcher optimizations #326 +- Fix TimSort #339 +- add preference to show hidden files #328 +- tune grid view of images #316 +- add grid view option when choosing a file from within the app #301 + +## 2016-10-06 +- put cursor close in finally block to make sure no resource leak occurrs #306 +- change wordings for davdroid integration #293 +- added logging to gain information about upload issues +- Sorts favourite files first in list #302 +- Add open URL file feature #298 +- fix remove failed #241 +- Crash when sending non-existing log #284 +- Fix NPE in ExpandableUploadListAdapter...setText #290 +- change wordings for davdroid integration #293 +- Fix NullPointerException in PreviewMediaFragment. #295 + +## 2016-09-26 +- update fix crash in dismissLoadingDialog #279 +- fix crash when sending non-existing log #284 + +## 2016-09-22 +- update to latest 1.3.1 functionality +- updated What's new #84 +- fix crash in dismissLoadingDialog #279 +- Provisioning Links to launch and prefill app with login data #248 +- fix remove failed #241 + +## 2016-09-18 +- update to latest 1.3.0 functionality +- change caption for move and copy action #265 + +## 2016-09-15 +- update to latest 1.3.0 RC2 functionality +- What's new #84 + +## 2016-09-07 +- update Motivate more users #239 +- DAVdroid login screen prefilled launch #236 + +## 2016-09-04 +- descend into folder after creating it in uploader #206 +- Motivate more users #239 + +## 2016-09-03 +- Display quota if configured/available in navigation drawer #204 +- bugfix for empty folder display #229 +- Update Toolchain/Android-Target to v24 #214 +- Restore display of remote folder size #235 + +## 2016-08-08 +- update all PR +- search for the right ocShare with public link #197 +- Fix comparator determining order of list of uploads #199 +- generate thumbnails only if mCurrentUpload is not null #205 + +## 2016-07-31 +- External SD support #92 +- move / copy updated #178 +- prevents NPE when selecting empty local folder #180 + +## 2016-07-30 +- Upload when charging #171 + +## 2016-07-28 +Fresh start on current master with these PRs: +- Resized images #69 +- Instant upload in the context of multi account support #98 +- mix folders and files on sort by date #135 +- Files drop #141 +- Receive text file #142 +- Pinch zoom #143 +- Resize cache #144 +- filter for oc file list and local file list #152 +- djvu is not an image #153 +- delay instant upload when metered wifi is used #161 +- rename instant upload path #162 +- Refresh when app starts #166 +- Disable suggestions in password field #167 +- resume chunked uploads #168 + +From now on every new PR with "3. to review" will be merged to beta and published diff --git a/LICENSE.txt b/LICENSE.txt index 4fc88098775c..e411f93d6d51 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -336,3 +336,5 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + + diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index 426a4f46bd45..12dd17aee9bc 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -2,7 +2,7 @@ Nextcloud Android client Copyright (C) 2016 Nextcloud Project - Copyright (C) 2012-2016 ownCloud Inc. + Copyright (C) 2012-2016 ownCloud GmbH Copyright (C) 2012 Bartek Przybylski ################################################################### @@ -37,24 +37,22 @@ that govern this software, for the purposes they are being used. The third party software included and used by this project is: - * Apache JackRabbit, version 2.2.5. - Copyright (C) 2004-2010 The Apache Software Foundation. + * Apache JackRabbit 2.12.4. + Copyright (C) 2004-2016 The Apache Software Foundation. Licensed under Apache License, Version 2.0. - Placed at libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar - The jar file must be included in the ownCloud client APK. - Original license document included at libs/LICENSE.txt + The jar file must be included in the Nextcloud client APK. See http://jackrabbit.apache.org/ * Transifex client. Copyright (C) Transifex. Licensed under GNU General Public License. Placed at third_party/transifex-client. - Used as a helper tool, not included in the ownCloud client APK. + Used as a helper tool, not included in the Nextcloud client APK. Original license document included at third_party/transifex-client/LICENSE. See http://help.transifex.com/features/client/ - * TouchImageView, commit 6dbeac4f11936185ba374c73144ac431c23c9aab - Copyright (c) 2012 Michael Ortiz + * TouchImageView, 1.2.0. commit 6dbeac4f11936185ba374c73144ac431c23c9aab + Copyright (c) 2014 Michael Ortiz Licensed under MIT License JAR file libs/touch-image-view.jar has been generated by ownCloud Inc., including without modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes. @@ -63,5 +61,19 @@ The third party software included and used by this project is: * floatingactionbutton 1.10.1. Copyright (c) 2014 Jerzy Chalupski Licensed under Apache License, Version 2.0. - placed at libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar has been exploded by ownCloud Inc. - See https://github.com/futuresimple/android-floating-action-button \ No newline at end of file + The jar file must be included in the Nextcloud client APK. + See https://github.com/futuresimple/android-floating-action-button + + * AndroidSVG 1.2.1. + Copyright (c) 2014 Paul LeBeau + Licensed under Apache License, Version 2.0. + placed at libs/androidsvg-1.2.1.jar + The jar file must be included in the Nextcloud client APK. + See https://github.com/BigBadaboom/androidsvg + + * Disk LRU Cache 2.0.2. + Copyright (c) 2013 Jake Wharton + Licensed under Apache License, Version 2.0. + placed at libs/disklrucache-2.0.2.jar + The jar file must be included in the Nextcloud client APK. + See https://github.com/JakeWharton/DiskLruCache \ No newline at end of file diff --git a/apks/latest b/apks/latest new file mode 100644 index 000000000000..4a9af0995cef --- /dev/null +++ b/apks/latest @@ -0,0 +1 @@ +20170213 diff --git a/apks/latest.apk b/apks/latest.apk new file mode 100644 index 000000000000..925cdba6a671 Binary files /dev/null and b/apks/latest.apk differ diff --git a/apks/nextcloud-beta-20170207.apk b/apks/nextcloud-beta-20170207.apk new file mode 100644 index 000000000000..5d900d10204b Binary files /dev/null and b/apks/nextcloud-beta-20170207.apk differ diff --git a/apks/nextcloud-beta-20170208.apk b/apks/nextcloud-beta-20170208.apk new file mode 100644 index 000000000000..662017c6e5bd Binary files /dev/null and b/apks/nextcloud-beta-20170208.apk differ diff --git a/apks/nextcloud-beta-20170209.apk b/apks/nextcloud-beta-20170209.apk new file mode 100644 index 000000000000..eb6c632b1671 Binary files /dev/null and b/apks/nextcloud-beta-20170209.apk differ diff --git a/apks/nextcloud-beta-20170211.apk b/apks/nextcloud-beta-20170211.apk new file mode 100644 index 000000000000..db0e98e3ead9 Binary files /dev/null and b/apks/nextcloud-beta-20170211.apk differ diff --git a/apks/nextcloud-beta-20170213.apk b/apks/nextcloud-beta-20170213.apk new file mode 100644 index 000000000000..925cdba6a671 Binary files /dev/null and b/apks/nextcloud-beta-20170213.apk differ diff --git a/betaUpdateStatus b/betaUpdateStatus new file mode 100644 index 000000000000..545f218f6c68 --- /dev/null +++ b/betaUpdateStatus @@ -0,0 +1,17 @@ +2017-02-13 +Branches: 14 +Beta branch was updated successfully +[01 / 14] Fix for #448. Rotation change in FolderPicker caused app crash. (carstendev/rotation-crash-fix) [https://github.com/nextcloud/android/pull/649] no update needed +[02 / 14] Added fingerprint support (Flole998/master) [https://github.com/nextcloud/android/pull/624] no update needed +[03 / 14] Rewrite auto upload (nextcloud/rewrite-auto-upload) [https://github.com/nextcloud/android/pull/615] no update needed +[04 / 14] Feature user information (nextcloud/feature-user-information) [https://github.com/nextcloud/android/pull/585] CONFLICT +[05 / 14] New sorting order dialog (nextcloud/newSortingLayout) [https://github.com/nextcloud/android/pull/575] no update needed +[06 / 14] Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] CONFLICT +[07 / 14] show SVG images (nextcloud/svgView) [https://github.com/nextcloud/android/pull/465] CONFLICT +[08 / 14] Fix file modification date on upload (nextcloud/fix_file_modification_date_on_upload) [https://github.com/nextcloud/android/pull/451] CONFLICT +[09 / 14] Updated federated sharing edit options (nextcloud/federated_sharing_edit_options) [https://github.com/nextcloud/android/pull/395] CONFLICT +[10 / 14] Streaming (nextcloud/streaming) [https://github.com/nextcloud/android/pull/183] no update needed +[11 / 14] Resize cache (nextcloud/resizeCache) [https://github.com/nextcloud/android/pull/144] no update needed +[12 / 14] Instant upload in the context of multi account support (nextcloud/instant_upload_multi_account) [https://github.com/nextcloud/android/pull/98] no update needed +[13 / 14] Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] no update needed +[14 / 14] Master (nextcloud/master) [https://github.com/nextcloud/android] no update needed diff --git a/build.gradle b/build.gradle index 786ae6e32631..5ea82e53f053 100644 --- a/build.gradle +++ b/build.gradle @@ -37,18 +37,27 @@ repositories { } } +configurations.all { + resolutionStrategy.cacheDynamicVersionsFor 1, 'minutes' + resolutionStrategy.cacheChangingModulesFor 1, 'minutes' +} + dependencies { /// dependencies for app building compile name: 'touch-image-view' - compile 'com.github.nextcloud:android-library:1.0.11' + compile 'com.github.nextcloud:android-library:beta-SNAPSHOT' compile "com.android.support:support-v4:${supportLibraryVersion}" compile "com.android.support:design:${supportLibraryVersion}" + compile "com.android.support:cardview-v7:${supportLibraryVersion}" compile 'com.jakewharton:disklrucache:2.0.2' compile "com.android.support:appcompat-v7:${supportLibraryVersion}" compile 'com.getbase:floatingactionbutton:1.10.1' compile 'com.google.code.findbugs:annotations:2.0.1' - + compile group: 'commons-io', name: 'commons-io', version: '2.4' + compile 'com.jakewharton:butterknife:8.4.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' + compile 'com.caverock:androidsvg:1.2.1' /// dependencies for local unit tests testCompile 'junit:junit:4.12' @@ -71,8 +80,6 @@ dependencies { androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}" - - } tasks.withType(Test) { @@ -100,7 +107,14 @@ android { testInstrumentationRunnerArgument "TEST_PASSWORD", "\"$System.env.OCTEST_APP_PASSWORD\"" testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\"" - applicationId "com.nextcloud.client" + applicationId "com.nextcloud.android.beta" + versionCode 20170213 + versionName "20170213" + + // disable the experimental Jack build tools. + jackOptions { + enabled false + } } // adapt structure from Eclipse to Gradle/Android Studio expectations; @@ -139,9 +153,15 @@ android { preDexLibraries = preDexEnabled && !travisBuild } + dexOptions { + // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false. + preDexLibraries = preDexEnabled && !travisBuild + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 + incremental false } lintOptions { @@ -151,6 +171,10 @@ android { packagingOptions { exclude 'META-INF/LICENSE.txt' } + signingConfigs { + release + } + task checkstyle(type: Checkstyle) { configFile = file("${rootProject.projectDir}/checkstyle.xml") configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath @@ -202,4 +226,16 @@ android { } check.dependsOn 'checkstyle', 'findbugs', 'pmd', 'lint' + buildTypes { + release { + signingConfig signingConfigs.release + } + } } + +if (project.hasProperty('RELEASE_STORE_FILE')) { + android.signingConfigs.release.storeFile = file(RELEASE_STORE_FILE) + android.signingConfigs.release.storePassword = RELEASE_STORE_PASSWORD + android.signingConfigs.release.keyAlias = RELEASE_KEY_ALIAS + android.signingConfigs.release.keyPassword = RELEASE_KEY_PASSWORD +} \ No newline at end of file diff --git a/drawable_resources/alphabetical_asc.svg b/drawable_resources/alphabetical_asc.svg new file mode 100644 index 000000000000..bda1c3558297 --- /dev/null +++ b/drawable_resources/alphabetical_asc.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/drawable_resources/alphabetical_desc.svg b/drawable_resources/alphabetical_desc.svg new file mode 100644 index 000000000000..6b1a809fd96e --- /dev/null +++ b/drawable_resources/alphabetical_desc.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/drawable_resources/arrow-right.svg b/drawable_resources/arrow-right.svg new file mode 100644 index 000000000000..22dc52632b7d --- /dev/null +++ b/drawable_resources/arrow-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/drawable_resources/calendar.svg b/drawable_resources/calendar.svg new file mode 100644 index 000000000000..765bd26391ba --- /dev/null +++ b/drawable_resources/calendar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/drawable_resources/modification_asc.svg b/drawable_resources/modification_asc.svg new file mode 100644 index 000000000000..dffe4121bb7e --- /dev/null +++ b/drawable_resources/modification_asc.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/drawable_resources/modification_desc.svg b/drawable_resources/modification_desc.svg new file mode 100644 index 000000000000..854b670c0f13 --- /dev/null +++ b/drawable_resources/modification_desc.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/drawable_resources/size_asc.svg b/drawable_resources/size_asc.svg new file mode 100644 index 000000000000..8dc0cfca63ae --- /dev/null +++ b/drawable_resources/size_asc.svg @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/drawable_resources/size_desc.svg b/drawable_resources/size_desc.svg new file mode 100644 index 000000000000..c13f67b9a369 --- /dev/null +++ b/drawable_resources/size_desc.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/fingerprint_icon-web.png b/fingerprint_icon-web.png new file mode 100644 index 000000000000..0e6fffde3049 Binary files /dev/null and b/fingerprint_icon-web.png differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 24fae2685ac1..a7ce5ec8dc64 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Tue Aug 16 10:44:46 CEST 2016 +#Sat Sep 03 07:48:32 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/libs/androidsvg-1.2.1.jar b/libs/androidsvg-1.2.1.jar new file mode 100644 index 000000000000..1790529c05eb Binary files /dev/null and b/libs/androidsvg-1.2.1.jar differ diff --git a/mergedBranches b/mergedBranches new file mode 100644 index 000000000000..1ad872d5a95a --- /dev/null +++ b/mergedBranches @@ -0,0 +1,7 @@ +Beta branch was updated successfully +carstendev/rotation-crash-fix +justin-sleep/upstream +nextcloud/encodeShareLinkPassword +nextcloud/fix_file_modification_date_on_upload +nextcloud/master +nextcloud/newSortingLayout diff --git a/res/anim/shake.xml b/res/anim/shake.xml new file mode 100755 index 000000000000..17c8dc671603 --- /dev/null +++ b/res/anim/shake.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/anim/shake_interpolator.xml b/res/anim/shake_interpolator.xml new file mode 100755 index 000000000000..e20f1e93e58b --- /dev/null +++ b/res/anim/shake_interpolator.xml @@ -0,0 +1,6 @@ + + + diff --git a/res/drawable-hdpi/ic_alphabetical_asc.png b/res/drawable-hdpi/ic_alphabetical_asc.png new file mode 100644 index 000000000000..65fc46b3b676 Binary files /dev/null and b/res/drawable-hdpi/ic_alphabetical_asc.png differ diff --git a/res/drawable-hdpi/ic_alphabetical_desc.png b/res/drawable-hdpi/ic_alphabetical_desc.png new file mode 100644 index 000000000000..850bb1dcd996 Binary files /dev/null and b/res/drawable-hdpi/ic_alphabetical_desc.png differ diff --git a/res/drawable-hdpi/ic_map_marker.png b/res/drawable-hdpi/ic_map_marker.png new file mode 100644 index 000000000000..f66ef501e708 Binary files /dev/null and b/res/drawable-hdpi/ic_map_marker.png differ diff --git a/res/drawable-hdpi/ic_modification_asc.png b/res/drawable-hdpi/ic_modification_asc.png new file mode 100644 index 000000000000..e3f971ff65af Binary files /dev/null and b/res/drawable-hdpi/ic_modification_asc.png differ diff --git a/res/drawable-hdpi/ic_modification_desc.png b/res/drawable-hdpi/ic_modification_desc.png new file mode 100644 index 000000000000..aef28542019c Binary files /dev/null and b/res/drawable-hdpi/ic_modification_desc.png differ diff --git a/res/drawable-hdpi/ic_phone.png b/res/drawable-hdpi/ic_phone.png new file mode 100644 index 000000000000..422a44b5c727 Binary files /dev/null and b/res/drawable-hdpi/ic_phone.png differ diff --git a/res/drawable-hdpi/ic_size_asc.png b/res/drawable-hdpi/ic_size_asc.png new file mode 100644 index 000000000000..3f6a1959b2f9 Binary files /dev/null and b/res/drawable-hdpi/ic_size_asc.png differ diff --git a/res/drawable-hdpi/ic_size_desc.png b/res/drawable-hdpi/ic_size_desc.png new file mode 100644 index 000000000000..249b81d4f3d4 Binary files /dev/null and b/res/drawable-hdpi/ic_size_desc.png differ diff --git a/res/drawable-hdpi/whats_new_oc_files.png b/res/drawable-hdpi/whats_new_oc_files.png new file mode 100644 index 000000000000..dbaa2b2dd509 Binary files /dev/null and b/res/drawable-hdpi/whats_new_oc_files.png differ diff --git a/res/drawable-hdpi/whats_new_share.png b/res/drawable-hdpi/whats_new_share.png new file mode 100644 index 000000000000..35116b57e34c Binary files /dev/null and b/res/drawable-hdpi/whats_new_share.png differ diff --git a/res/drawable-mdpi/ic_alphabetical_asc.png b/res/drawable-mdpi/ic_alphabetical_asc.png new file mode 100644 index 000000000000..4593a4067572 Binary files /dev/null and b/res/drawable-mdpi/ic_alphabetical_asc.png differ diff --git a/res/drawable-mdpi/ic_alphabetical_desc.png b/res/drawable-mdpi/ic_alphabetical_desc.png new file mode 100644 index 000000000000..332e304cb50e Binary files /dev/null and b/res/drawable-mdpi/ic_alphabetical_desc.png differ diff --git a/res/drawable-mdpi/ic_map_marker.png b/res/drawable-mdpi/ic_map_marker.png new file mode 100644 index 000000000000..04f9591049ea Binary files /dev/null and b/res/drawable-mdpi/ic_map_marker.png differ diff --git a/res/drawable-mdpi/ic_modification_asc.png b/res/drawable-mdpi/ic_modification_asc.png new file mode 100644 index 000000000000..882a5fd7f7ef Binary files /dev/null and b/res/drawable-mdpi/ic_modification_asc.png differ diff --git a/res/drawable-mdpi/ic_modification_desc.png b/res/drawable-mdpi/ic_modification_desc.png new file mode 100644 index 000000000000..28241b4ca107 Binary files /dev/null and b/res/drawable-mdpi/ic_modification_desc.png differ diff --git a/res/drawable-mdpi/ic_phone.png b/res/drawable-mdpi/ic_phone.png new file mode 100644 index 000000000000..abc3cd6032b7 Binary files /dev/null and b/res/drawable-mdpi/ic_phone.png differ diff --git a/res/drawable-mdpi/ic_size_asc.png b/res/drawable-mdpi/ic_size_asc.png new file mode 100644 index 000000000000..532fd5dd2a08 Binary files /dev/null and b/res/drawable-mdpi/ic_size_asc.png differ diff --git a/res/drawable-mdpi/ic_size_desc.png b/res/drawable-mdpi/ic_size_desc.png new file mode 100644 index 000000000000..06db69c15102 Binary files /dev/null and b/res/drawable-mdpi/ic_size_desc.png differ diff --git a/res/drawable-xhdpi/ic_alphabetical_asc.png b/res/drawable-xhdpi/ic_alphabetical_asc.png new file mode 100644 index 000000000000..8b56790f6f32 Binary files /dev/null and b/res/drawable-xhdpi/ic_alphabetical_asc.png differ diff --git a/res/drawable-xhdpi/ic_alphabetical_desc.png b/res/drawable-xhdpi/ic_alphabetical_desc.png new file mode 100644 index 000000000000..beec3260392a Binary files /dev/null and b/res/drawable-xhdpi/ic_alphabetical_desc.png differ diff --git a/res/drawable-xhdpi/ic_map_marker.png b/res/drawable-xhdpi/ic_map_marker.png new file mode 100644 index 000000000000..5d8b6ebf650b Binary files /dev/null and b/res/drawable-xhdpi/ic_map_marker.png differ diff --git a/res/drawable-xhdpi/ic_modification_asc.png b/res/drawable-xhdpi/ic_modification_asc.png new file mode 100644 index 000000000000..91ad2e4434b3 Binary files /dev/null and b/res/drawable-xhdpi/ic_modification_asc.png differ diff --git a/res/drawable-xhdpi/ic_modification_desc.png b/res/drawable-xhdpi/ic_modification_desc.png new file mode 100644 index 000000000000..88a0dcf98950 Binary files /dev/null and b/res/drawable-xhdpi/ic_modification_desc.png differ diff --git a/res/drawable-xhdpi/ic_phone.png b/res/drawable-xhdpi/ic_phone.png new file mode 100644 index 000000000000..1b0268be5b99 Binary files /dev/null and b/res/drawable-xhdpi/ic_phone.png differ diff --git a/res/drawable-xhdpi/ic_size_asc.png b/res/drawable-xhdpi/ic_size_asc.png new file mode 100644 index 000000000000..3539b84d75c1 Binary files /dev/null and b/res/drawable-xhdpi/ic_size_asc.png differ diff --git a/res/drawable-xhdpi/ic_size_desc.png b/res/drawable-xhdpi/ic_size_desc.png new file mode 100644 index 000000000000..608a57efb7b1 Binary files /dev/null and b/res/drawable-xhdpi/ic_size_desc.png differ diff --git a/res/drawable-xxhdpi/ic_alphabetical_asc.png b/res/drawable-xxhdpi/ic_alphabetical_asc.png new file mode 100644 index 000000000000..f86c5916404a Binary files /dev/null and b/res/drawable-xxhdpi/ic_alphabetical_asc.png differ diff --git a/res/drawable-xxhdpi/ic_alphabetical_desc.png b/res/drawable-xxhdpi/ic_alphabetical_desc.png new file mode 100644 index 000000000000..d3b30640ae22 Binary files /dev/null and b/res/drawable-xxhdpi/ic_alphabetical_desc.png differ diff --git a/res/drawable-xxhdpi/ic_map_marker.png b/res/drawable-xxhdpi/ic_map_marker.png new file mode 100644 index 000000000000..00d32aa45ab1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_map_marker.png differ diff --git a/res/drawable-xxhdpi/ic_modification_asc.png b/res/drawable-xxhdpi/ic_modification_asc.png new file mode 100644 index 000000000000..f63aa37a692f Binary files /dev/null and b/res/drawable-xxhdpi/ic_modification_asc.png differ diff --git a/res/drawable-xxhdpi/ic_modification_desc.png b/res/drawable-xxhdpi/ic_modification_desc.png new file mode 100644 index 000000000000..c7e423b1c98c Binary files /dev/null and b/res/drawable-xxhdpi/ic_modification_desc.png differ diff --git a/res/drawable-xxhdpi/ic_phone.png b/res/drawable-xxhdpi/ic_phone.png new file mode 100644 index 000000000000..3006a3417be6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_phone.png differ diff --git a/res/drawable-xxhdpi/ic_size_asc.png b/res/drawable-xxhdpi/ic_size_asc.png new file mode 100644 index 000000000000..59c76b005273 Binary files /dev/null and b/res/drawable-xxhdpi/ic_size_asc.png differ diff --git a/res/drawable-xxhdpi/ic_size_desc.png b/res/drawable-xxhdpi/ic_size_desc.png new file mode 100644 index 000000000000..929aa9ae69be Binary files /dev/null and b/res/drawable-xxhdpi/ic_size_desc.png differ diff --git a/res/drawable-xxxhdpi/ic_alphabetical_asc.png b/res/drawable-xxxhdpi/ic_alphabetical_asc.png new file mode 100644 index 000000000000..3360abc4f379 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_alphabetical_asc.png differ diff --git a/res/drawable-xxxhdpi/ic_alphabetical_desc.png b/res/drawable-xxxhdpi/ic_alphabetical_desc.png new file mode 100644 index 000000000000..d20f565f269a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_alphabetical_desc.png differ diff --git a/res/drawable-xxxhdpi/ic_map_marker.png b/res/drawable-xxxhdpi/ic_map_marker.png new file mode 100644 index 000000000000..f298443b3f97 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_map_marker.png differ diff --git a/res/drawable-xxxhdpi/ic_modification_asc.png b/res/drawable-xxxhdpi/ic_modification_asc.png new file mode 100644 index 000000000000..78b698791f81 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_modification_asc.png differ diff --git a/res/drawable-xxxhdpi/ic_modification_desc.png b/res/drawable-xxxhdpi/ic_modification_desc.png new file mode 100644 index 000000000000..4f2545298cdd Binary files /dev/null and b/res/drawable-xxxhdpi/ic_modification_desc.png differ diff --git a/res/drawable-xxxhdpi/ic_phone.png b/res/drawable-xxxhdpi/ic_phone.png new file mode 100644 index 000000000000..c51ca2d97935 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_phone.png differ diff --git a/res/drawable-xxxhdpi/ic_size_asc.png b/res/drawable-xxxhdpi/ic_size_asc.png new file mode 100644 index 000000000000..fdcd49dec4e5 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_size_asc.png differ diff --git a/res/drawable-xxxhdpi/ic_size_desc.png b/res/drawable-xxxhdpi/ic_size_desc.png new file mode 100644 index 000000000000..b96bca8d9239 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_size_desc.png differ diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml new file mode 100644 index 000000000000..f650f744525d --- /dev/null +++ b/res/drawable/ic_fingerprint.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/layout-land/passcodelock.xml b/res/layout-land/passcodelock.xml new file mode 100755 index 000000000000..d1e4971c3358 --- /dev/null +++ b/res/layout-land/passcodelock.xml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml index d799a3b8b5b7..27992ddffd29 100644 --- a/res/layout/account_item.xml +++ b/res/layout/account_item.xml @@ -21,7 +21,7 @@ --> @@ -60,9 +60,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:layout_toEndOf="@id/avatar_container" - android:layout_toLeftOf="@+id/passwordButton" android:layout_toRightOf="@id/avatar_container" - android:layout_toStartOf="@id/passwordButton" android:orientation="vertical"> - - - - \ No newline at end of file diff --git a/res/layout/activity_manage_space.xml b/res/layout/activity_manage_space.xml index 060ce3501807..459fed9e95d5 100644 --- a/res/layout/activity_manage_space.xml +++ b/res/layout/activity_manage_space.xml @@ -26,7 +26,6 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_gravity="center_vertical" - android:singleLine="false" android:layout_margin="@dimen/standard_margin" style="?android:attr/editTextPreferenceStyle" android:text="@string/manage_space_description" diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml index 954a4d2c7e0c..1ee9bc50e22d 100644 --- a/res/layout/drawer.xml +++ b/res/layout/drawer.xml @@ -2,8 +2,9 @@ + + + + + + + + + + + + +