Commit Graph

401 Commits (9d237bf81fbc5c6b0224887833049281a23d0efe)

Author SHA1 Message Date
Sam Bosley 9d237bf81f Merge from upstream/master 13 years ago
Tim Su 14f8d81ae8 Allow ability to show welcome activity from settings 13 years ago
Sam Bosley dd11d36160 Merge upstream/master 13 years ago
Sam Bosley 0029e881cb Reorganized layout of repeat and calendar control in date dialog, updated some strings 13 years ago
Tim Su 3c2f614cec Killed welcomeLogin class, made welcome walkthrough dots smaller, localize a string. 13 years ago
Tim Su 6f6956dcd8 Merge branch 'master' into 4.0
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/project.properties
	astrid/res/drawable-hdpi/widget_frame.png
	astrid/res/drawable-land-hdpi/widget_frame.png
	astrid/res/drawable-land/widget_frame.png
	astrid/res/drawable/widget_frame.png
	astrid/res/layout/task_list_activity.xml
	astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	greendroid/GreenDroid/.classpath
13 years ago
Sam Bosley fdc5775a8f Style the header nav bar for the redesign 13 years ago
Sam Bosley cf24441363 Localize welcome walkthrough strings, simplify layout 13 years ago
Sam Bosley 2e72bb936a Adjusted parent style of Theme.Dialog to be android:Theme.Dialog to fix a crash in EditNoteActivity 13 years ago
Andrew Shaw d1e9b4c7c0 Walkthrough tutorial upon app launch 13 years ago
Arne Jans 2b13026d9b Actionbar styling as the old navigationbar.
Smaller Astrid-icon in the actionbar.
Astrid-icon as up-button, first try, some quirks (see issue in buglist).
Linked actionbarsherlock-sourcefolder into astrid-project for easier
debugging.
13 years ago
Sam Bosley 941a85a86a Fixed tablet edit dialog crashes and adjusted widths of dialogs for large screens 13 years ago
Sam Bosley ed01e28916 Resolve merge conflicts from tablet branch 13 years ago
Sam Bosley 016ef6b5f8 Rearranged some of the control sets in the edit page, fixed the dialog popup widths 13 years ago
Arne Jans 6511d7e594 merged master into unifiedtabletphone-ui
fixed NotificationActivity to be shown, also for landscape
13 years ago
Sam Bosley ba8fc52520 Fixed some bugs with task description field from JSON and cleaned up description UI, removed some debug code 13 years ago
Amy Tang e4b57e963f Press astrid on empty list to create new task 13 years ago
Amy Tang a0c6528e24 Tag description UI and backend 13 years ago
Sam Bosley e28d09c209 Updated copy 13 years ago
Sam Bosley 2e9a211c23 Popup to ask whether to show assigned task 13 years ago
Amy Tang e98a494f08 Changed copy on add new tasks 13 years ago
Sam Bosley 4caf719e88 New I've Assigned filter 13 years ago
Arne Jans 247ba627bd removed 3-column-layout with taskedit, now 2column. Also handling of the Astrid-logo-button as up-button. 13 years ago
Arne Jans 28a339467f Merge branch 'master' into unifiedtabletphone-ui
Conflicts:
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
13 years ago
Tim Su 759b05053d Killed dead code, fixed issues with user assignment 13 years ago
Arne Jans 27010eb6cd Merge branch 'master' into unifiedtabletphone-ui
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	astrid/src/com/todoroo/astrid/welcome/SplashScreenLauncher.java
	astrid/src/com/todoroo/astrid/welcome/WelcomeGraphic.java
13 years ago
Sam Bosley 78b5bb31c2 Fixed a bug where the save toast wouldn't show correctly for shared tasks 13 years ago
Sam Bosley 79d5bf9dd5 New user experience improved with more help popovers, updated copy, feedback when saved task will be hidden 13 years ago
Sam Bosley f799c57fe4 Nine-patch the save and cancel buttons in task edit, use for new list button 13 years ago
Arne Jans 58181c2769 Added convenience-method for overridePendingTransition in AndroidUtilities for typesafety (calling it with fragments is bad). 13 years ago
Arne Jans 1d60b42138 Added fragment-version of TaskEditActivity, callbacks not ready yet. 13 years ago
Arne Jans e9913eac56 2nd alpha version of tablet/phone ui with actionbar-classes and basic callback-structure through activities as proposed in the 'supporting handsets' article on developer.android.com 13 years ago
Sam Bosley 2cd5cf1005 Cleaned up some more code, added chronometer to timer in task edit view 13 years ago
Sam Bosley b188bc6cdd Cleaned up unused files and polished the tag view activity people header 13 years ago
Sam Bosley 854b6c6b33 Better feedback when trying to share a task when not logged in 13 years ago
Sam Bosley 89af29b011 Killed settings button 13 years ago
Sam Bosley eb22f645cb Changed 'collaborators' language to 'shared with' language 13 years ago
Sam Bosley 9841f605fb Killed branding in header, only show informative titles 13 years ago
Sam Bosley 943e9b6219 Themed all the task edit dialogs, including the calendar picker 13 years ago
Sam Bosley dde0d7258b Migration to a better system for beast mode 13 years ago
Sam Bosley dc2972954f Fixed some strings and some broken unit tests 13 years ago
Sam Bosley 7d0d3d3219 Updated version message, string, number 13 years ago
Sam Bosley 4cd6321fa3 More progress on calendar picker
New and awesome date and time picker for deadlines, alarms, etc.
13 years ago
Sam Bosley 1741dd34ee Customization of task edit activity layout 13 years ago
Sam Bosley 36621ab281 Fixed layout issues with repeating task days of week 13 years ago
Sam Bosley 064df88f85 Fixed problem with weird animation in dialog with deleting lists/filters 13 years ago
Sam Bosley 0df9ae4c39 Lots of polish to edit page, dialogs, making things work on small screen, etc. 13 years ago
Sam Bosley 72bbd6e221 Killed filters header and moved add filter button to menu 13 years ago
Sam Bosley f9cd1f3538 Animate appearance of advanced edit controls, updated copy 13 years ago
Sam Bosley 5f8dd36db5 Added some helper functions for filtering 13 years ago