AndyScherzinger
fca2d906fa
Fix CR
2018-03-21 10:20:55 +01:00
AndyScherzinger
0db19eae12
improve auto upload list header
2018-03-21 10:20:45 +01:00
tobiaskaminsky
a12d41c884
equal sized icon
...
fix showing app chooser twice
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-13 21:30:38 +01:00
AndyScherzinger
32a92f9f17
Fix #2215 resizing the activity icon
2018-03-13 13:30:35 +01:00
xXSTrikeXx
3c07717ba1
Update activity_list_item.xml
...
Remove android:maxLines="3" to see long subtitles of notifications.
2018-03-09 18:28:44 +01:00
Suneet Srivastava
7ffa5886c1
Fix#2125:ShareDialogFix
2018-02-11 00:09:41 +05:30
tobiasKaminsky
f10b5a5aaf
change images
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-25 12:41:37 +01:00
tobiasKaminsky
ae7b51e66d
- add 300 feature
...
- bullet point list for feature text
- improved lint: do not warn/error on unused translated ressources
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-25 12:41:13 +01:00
tobiaskaminsky
d7cfbffe34
replace text filed
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-22 22:52:38 +01:00
AndyScherzinger
2d79a37b9f
added newline
2018-01-18 21:27:48 +01:00
AndyScherzinger
fdd0431beb
center image/text
2018-01-18 21:27:48 +01:00
tobiaskaminsky
5d30d83e67
Hardening preview adapter for null files
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 21:27:47 +01:00
tobiasKaminsky
3753832a9a
remove 200 features from whats new
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-16 11:10:36 +01:00
tobiasKaminsky
c5883f8305
make text selectable
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:57 +01:00
Jan-Christoph Borchardt
b6e84b66fd
First release of E2E
2018-01-15 08:11:49 +01:00
tobiasKaminsky
77e9e66a9c
add content description
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-11 12:16:55 +01:00
Bartosz Przybylski
200d264424
Remove unused id and use standard margin
2018-01-11 12:16:54 +01:00
Bartosz Przybylski
23162c36bf
Remove containers in user info
...
Replace designated containers with Recycler And adapter.
2018-01-11 12:16:54 +01:00
tobiasKaminsky
462d9d90cc
- move check count from shared pref to arbitrary provider
...
- use it also for checking new dev version (if enabled)
2018-01-10 07:40:59 +01:00
Bartosz Przybylski
a3db144ecc
Crop center the image in account info
...
Because we need to correctly crop and center the image we can no longer support snapping of toolbar in appbar. Since AppBarLayout is a subclass of LinearLayout and doesn't look deeper into subview hierachy for snapping children, thus it is better not to support it.
Also instead of using ScrollView and pad it with some weird magic numbers, use NestedScrollView class which is made to cooperate with AppBarLayout.
2018-01-09 10:30:20 +01:00
Bartosz Przybylski
0e1dc14016
Fixes #1903 : Fix image scaling in navigation drawer
...
* Insted of setting a background in ViewGroup add a ImageView inside it, stretch it, set cropping scaleType and then set a background image downloaded from server.
* CenterCrop will scale the image to fill the View, if needed image will be cropped in the center but the aspect ration will be kept
* Cleanup code to use more general types instead of direct layout type, previously enforcing LinearLayout wasn't using anything special about this class.
2018-01-09 10:30:20 +01:00
tobiasKaminsky
62f74a8ff5
do not use id twice
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-08 15:47:44 +01:00
Mario Đanić
3ebc31db17
Merge pull request #1792 from nextcloud/combineSendShare
...
Combine send share
2017-12-29 00:54:47 +01:00
Mario Đanić
df67ba4149
Merge pull request #1862 from nextcloud/lastRTL
...
Lint: last RTL
2017-12-29 00:53:06 +01:00
tobiasKaminsky
0cd81c31b4
last RTL
2017-12-27 13:17:14 +01:00
AndyScherzinger
88df7842e5
fixes #1877 - click checkbox image should also check list item
2017-12-27 12:55:57 +01:00
AndyScherzinger
73cba5519c
fixes after rebase
2017-12-27 12:53:48 +01:00
AndyScherzinger
ae24c3c534
fix some lint issues
2017-12-27 12:53:47 +01:00
AndyScherzinger
b8260646da
add content description to activity icon
2017-12-27 12:53:47 +01:00
AndyScherzinger
0d864eed96
uses dimens values
2017-12-27 12:53:44 +01:00
tobiaskaminsky
114f4c9e80
reformat
2017-12-27 12:53:44 +01:00
AndyScherzinger
89ac5a0843
optimized share layout
2017-12-27 12:53:42 +01:00
tobiaskaminsky
12f837e205
- correctly tint white, black theme
...
- moved link image a bit to the right
2017-12-27 12:53:41 +01:00
tobiaskaminsky
e08049341c
Tint round buttons
2017-12-27 12:53:40 +01:00
AndyScherzinger
672c0a1509
circular background
2017-12-27 12:53:40 +01:00
tobiaskaminsky
3debd2f0f1
align both icon
2017-12-27 12:53:39 +01:00
tobiasKaminsky
2168e5a344
- make image & text clickable
...
- show snackbar correctly if resharing is not allowed, then also grey out image&text if not folder
2017-12-27 12:53:39 +01:00
tobiaskaminsky
dc2d7edc56
combine send/share
2017-12-27 12:53:35 +01:00
tobiaskaminsky
6c78627c3f
further rtl support
2017-12-13 08:06:43 +01:00
tobiaskaminsky
e547f37b07
set content description
...
minor type errors
2017-11-27 13:02:37 +01:00
tobiasKaminsky
86340913a8
versionDev as flavor
2017-11-27 12:15:38 +01:00
AndyScherzinger
798df9f223
Fixes #1761 by removing unnecessary background color which gets tinted if present
2017-11-09 08:39:13 +01:00
AndyScherzinger
cfdb8f5227
lint: fix rtl values
2017-11-08 23:14:51 +01:00
AndyScherzinger
461c4282e8
fix lint warnings
2017-11-08 16:32:25 +01:00
AndyScherzinger
7082bf7189
Fixes #1743 by enlarging the padding of the icons (hitbox)
2017-11-08 16:32:25 +01:00
AndyScherzinger
8cf227e612
remove unused paddings (lint)
2017-10-26 10:39:28 +02:00
AndyScherzinger
b036ae5d68
replace android:layout with layout
2017-10-25 09:34:21 +02:00
AndyScherzinger
3bf7cfd39e
lint: fix layout ids
2017-10-25 09:34:21 +02:00
AndyScherzinger
a7381b7536
lint: Use a layout_width of 0dp instead of @dimen/zero for better performance
2017-10-24 13:38:27 +02:00
AndyScherzinger
4f0fea2d39
move file details
2017-10-24 13:38:26 +02:00
AndyScherzinger
25150d61c0
removes mime type info from details screen as described in #1212
2017-10-24 13:38:26 +02:00
AndyScherzinger
2fce2036b6
fix whitespace dp values
2017-10-19 22:11:01 +02:00
tobiaskaminsky
2da83959b2
additional enhancements
2017-10-19 22:11:00 +02:00
tobiasKaminsky
9a30bae5a8
enhance activity list design
2017-10-19 22:11:00 +02:00
AndyScherzinger
5747da2122
lint: use 0dp instead of dims value
2017-10-19 15:46:37 +02:00
AndyScherzinger
6b9d270e8e
fix lint issues and optimize layout
2017-10-19 15:33:05 +02:00
AndyScherzinger
a2d182cf75
fixed size of the share icon hitbox in list view
2017-10-18 22:03:21 +02:00
AndyScherzinger
1924766a66
fix lint warnings for clickable items + content description
2017-10-18 21:53:31 +02:00
Hari
f3755fa842
Align row icons to action bar icons
2017-10-18 21:53:30 +02:00
Hari
8e65a1dece
Align the overflow icon and share icon vertically
2017-10-18 21:53:30 +02:00
Hari
8d476f6578
Add material design specs
2017-10-18 21:53:29 +02:00
Hari
1e7bc78d87
Revert change in favourite icon
2017-10-18 21:53:28 +02:00
Hari
7312979808
Add options for operations on single files
2017-10-18 21:53:28 +02:00
AndyScherzinger
40d393b234
resolves #1573 - filetype icons and previews size
2017-10-18 15:26:06 +02:00
stalker314314
6e4c14c8d4
Fixes #1600
...
Change "Set as available offline" text to "Available offline" for switch widget in file details dialog, to differnetiate between this and "Set as available offline" in menu
2017-09-29 15:20:49 +02:00
AndyScherzinger
1aa0767922
lint: Using dp instead of sp for text sizes
2017-09-06 09:19:13 +02:00
AndyScherzinger
dcece32f72
resolves #1387 by adding a fallback when setting the span text doesn't work
2017-08-21 14:04:23 +02:00
AndyScherzinger
0e4d50347d
revert visibility test change
2017-08-18 15:43:42 +02:00
AndyScherzinger
fcf132c529
lint: fix descriptions on user info graphics
2017-08-18 13:54:01 +02:00
tobiasKaminsky
71e16238e5
center title
2017-08-17 15:00:13 +02:00
Mario Đanić
ed71cdac9c
Merge branch 'master' into lintWarnings
2017-08-10 18:23:02 +02:00
tobiasKaminsky
ffa50ed82d
remove unused ressources
2017-08-10 16:37:34 +02:00
tobiasKaminsky
38657443d8
removed some unused code to get the warnings down ;-)
2017-08-10 16:32:10 +02:00
AndyScherzinger
e30bc9eefc
add object descriptions for accessibility
2017-08-10 16:32:10 +02:00
AndyScherzinger
f812d5b8c3
fix RTL issue
2017-08-08 13:00:05 +02:00
AndyScherzinger
19ec306b8c
remove unused layouts
2017-08-08 13:00:04 +02:00
AndyScherzinger
b82b72f2b3
add content description and rtl fixes
2017-08-08 13:00:03 +02:00
AndyScherzinger
2e947eac61
fix some rtl warnings
2017-08-08 13:00:03 +02:00
AndyScherzinger
d643d28c58
fix codacy warnings
2017-08-08 13:00:03 +02:00
AndyScherzinger
4781c0703f
remove further unused resources
2017-08-08 13:00:02 +02:00
AndyScherzinger
2cb8785fd0
lint: remove hardcoded strings
2017-08-08 13:00:00 +02:00
AndyScherzinger
29ff68bb79
rename icon work that isn't a menu icon
2017-08-08 13:00:00 +02:00
AndyScherzinger
21d1c56e4d
fix Combining Ellipsize and Maxlines (lint)
2017-08-08 12:59:56 +02:00
Mario Danic
c68f02ec57
Put custom folders intto expert
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:53 +02:00
Mario Danic
cb5ef79176
Revert "Delete right button"
...
This reverts commit d8cbb904adf1f013b0b8b0ad6d377b35caaec006.
2017-08-08 12:59:42 +02:00
AndyScherzinger
09f6037b86
further cleanup after rebase
2017-08-08 12:59:36 +02:00
AndyScherzinger
3730883136
scrollable toolbar implementation for auto upload
2017-08-08 12:59:36 +02:00
tobiasKaminsky
9052abd9dd
rename "foldersync" -> "syncedFolder(s)"
2017-08-08 12:59:34 +02:00
tobiasKaminsky
1386726a4f
show "add folder" correctly if other folders are present
2017-08-08 12:59:33 +02:00
tobiasKaminsky
1f85abbe43
"set up custom folder" as element in xml and not in adapter
2017-08-08 12:59:33 +02:00
Mario Danic
5087ff4537
Delete right button
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:26 +02:00
Mario Danic
447e6fd7ee
Fix custom folders
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:26 +02:00
AndyScherzinger
a27d0c15f4
fix create item click for custom folder
2017-08-08 12:59:19 +02:00
AndyScherzinger
828284330d
fix after rebase
2017-08-08 12:59:15 +02:00
AndyScherzinger
ace7ad03c4
delete button (no function yet)
2017-08-08 12:59:15 +02:00
AndyScherzinger
e93cd2723f
implement correct local/remote folder picking in preference dialog
2017-08-08 12:59:14 +02:00
AndyScherzinger
de83a02156
open folder sync preference for new, custom folder (work in progress)
2017-08-08 12:59:12 +02:00
Mario Danic
14c2d13c81
Custom folder RV item
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:03 +02:00
AndyScherzinger
48d66b36c9
fixed layout not displaying app bar
2017-08-08 12:59:03 +02:00
AndyScherzinger
4e82f5dc5f
also use star folder for action item
2017-08-08 12:59:02 +02:00
AndyScherzinger
9899dbbf13
add item to the top (WiP)
2017-08-08 12:59:01 +02:00
AndyScherzinger
3147a2c86a
add icons to the grid headers depending on the type
2017-08-08 12:59:00 +02:00
tobiasKaminsky
732a65ca09
show empty message when receiving external files
2017-07-28 14:49:22 +02:00
tobiasKaminsky
26ab00d989
+ is now also white
2017-07-28 14:25:31 +02:00
AndyScherzinger
b86df12f14
lint: removed obsolete layout params
2017-07-27 15:21:43 +02:00
AndyScherzinger
cb57677f62
remove unused namespace declarations
2017-07-27 15:21:43 +02:00
AndyScherzinger
6c3af67bad
replace deprecated android:singleLine with android:maxLines=1
2017-07-27 15:21:40 +02:00
AndyScherzinger
a2560a867a
raising padding on headline
2017-07-27 15:21:40 +02:00
AndyScherzinger
016cb21575
theming fixes for ProgressBar elements
2017-07-27 15:21:39 +02:00
AndyScherzinger
06022e78f5
use proper mini headline styling using material body2 definition
2017-07-27 15:21:38 +02:00
AndyScherzinger
dd503ad8f3
Fix headline coloring
2017-07-27 15:21:37 +02:00
AndyScherzinger
b9751bab35
fixed cherry picked new details
2017-07-27 15:21:36 +02:00
AndyScherzinger
ca7796253c
adapt to cherry pick
2017-07-27 15:21:36 +02:00
Victor Nidens
947fad3299
Reverted edit password view visibility
2017-07-23 19:16:34 +02:00
Victor Nidens
c9b185f843
Changed visibility icon tint to look good on colored background
2017-07-23 19:16:34 +02:00
Victor Nidens
fbfd8f22f7
Updated password visibility indicator according to Material guidelines
2017-07-23 19:16:33 +02:00
Victor Nidens
a8bc5c3c79
[Share] Enter password: toggle visibility of password #1171
2017-07-23 19:16:30 +02:00
AndyScherzinger
6c15eaa123
remove unused color definitions/layout to make lint happy again
2017-07-23 15:33:59 +02:00
AndyScherzinger
e1d11aa860
fix hardcoded strings
2017-07-17 23:37:36 +02:00
AndyScherzinger
6c92d44ef6
lint: remove unused resources
2017-07-16 16:42:57 +02:00
tobiasKaminsky
06cc85bb69
progressbar until loginsite is loaded
2017-07-16 16:42:56 +02:00
tobiasKaminsky
8fd610a773
initial hide user/pass, show only if <nc12
2017-07-16 16:42:55 +02:00
AndyScherzinger
c88d9205a2
Merge branch 'master' of https://github.com/nextcloud/android into userTheming
...
# Conflicts:
# scripts/lint/lint-results.txt
# src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java
# src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
# src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
2017-06-30 22:43:37 +02:00
Andy Scherzinger
72e8888bd2
Merge pull request #1140 from nextcloud/autoUploadWithoutStoragePermission
...
Prevent NPE when disabling "storage permission" and then access auto upload
2017-06-30 22:25:27 +02:00
tobiasKaminsky
a5f83d9d02
change ui for public release
2017-06-30 13:10:59 +02:00
tobiasKaminsky
e049b56c66
show "contacts backup" eithen in drawer or settings
2017-06-30 13:10:58 +02:00
tobiasKaminsky
a4c0693288
prevent NPE when disabling "storage permission" and then access auto upload
2017-06-26 16:15:27 +02:00
tobiasKaminsky
0db845a544
Merge remote-tracking branch 'origin/userTheming' into userTheming
2017-06-16 13:59:53 +02:00
tobiasKaminsky
8fae712a50
colors colors colors
2017-06-16 13:59:45 +02:00
AndyScherzinger
914b32f7ab
Merge branch 'master' of https://github.com/nextcloud/android into userTheming
...
# Conflicts:
# src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2017-06-15 07:47:25 +02:00
AndyScherzinger
51c2f1d83d
resolves #1078 - Empty content screen icon colors
2017-06-14 11:31:52 +02:00
tobiasKaminsky
db7f93fd14
use own FAB library to support colored FAB main button.
2017-06-14 07:56:55 +02:00
tobiasKaminsky
db22cf5bb4
ManageAccountActivity: change color of font and active icon in accounts list
2017-06-13 11:13:04 +02:00
tobiasKaminsky
d84c13a176
use background image from theming app in drawer
2017-06-07 09:33:11 +02:00
AndyScherzinger
dd54aa7207
Merge branch 'master' of https://github.com/nextcloud/android into fixingContactBackup
2017-05-31 21:55:31 +02:00
AndyScherzinger
29bd72141d
corrected left icon size to file_icon_size
2017-05-31 12:52:13 +02:00
alejandro
1d92fe8df6
Removing RecyclerView
2017-05-31 11:02:24 +02:00
alejandro
fba1d38100
Header was added in ActivitiesView
...
RichSubject was Added
2017-05-31 11:02:19 +02:00
alejandro
f0b76ede44
Add Load Contact in Background and ProgressBar
...
Fixing Comparator
Format code
2017-05-30 16:18:16 -05:00
AndyScherzinger
bdcbbb13c5
slightly enlarge autoUpload on/off button hitbox
2017-05-30 08:41:16 +02:00
tobiasKaminsky
7103fea76d
changed to default
...
only "on wifi" is in settings
2017-05-30 08:41:15 +02:00
tobiasKaminsky
ab096dd0f7
background logic implemented
2017-05-30 08:40:55 +02:00
Mario Danic
c774aa3040
Partially fix stuff
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-29 12:57:19 +02:00
tobiasKaminsky
5edd32b753
removed nc_blue_accent and nc_blue and use colors from setup.xml
2017-05-26 11:19:13 +02:00
tobiasKaminsky
b3eb13c2df
removed navigation bar color and set to primary
2017-05-26 11:19:12 +02:00
tobiaskaminsky
bf4191e251
checkbox in off state: grey
...
auto upload cloud icon in on state: tint it
2017-05-26 11:19:12 +02:00
tobiasKaminsky
71a9b683fa
change auto upload cloud icon
2017-05-26 11:19:11 +02:00
tobiasKaminsky
e671cecc45
WIP use colors from setup.xml for folder icons
2017-05-26 11:19:10 +02:00
tobiaskaminsky
778829d69c
- always update contacts backup folder
...
- if file is not downloaded, download it then show content
2017-05-24 00:55:48 +02:00
tobiaskaminsky
c28f17d9af
remove old reference to onClick, this is now handled via ButterKnife
...
use "end" instead of "right" for RTL support
2017-05-13 22:30:00 +02:00
AndyScherzinger
4dae921763
change style of import button
2017-04-28 10:39:58 +02:00
AndyScherzinger
841ad6c348
minor code review fixes
2017-04-28 10:39:55 +02:00
AndyScherzinger
097b05d59a
fixes after rebase
2017-04-28 10:39:55 +02:00
Mario Danic
0994140d55
Progress on magic
2017-04-28 10:39:51 +02:00
Mario Đanić
fd161aa99f
Merge pull request #897 from nextcloud/WebViewTitle
...
if webview show app name
2017-04-27 14:54:47 +02:00
tobiasKaminsky
57f0df279a
use themed color instead of white
2017-04-27 14:53:31 +02:00
tobiasKaminsky
c5e2673309
add missing layout param
2017-04-27 13:05:19 +02:00
tobiasKaminsky
41494099f2
bottom bar in all activities
2017-04-26 20:40:25 +02:00
tobiasKaminsky
92f12ac6a9
if webview show app name
2017-04-26 15:23:39 +02:00
Mario Đanić
9739edbbec
Merge pull request #624 from Flole998/master
...
Added fingerprint support
2017-04-20 22:40:50 +02:00
Mario Đanić
19705ff438
Merge branch 'master' into externalLinks
2017-04-20 22:37:56 +02:00
AndyScherzinger
ed59604d3f
fixes after rebase
2017-04-20 09:09:14 +02:00
AndyScherzinger
8bdb8614e6
fixes after rebase due to project structure changes
2017-04-20 09:09:13 +02:00
AndyScherzinger
cf7ccdfc65
Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore
...
# Conflicts:
# src/main/res/values/strings.xml
2017-04-19 23:38:31 +02:00
AndyScherzinger
22976389c2
add generic circular avatars for contacts and use slightly smaller, more material like font size
2017-04-19 19:08:59 +02:00
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
Mario Danic
1ab159163c
Fix bunch of stuff
2017-04-19 15:54:52 +02:00
AndyScherzinger
ac088c14a0
initial UI implementation displaying notifications
2017-04-19 15:54:51 +02:00
AndyScherzinger
20ac3b4e69
empty list icon, use latest empty list layout and butterknife
2017-04-19 15:54:49 +02:00
AndyScherzinger
cb8c8caf7d
WiP activity for notifications
2017-04-19 15:54:49 +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
tobiasKaminsky
82b02788d0
generic: link, progressBar, percentage
...
modified: percentage, progressbar, link
2017-04-06 17:15:59 +02:00
tobiasKaminsky
a5c2cc0fb6
display external links, disabled by default
...
stored in database
2017-04-06 11:45:54 +02:00
tobiasKaminsky
dfbfd051f4
added webview support
2017-04-06 11:45:53 +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