diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 18d11eaf..e6f792bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -96,6 +96,7 @@ limitations under the License.
android:label="@string/image_zoom"
android:exported="true"
/>
+
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
index f51e75da..d6667ade 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
@@ -18,7 +18,6 @@
*/
package org.apache.taverna.mobile.ui;
-
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.local.PreferencesHelper;
@@ -26,6 +25,7 @@
import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
import org.apache.taverna.mobile.ui.login.LoginActivity;
import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
+import org.apache.taverna.mobile.ui.usage.UsageActivity;
import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
import org.apache.taverna.mobile.utils.ActivityUtils;
@@ -163,10 +163,9 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
case R.id.nav_usage:
- dialog.setCanceledOnTouchOutside(true);
- dialog.setTitle(getString(R.string.title_nav_usage));
- dialog.setContentView(R.layout.usage_layout);
- dialog.show();
+ Intent intent = new Intent(DashboardActivity.this,
+ UsageActivity.class);
+ startActivity(intent);
mDrawerLayout.closeDrawers();
return true;
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/usage/UsageActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/usage/UsageActivity.java
new file mode 100644
index 00000000..b9ccbd09
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/usage/UsageActivity.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.taverna.mobile.ui.usage;
+
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+import org.apache.taverna.mobile.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class UsageActivity extends AppCompatActivity {
+
+ @BindView(R.id.toolbar)
+ Toolbar mToolbar;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_usage);
+ ButterKnife.bind(this);
+
+ setSupportActionBar(mToolbar);
+ ActionBar actionbar = getSupportActionBar();
+
+ if (actionbar != null) {
+ actionbar.setHomeButtonEnabled(true);
+ actionbar.setDisplayHomeAsUpEnabled(true);
+ actionbar.setTitle(R.string.title_usage);
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ finish();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_usage.xml b/app/src/main/res/layout/activity_usage.xml
new file mode 100644
index 00000000..dd06e5d9
--- /dev/null
+++ b/app/src/main/res/layout/activity_usage.xml
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/usage_layout.xml b/app/src/main/res/layout/usage_layout.xml
deleted file mode 100644
index a5be226d..00000000
--- a/app/src/main/res/layout/usage_layout.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1225acec..af7411f2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,6 +16,7 @@
limitations under the License.
-->
+ #000000
#2196F3
#2196F3
#FF4081
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e4441143..fabd8337 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,6 +24,18 @@ limitations under the License.
5dp
4dp
+
+ 25sp
+ 3sp
+ 45sp
+ 10sp
+ 10sp
+ 10sp
+ 13sp
+ 10sp
+ 10sp
+ 10sp
+
240dp