From c849913fba3f5b692309570415f85e9bdb8cceeb Mon Sep 17 00:00:00 2001 From: Sean Leonard Date: Wed, 30 Jan 2013 22:54:56 -0700 Subject: Beginnings of a Dashboard Activity Matching layout and menu XML And don't forget strings --- res/menu/client_dashboard.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 res/menu/client_dashboard.xml (limited to 'res/menu') diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml new file mode 100644 index 00000000..cafeb15e --- /dev/null +++ b/res/menu/client_dashboard.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file -- cgit v1.2.3 From 4bcb53cff01cb13530e1011fb6d5ac105be1ba25 Mon Sep 17 00:00:00 2001 From: Sean Leonard Date: Wed, 30 Jan 2013 23:10:26 -0700 Subject: Put some About love in the menu Needs attention, as the AboutFragment does not fill the layout You can still see providerLine Creates Issue #1592 --- res/menu/client_dashboard.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'res/menu') diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml index cafeb15e..87e7ae62 100644 --- a/res/menu/client_dashboard.xml +++ b/res/menu/client_dashboard.xml @@ -5,6 +5,7 @@ android:orderInCategory="100" android:showAsAction="never" android:title="@string/menu_settings"/> + \ No newline at end of file -- cgit v1.2.3 From 6e0142a335eafe8a9b0e41b0e968038c0aeabd11 Mon Sep 17 00:00:00 2001 From: Sean Leonard Date: Thu, 7 Feb 2013 01:33:03 -0700 Subject: Refactor ProviderListActivity.class into ConfigurationWizard.class, Moves towards our wizard flow; Addresses #1497 #1500 --- res/menu/activity_configuration_wizard.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 res/menu/activity_configuration_wizard.xml (limited to 'res/menu') diff --git a/res/menu/activity_configuration_wizard.xml b/res/menu/activity_configuration_wizard.xml new file mode 100644 index 00000000..77f358b6 --- /dev/null +++ b/res/menu/activity_configuration_wizard.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file -- cgit v1.2.3 From 75728462433b19567710f54a9d4767681b10be95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 22 Apr 2013 18:07:07 +0200 Subject: Coded dialog (now there is a button in the Dashboard), time to test. I need to implement bypass for dev.bitmask.net, because bitmask.net is down. --- res/menu/client_dashboard.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'res/menu') diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml index 87e7ae62..fffd4e23 100644 --- a/res/menu/client_dashboard.xml +++ b/res/menu/client_dashboard.xml @@ -7,5 +7,6 @@ android:title="@string/menu_settings"/> + \ No newline at end of file -- cgit v1.2.3 From 84a11bb1620d2b9080992427c847b58007f2304a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 9 May 2013 17:29:38 +0200 Subject: Log in and Log out options are shown only if allow registration is true. Allow registration is present in provider.json. Provider.json is downloaded from both preseeded and custom providers. Authentication success or fail is notified correctly to the user. --- res/menu/client_dashboard.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'res/menu') diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml index fffd4e23..a8eaf795 100644 --- a/res/menu/client_dashboard.xml +++ b/res/menu/client_dashboard.xml @@ -7,6 +7,7 @@ android:title="@string/menu_settings"/> - + + \ No newline at end of file -- cgit v1.2.3 From f6efff1a7ec06d68bad27cd65e66d33e72572c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sat, 29 Jun 2013 17:07:44 +0200 Subject: Added menu to ConfigurationWizard. It only contains the "About LEAP" option. If the user clicks again that option while the About fragment is up, no new fragment is added and pressing 1 time the back button drives him/her to the ConfigurationWizard activity. --- res/menu/activity_configuration_wizard.xml | 9 --------- res/menu/configuration_wizard_activity.xml | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 res/menu/activity_configuration_wizard.xml create mode 100644 res/menu/configuration_wizard_activity.xml (limited to 'res/menu') diff --git a/res/menu/activity_configuration_wizard.xml b/res/menu/activity_configuration_wizard.xml deleted file mode 100644 index 77f358b6..00000000 --- a/res/menu/activity_configuration_wizard.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/menu/configuration_wizard_activity.xml b/res/menu/configuration_wizard_activity.xml new file mode 100644 index 00000000..9e441a18 --- /dev/null +++ b/res/menu/configuration_wizard_activity.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file -- cgit v1.2.3 From e3dd09bb37f6727a09a2d5da7c880997555b4d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sat, 29 Jun 2013 17:54:34 +0200 Subject: New menu option to go back to ConfigurationWizard. It works ok (it simply starts ConfigurationWizard activity for result), but when entering again to Dashboard a NullPointer happens in serviceItemEIP(((ViewStub) findViewById(R.id.eipOverviewStub)).inflate();). It also adds (I forgot to commit before leaving the retry-login branch) ProgressDialogs to login and logout operations. --- res/menu/client_dashboard.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'res/menu') diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml index a8eaf795..55ad91b4 100644 --- a/res/menu/client_dashboard.xml +++ b/res/menu/client_dashboard.xml @@ -7,6 +7,7 @@ android:title="@string/menu_settings"/> + -- cgit v1.2.3