From 98db69bb2930a8928cd1dfb8cecf763c9c9f9c7c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 5 Nov 2016 11:43:18 +1300 Subject: Add first start screen --- .../java/org/traccar/manager/MainActivity.java | 10 ++++ .../java/org/traccar/manager/MainFragment.java | 47 +++++++++++++++++ .../java/org/traccar/manager/StartFragment.java | 33 ++++++++++++ app/src/main/res/layout/fragment_start.xml | 59 ++++++++++++++++++++++ app/src/main/res/values-v21/styles.xml | 4 ++ app/src/main/res/values/dimens.xml | 3 ++ app/src/main/res/values/strings.xml | 3 ++ app/src/main/res/values/styles.xml | 4 +- 8 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/org/traccar/manager/MainFragment.java create mode 100644 app/src/main/java/org/traccar/manager/StartFragment.java create mode 100644 app/src/main/res/layout/fragment_start.xml create mode 100644 app/src/main/res/values-v21/styles.xml create mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/src/main/java/org/traccar/manager/MainActivity.java b/app/src/main/java/org/traccar/manager/MainActivity.java index c8d202d..2c44c87 100644 --- a/app/src/main/java/org/traccar/manager/MainActivity.java +++ b/app/src/main/java/org/traccar/manager/MainActivity.java @@ -18,13 +18,23 @@ package org.traccar.manager; import android.app.Activity; import android.os.Bundle; +import android.preference.PreferenceManager; public class MainActivity extends Activity { + public static final String PREFERENCE_URL = "url"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + + String url = PreferenceManager.getDefaultSharedPreferences(this).getString(PREFERENCE_URL, null); + if (url != null) { + getFragmentManager().beginTransaction().add(android.R.id.content, new MainFragment()).commit(); + } else { + getFragmentManager().beginTransaction().add(android.R.id.content, new StartFragment()).commit(); + } } } diff --git a/app/src/main/java/org/traccar/manager/MainFragment.java b/app/src/main/java/org/traccar/manager/MainFragment.java new file mode 100644 index 0000000..58bf852 --- /dev/null +++ b/app/src/main/java/org/traccar/manager/MainFragment.java @@ -0,0 +1,47 @@ +/* + * Copyright 2016 Anton Tananaev (anton@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.traccar.manager; + +import android.content.pm.ApplicationInfo; +import android.os.Build; +import android.os.Bundle; +import android.view.View; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewFragment; + +public class MainFragment extends WebViewFragment { + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + if ((getActivity().getApplicationInfo().flags &= ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + WebView.setWebContentsDebuggingEnabled(true); + } + } + + WebSettings webSettings = getWebView().getSettings(); + webSettings.setJavaScriptEnabled(true); + webSettings.setDomStorageEnabled(true); + webSettings.setDatabaseEnabled(true); + + getWebView().loadUrl("http://10.0.2.2:8082"); + } + +} diff --git a/app/src/main/java/org/traccar/manager/StartFragment.java b/app/src/main/java/org/traccar/manager/StartFragment.java new file mode 100644 index 0000000..3c4f834 --- /dev/null +++ b/app/src/main/java/org/traccar/manager/StartFragment.java @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Anton Tananaev (anton@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.traccar.manager; + +import android.app.Fragment; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +public class StartFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_start, container, false); + return view; + } + +} diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml new file mode 100644 index 0000000..404fbbd --- /dev/null +++ b/app/src/main/res/layout/fragment_start.xml @@ -0,0 +1,59 @@ + + + + + + + + + + +