Commit graph

50 commits

Author SHA1 Message Date
AndyScherzinger
f9c0e1ca09
align text to the right 2017-04-19 18:31:20 +02:00
AndyScherzinger
8187a2582f
Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore
# Conflicts:
#	src/main/res/values/setup.xml
#	src/modified/res/values/setup.xml
2017-04-19 18:25:51 +02:00
Tobias Kaminsky
751e5068d1 Merge pull request #828 from nextcloud/fix-branding
Improve branding
2017-04-19 14:02:09 +02:00
tobiasKaminsky
ae75177f75
smaller borders, vertical centered text 2017-04-19 08:45:46 +02:00
AndyScherzinger
708a261409
minor material design layout fixes 2017-04-17 20:12:27 +02:00
tobiasKaminsky
b5a9813cbc
use recyclerview 2017-04-17 19:45:17 +02:00
tobiasKaminsky
16296153de
contact list: text is now in line with header
round images
2017-04-17 19:45:16 +02:00
tobiasKaminsky
9c37334ef7
make headlines bold
set initial state of last backup to "never"
2017-04-17 19:45:16 +02:00
tobiasKaminsky
d1d01db7a1
contact backup & import 2017-04-17 19:45:12 +02:00
Mario Danic
ce1d0e639b Updated all 2017-04-13 09:41:01 +02:00
Mario Danic
ba698ffc43 Improve branding 2017-04-13 00:51:07 +02:00
Mario Danic
45c03a8203 Implement webview welcome pages 2017-04-13 00:32:05 +02:00
AndyScherzinger
de825e2238
Merge branch 'master' of https://github.com/nextcloud/android into integration-with-master
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
#	src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
#	src/main/res/values-en-rGB/strings.xml
2017-04-03 23:20:30 +02:00
AndyScherzinger
89b5554276
fix UI glitch 2017-03-31 16:11:16 +02:00
AndyScherzinger
91f984eff6
design optimized layout changes 2017-03-31 16:11:16 +02:00
AndyScherzinger
3d17ac886b
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	build.gradle
#	src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/main/res/menu/drawer_menu.xml
2017-03-31 01:57:38 +02:00
AndyScherzinger
472f300e26
minor layout changes 2017-03-30 23:08:01 +02:00
Mario Danic
8099055fe9 Fix activity 2017-03-30 14:49:53 +02:00
Mario Danic
a57cb2e368 Working on everything 2017-03-30 12:10:11 +02:00
AndyScherzinger
d0bd2707fb
revert back to frame layout for icon badges' size 2017-03-29 22:51:08 +02:00
Mario Danic
8b7ecc4392 Implement shared files 2017-03-29 18:21:56 +02:00
alejandro
6e993b6641 Message to Empty List 2017-03-28 16:54:47 -06:00
alejandro
67c8cafeda UI Implementation displaying activities 2017-03-28 15:21:50 -06:00
Mario Danic
d56855e2a9 Fix layouts 2017-03-28 18:24:48 +02:00
AndyScherzinger
04679b12f8
initial menu add and empty activity 2017-03-27 23:40:58 +02:00
AndyScherzinger
e828cc701b
Merge branch 'master' of https://github.com/nextcloud/android into favourites 2017-03-27 23:35:04 +02:00
Mario Danic
6bf7476081 Add support for web login 2017-03-27 21:27:14 +02:00
Mario Danic
99104058de List item 2017-03-27 19:14:54 +02:00
AndyScherzinger
9ffb4c6639
#781 add icons to website/twitter on user info screen, cleanup 2017-03-27 17:45:00 +02:00
AndyScherzinger
b433178914
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
2017-03-27 13:16:53 +02:00
Mario Danic
b4ed6a8d78 Fix issue with fab 2017-03-27 10:28:31 +02:00
AndyScherzinger
933dbccba6
Merge branch 'master' of https://github.com/nextcloud/android into favourites 2017-03-26 16:15:07 +02:00
AndyScherzinger
a5e5cb85c2
move to new folder structure after branding 2017-03-26 16:11:04 +02:00
tobiasKaminsky
2cbdddffc3
add image for downloading nightly
fix url
2017-03-26 15:56:25 +02:00
Mario Danic
e6adc4fd95
Add support for various server types 2017-03-26 01:34:10 +01:00
Mario Danic
bd16eb7146
Partly works 2017-03-26 01:34:10 +01:00
AndyScherzinger
d84ff3917c
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	build.gradle
2017-03-26 01:20:57 +01:00
AndyScherzinger
bfe6dbe80a
move files for new project structure 2017-03-26 00:51:28 +01:00
Mario Danic
f4ab569226
Implement user information magic 2017-03-26 00:51:09 +01:00
Mario Danic
a8ed34fe97 Fix list view clicks 2017-03-24 19:12:37 +01:00
Mario Danic
705ea85060 Work a bit on favorites 2017-03-19 22:12:44 +01:00
AndyScherzinger
ca0f1bbb2d
partial click fix 2017-03-19 14:05:50 +01:00
Mario Danic
59c5eccf6a Grid image favourite focus 2017-03-19 11:18:38 +01:00
Mario Danic
3c68e865e2 Fix layout issues 2017-03-15 01:18:14 +01:00
Mario Danic
274aa7e9a8 Fix UI issues 2017-03-15 00:12:17 +01:00
AndyScherzinger
712b2f98dc
fix click event hadling via setting focusable attribute right 2017-03-14 22:45:59 +01:00
Mario Danic
aa53f63197
Add favorite buttons 2017-03-14 21:59:28 +01:00
Mario Danic
b0835b981f
Significant progress on various things 2017-03-14 21:59:22 +01:00
Mario Danic
27e486458a Put quota text back to its place 2017-03-02 12:36:28 +01:00
Mario Danic
16f1243da6 Fix project structure and prepare for branding 2017-02-25 02:44:31 +01:00