diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e136931..a445a8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,7 @@
+
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/AboutActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/AboutActivity.java
new file mode 100644
index 0000000..3154246
--- /dev/null
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/AboutActivity.java
@@ -0,0 +1,22 @@
+package de.apps4ics.mountainnavigation;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+/**
+ * Created by Vinz on 16.03.2016.
+ */
+public class AboutActivity extends Activity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_about);
+ ListView contributorList = (ListView) findViewById(R.id.aboutContribList);
+ String[] contributors = getResources().getStringArray(R.array.contributors);
+ ArrayAdapter adapter = new ArrayAdapter<>(AboutActivity.this, R.layout.simple_item, contributors);
+ contributorList.setAdapter(adapter);
+ }
+}
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 6725606..560aed1 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -23,6 +23,7 @@
import android.view.View;
import android.support.v4.widget.DrawerLayout;
import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RelativeLayout;
@@ -96,7 +97,8 @@
private ActionBarDrawerToggle drawerToggle;
private DrawerLayout drawerLayout;
- private ListView listView;
+ private ListView poiView;
+ private ListView menuView;
public static ArrayList pathMarkers;
public static OverlayItem imageMarker;
@@ -166,14 +168,15 @@
}
});
drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
- listView = (ListView) findViewById(R.id.navigation_drawer);
+ menuView = (ListView) findViewById(R.id.menuList);
+ poiView = (ListView) findViewById(R.id.poiList);
drawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
-// listView.setItemsCanFocus(false);
+// poiView.setItemsCanFocus(false);
ImageListAdapter adapter = new ImageListAdapter(MainActivity.this, PoiHandler.getEntries(), PoiHandler.getEntryImgs(), false);
- listView.setAdapter(adapter);
- listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ poiView.setAdapter(adapter);
+ poiView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView> parent, View view, int position, long id) {
TableLayout layout = (TableLayout) view;
@@ -182,6 +185,22 @@
}
});
+ String[] menuEntries = res.getStringArray(R.array.menuEntries);
+ ArrayAdapter menuAdapter = new ArrayAdapter<>(MainActivity.this, android.R.layout.simple_list_item_1, menuEntries);
+ menuView.setAdapter(menuAdapter);
+ menuView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView> parent, View view, int position, long id) {
+ String key = res.getStringArray(R.array.menuEntriesKeys)[position];
+ if(key.equals(getString(R.string.menu_title_about_key))) {
+ Intent about = new Intent(MainActivity.this, AboutActivity.class);
+ startActivity(about);
+ } else if(key.equals(getString(R.string.menu_title_settings_key))) {
+ Toaster("Open settings!", false);
+ }
+ }
+ });
+
drawerLayout.setDrawerListener(drawerToggle);
double _lat = 48.52;
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 0000000..1b735e4
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3826cef..52f0e83 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,13 +31,32 @@
-
+ android:fillViewport="true"
+ >
+
+
+
+
+
diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml
deleted file mode 100644
index c05742d..0000000
--- a/app/src/main/res/layout/drawer_main.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/app/src/main/res/layout/simple_item.xml b/app/src/main/res/layout/simple_item.xml
new file mode 100644
index 0000000..012cb17
--- /dev/null
+++ b/app/src/main/res/layout/simple_item.xml
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index f1338ff..8b1682e 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -54,6 +54,11 @@
Example action
Einstellungen
+ Lizenz
+ Diese Software wird unter der AGPL/Apache 2.0/CC-SA veröffentlicht.
+ Mitwirkende
+ Diese Software wäre ohne die großartige Arbeit anderer nicht möglich. Sie baut auf den folgenden Bibliotheken auf:
+
- Quelle
- Weg
@@ -66,6 +71,10 @@
- W-LAN
- Lifte
+
+ - Einstellungen
+ - Über
+
- Klein
- Mittel
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7118c14..60d16a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,6 +55,14 @@
Example action
Settings
+ License
+ This software is released under the AGPL/Apache 2.0/CC-SA.
+ Contribution
+ This software would not exist without the great work of others. It relies on the following libraries:
+
+ about
+ settings
+
- Fountain
- Path
@@ -67,6 +75,22 @@
- WiFi
- Lift
+
+ - Settings
+ - About
+
+
+ - @string/menu_title_settings_key
+ - @string/menu_title_about_key
+
+
+ - - OpenStreetMap: https://www.openstreetmap.org/
+ - - OpenWeatherMap: https://openweathermap.org/
+ - - weatherlib: https://github.com/survivingwithandroid/WeatherLib
+ - - osmdroid: https://github.com/osmdroid/osmdroid
+ - - osmbonuspack: https://github.com/MKergall/osmbonuspack/
+ - - icons8: https://icons8.com/
+
- Small
- Medium