aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-05-09 07:55:33 +0200
committerBananeweizen <bananeweizen@gmx.de>2013-05-09 07:55:33 +0200
commitdb88f86e0756ea44414a4da9353af36e39d511dc (patch)
tree04b08470abcb2cadb543d466ee378ad14b197671 /main
parentae27446bcb675c72f0e6be14ae24af0f73067ceb (diff)
downloadcgeo-db88f86e0756ea44414a4da9353af36e39d511dc.zip
cgeo-db88f86e0756ea44414a4da9353af36e39d511dc.tar.gz
cgeo-db88f86e0756ea44414a4da9353af36e39d511dc.tar.bz2
fix #1781: Remove help function
Diffstat (limited to 'main')
-rw-r--r--main/res/drawable-hdpi/actionbar_manual.pngbin652 -> 0 bytes
-rw-r--r--main/res/drawable-ldpi/actionbar_manual.pngbin501 -> 0 bytes
-rw-r--r--main/res/drawable-mdpi/actionbar_manual.pngbin769 -> 0 bytes
-rw-r--r--main/res/drawable-mdpi/helper_manual.pngbin50536 -> 0 bytes
-rw-r--r--main/res/layout-land/coords.xml2
-rw-r--r--main/res/layout-land/navigate.xml2
-rw-r--r--main/res/layout/actionbar_button_manual.xml14
-rw-r--r--main/res/layout/actionbar_with_manual.xml9
-rw-r--r--main/res/layout/caches.xml6
-rw-r--r--main/res/layout/cacheview.xml2
-rw-r--r--main/res/layout/coords.xml2
-rw-r--r--main/res/layout/edit_waypoint_activity.xml2
-rw-r--r--main/res/layout/init.xml2
-rw-r--r--main/res/layout/main.xml39
-rw-r--r--main/res/layout/map_google.xml6
-rw-r--r--main/res/layout/map_mapsforge.xml6
-rw-r--r--main/res/layout/map_mapsforge_old.xml6
-rw-r--r--main/res/layout/navigate.xml2
-rw-r--r--main/res/layout/point.xml2
-rw-r--r--main/res/layout/popup.xml6
-rw-r--r--main/res/layout/search.xml2
-rw-r--r--main/res/layout/touch.xml4
-rw-r--r--main/res/layout/trackable_activity.xml2
-rw-r--r--main/res/layout/visit.xml4
-rw-r--r--main/res/layout/visit_image.xml10
-rw-r--r--main/res/layout/waypoint_popup.xml4
-rw-r--r--main/res/values-cs/strings.xml2
-rw-r--r--main/res/values-de/strings.xml2
-rw-r--r--main/res/values-es/strings.xml2
-rw-r--r--main/res/values-fr/strings.xml2
-rw-r--r--main/res/values-hu/strings.xml2
-rw-r--r--main/res/values-it/strings.xml2
-rw-r--r--main/res/values-ja/strings.xml2
-rw-r--r--main/res/values-nl/strings.xml2
-rw-r--r--main/res/values-pl/strings.xml2
-rw-r--r--main/res/values-pt/strings.xml2
-rw-r--r--main/res/values-sk/strings.xml2
-rw-r--r--main/res/values-sv/strings.xml2
-rw-r--r--main/res/values/strings.xml2
-rw-r--r--main/src/cgeo/geocaching/AbstractLoggingActivity.java4
-rw-r--r--main/src/cgeo/geocaching/AbstractPopupActivity.java9
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java5
-rw-r--r--main/src/cgeo/geocaching/CachePopup.java2
-rw-r--r--main/src/cgeo/geocaching/EditWaypointActivity.java6
-rw-r--r--main/src/cgeo/geocaching/ImageSelectActivity.java4
-rw-r--r--main/src/cgeo/geocaching/LogTrackableActivity.java4
-rw-r--r--main/src/cgeo/geocaching/MainActivity.java27
-rw-r--r--main/src/cgeo/geocaching/NavigateAnyPointActivity.java4
-rw-r--r--main/src/cgeo/geocaching/SearchActivity.java4
-rw-r--r--main/src/cgeo/geocaching/SettingsActivity.java4
-rw-r--r--main/src/cgeo/geocaching/TrackableActivity.java4
-rw-r--r--main/src/cgeo/geocaching/UsefulAppsActivity.java13
-rw-r--r--main/src/cgeo/geocaching/VisitCacheActivity.java4
-rw-r--r--main/src/cgeo/geocaching/WaypointPopup.java2
-rw-r--r--main/src/cgeo/geocaching/activity/AbstractActivity.java16
-rw-r--r--main/src/cgeo/geocaching/activity/AbstractListActivity.java13
-rw-r--r--main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java4
-rw-r--r--main/src/cgeo/geocaching/activity/ActivityMixin.java18
-rw-r--r--main/src/cgeo/geocaching/activity/IAbstractActivity.java2
-rw-r--r--main/src/cgeo/geocaching/cgeocaches.java16
-rw-r--r--main/src/cgeo/geocaching/cgeonavigate.java2
-rw-r--r--main/src/cgeo/geocaching/maps/AbstractMap.java2
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java6
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java6
-rw-r--r--main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java2
-rw-r--r--main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java6
-rw-r--r--main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java6
-rw-r--r--main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java8
-rw-r--r--main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java375
69 files changed, 32 insertions, 706 deletions
diff --git a/main/res/drawable-hdpi/actionbar_manual.png b/main/res/drawable-hdpi/actionbar_manual.png
deleted file mode 100644
index 0b0c93c..0000000
--- a/main/res/drawable-hdpi/actionbar_manual.png
+++ /dev/null
Binary files differ
diff --git a/main/res/drawable-ldpi/actionbar_manual.png b/main/res/drawable-ldpi/actionbar_manual.png
deleted file mode 100644
index 14af11d..0000000
--- a/main/res/drawable-ldpi/actionbar_manual.png
+++ /dev/null
Binary files differ
diff --git a/main/res/drawable-mdpi/actionbar_manual.png b/main/res/drawable-mdpi/actionbar_manual.png
deleted file mode 100644
index a71acb3..0000000
--- a/main/res/drawable-mdpi/actionbar_manual.png
+++ /dev/null
Binary files differ
diff --git a/main/res/drawable-mdpi/helper_manual.png b/main/res/drawable-mdpi/helper_manual.png
deleted file mode 100644
index c3c43db..0000000
--- a/main/res/drawable-mdpi/helper_manual.png
+++ /dev/null
Binary files differ
diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coords.xml
index 30cc6b5..88e5e76 100644
--- a/main/res/layout-land/coords.xml
+++ b/main/res/layout-land/coords.xml
@@ -10,8 +10,6 @@
<TextView
style="@style/action_bar_title"
android:text="@string/cache_coordinates" />
-
- <include layout="@layout/actionbar_button_manual"/>
</LinearLayout>
<ScrollView
diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml
index d2f39b1..5965128 100644
--- a/main/res/layout-land/navigate.xml
+++ b/main/res/layout-land/navigate.xml
@@ -5,7 +5,7 @@
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual" />
+ <include layout="@layout/actionbar" />
<LinearLayout
android:layout_width="fill_parent"
diff --git a/main/res/layout/actionbar_button_manual.xml b/main/res/layout/actionbar_button_manual.xml
deleted file mode 100644
index 86965f1..0000000
--- a/main/res/layout/actionbar_button_manual.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <View style="@style/action_bar_separator" />
-
- <ImageView
- android:id="@+id/action_bar_manual"
- style="@style/action_bar_action"
- android:onClick="goManual"
- android:src="@drawable/actionbar_manual" />
-
-</merge> \ No newline at end of file
diff --git a/main/res/layout/actionbar_with_manual.xml b/main/res/layout/actionbar_with_manual.xml
deleted file mode 100644
index d56c14e..0000000
--- a/main/res/layout/actionbar_with_manual.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/action_bar" >
-
- <include layout="@layout/actionbar_title"/>
-
- <include layout="@layout/actionbar_button_manual"/>
-
-</LinearLayout> \ No newline at end of file
diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml
index dea9357..5c3abbc 100644
--- a/main/res/layout/caches.xml
+++ b/main/res/layout/caches.xml
@@ -7,12 +7,10 @@
<LinearLayout style="@style/action_bar" >
<include layout="@layout/actionbar_title" />
-
+
<include layout="@layout/actionbar_progress" />
-
- <include layout="@layout/actionbar_button_map" />
- <include layout="@layout/actionbar_button_manual" />
+ <include layout="@layout/actionbar_button_map" />
</LinearLayout>
<include layout="@layout/filter_bar" />
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
index ec30672..44765dc 100644
--- a/main/res/layout/cacheview.xml
+++ b/main/res/layout/cacheview.xml
@@ -11,8 +11,6 @@
<include layout="@layout/actionbar_title" />
<include layout="@layout/actionbar_button_compass" />
-
- <include layout="@layout/actionbar_button_manual" />
</LinearLayout>
<android.support.v4.view.ViewPager
diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index 229cffe..6da453e 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual"/>
+ <include layout="@layout/actionbar" />
<ScrollView
android:id="@+id/scroller"
diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml
index c2751d1..657e9f4 100644
--- a/main/res/layout/edit_waypoint_activity.xml
+++ b/main/res/layout/edit_waypoint_activity.xml
@@ -5,7 +5,7 @@
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual"/>
+ <include layout="@layout/actionbar" />
<ScrollView
android:layout_width="fill_parent"
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index c948629..ab38fb6 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -5,7 +5,7 @@
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual" />
+ <include layout="@layout/actionbar" />
<ScrollView
android:layout_width="fill_parent"
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml
index e4aa9cc..e90cd37 100644
--- a/main/res/layout/main.xml
+++ b/main/res/layout/main.xml
@@ -13,9 +13,7 @@
<TextView style="@style/action_bar_title" />
- <include layout="@layout/actionbar_button_search"/>
-
- <include layout="@layout/actionbar_button_manual"/>
+ <include layout="@layout/actionbar_button_search" />
</LinearLayout>
<fragment
@@ -168,41 +166,6 @@
</LinearLayout>
<!-- ** -->
- <RelativeLayout
- android:id="@+id/helper"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="64dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:background="@drawable/helper_bcg"
- android:visibility="gone" >
-
- <ImageView
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_alignParentLeft="true"
- android:layout_gravity="center"
- android:layout_margin="4dip"
- android:gravity="center"
- android:scaleType="center"
- android:src="@drawable/actionbar_manual" />
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_gravity="center"
- android:layout_marginLeft="34dip"
- android:gravity="center"
- android:padding="4dip"
- android:text="@string/helper"
- android:textColor="@color/text_icon"
- android:textSize="14dip" />
- </RelativeLayout>
- <!-- ** -->
-
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml
index 7b116c9..3e460ef 100644
--- a/main/res/layout/map_google.xml
+++ b/main/res/layout/map_google.xml
@@ -6,13 +6,11 @@
<LinearLayout style="@style/action_bar" >
- <include layout="@layout/actionbar_title"/>
+ <include layout="@layout/actionbar_title" />
<include layout="@layout/actionbar_progress" />
- <include layout="@layout/actionbar_button_myposition"/>
-
- <include layout="@layout/actionbar_button_manual"/>
+ <include layout="@layout/actionbar_button_myposition" />
</LinearLayout>
<include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml
index 27d6e0d..1833da3 100644
--- a/main/res/layout/map_mapsforge.xml
+++ b/main/res/layout/map_mapsforge.xml
@@ -6,13 +6,11 @@
<LinearLayout style="@style/action_bar" >
- <include layout="@layout/actionbar_title"/>
+ <include layout="@layout/actionbar_title" />
<include layout="@layout/actionbar_progress" />
- <include layout="@layout/actionbar_button_myposition"/>
-
- <include layout="@layout/actionbar_button_manual"/>
+ <include layout="@layout/actionbar_button_myposition" />
</LinearLayout>
<include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml
index f2cb175..6ca98e1 100644
--- a/main/res/layout/map_mapsforge_old.xml
+++ b/main/res/layout/map_mapsforge_old.xml
@@ -6,13 +6,11 @@
<LinearLayout style="@style/action_bar" >
- <include layout="@layout/actionbar_title"/>
+ <include layout="@layout/actionbar_title" />
<include layout="@layout/actionbar_progress" />
- <include layout="@layout/actionbar_button_myposition"/>
-
- <include layout="@layout/actionbar_button_manual"/>
+ <include layout="@layout/actionbar_button_myposition" />
</LinearLayout>
<include layout="@layout/filter_bar" />
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 4486884..ae51735 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -5,8 +5,6 @@
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual" />
-
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml
index 5297d6d..baa568c 100644
--- a/main/res/layout/point.xml
+++ b/main/res/layout/point.xml
@@ -5,7 +5,7 @@
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual" />
+ <include layout="@layout/actionbar" />
<ListView
android:id="@+id/historyList"
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index 97c1367..15e4248 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -10,10 +10,8 @@
<TextView
android:id="@+id/actionbar_title"
style="@style/action_bar_title" />
-
- <include layout="@layout/actionbar_button_compass"/>
-
- <include layout="@layout/actionbar_button_manual"/>
+
+ <include layout="@layout/actionbar_button_compass" />
</LinearLayout>
<ScrollView
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index 449ad5d..a0a699d 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -6,7 +6,7 @@
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual" />
+ <include layout="@layout/actionbar" />
<ScrollView
android:layout_width="fill_parent"
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index 17553d1..61778ce 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -7,11 +7,9 @@
<LinearLayout style="@style/action_bar" >
- <include layout="@layout/actionbar_title"/>
+ <include layout="@layout/actionbar_title" />
<include layout="@layout/actionbar_progress" />
-
- <include layout="@layout/actionbar_button_manual"/>
</LinearLayout>
<ScrollView
diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml
index f0176fc..bcfb42d 100644
--- a/main/res/layout/trackable_activity.xml
+++ b/main/res/layout/trackable_activity.xml
@@ -6,7 +6,7 @@
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar_with_manual" />
+ <include layout="@layout/actionbar" />
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
index ed32d25..7ffd630 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/visit.xml
@@ -7,11 +7,9 @@
<LinearLayout style="@style/action_bar" >
- <include layout="@layout/actionbar_title"/>
+ <include layout="@layout/actionbar_title" />
<include layout="@layout/actionbar_progress" />
-
- <include layout="@layout/actionbar_button_manual"/>
</LinearLayout>
<ScrollView
diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml
index d39d5ae..fd8eaea 100644
--- a/main/res/layout/visit_image.xml
+++ b/main/res/layout/visit_image.xml
@@ -7,11 +7,9 @@
<LinearLayout style="@style/action_bar" >
- <include layout="@layout/actionbar_title"/>
+ <include layout="@layout/actionbar_title" />
<include layout="@layout/actionbar_progress" />
-
- <include layout="@layout/actionbar_button_manual"/>
</LinearLayout>
<ScrollView
@@ -89,9 +87,9 @@
android:id="@+id/logImageScale"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:prompt="@string/log_image_scale"
- android:entries="@array/log_image_scales"/>
-
+ android:entries="@array/log_image_scales"
+ android:prompt="@string/log_image_scale" />
+
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index c2b2af8..b3806aa 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -11,9 +11,7 @@
android:id="@+id/actionbar_title"
style="@style/action_bar_title" />
- <include layout="@layout/actionbar_button_compass"/>
-
- <include layout="@layout/actionbar_button_manual"/>
+ <include layout="@layout/actionbar_button_compass" />
</LinearLayout>
<ScrollView
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index ac75564..b5df662 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -819,8 +819,6 @@
<string name="license_dismiss">Zamítnout</string>
<!-- helpers -->
- <string name="helper_manual_title">Manuál</string>
- <string name="helper_manual_description">Komplexní příručka aplikace c:geo obsahující popis všech možností této aplikace (včetně těch skrytých).</string>
<string name="helper_calendar_title">c:geo modul kalendáře</string>
<string name="helper_calendar_missing">c:geo modul kalendáře není nainstalován.</string>
<string name="helper_calendar_description">Umožňuje exportovat události keší do tvého kalendáře.</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 26fd2d3..5d19848 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -813,8 +813,6 @@
<string name="license_dismiss">Ablehnen</string>
<!-- helpers -->
- <string name="helper_manual_title">Anleitung</string>
- <string name="helper_manual_description">Umfangreiche Anleitung für c:geo mit Beschreibung aller Möglichkeiten dieser App (auch versteckte).</string>
<string name="helper_calendar_title">c:geo Kalender Add-on</string>
<string name="helper_calendar_missing">c:geo Kalender Add-on nicht installiert</string>
<string name="helper_calendar_description">Ermöglicht die Übernahme von Event-Caches in den Kalender.</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index f029d9b..b618fb9 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -627,8 +627,6 @@
<string name="license_dismiss">Descartar</string>
<!-- helpers -->
- <string name="helper_manual_title">Manual</string>
- <string name="helper_manual_description">Sencillo manual de c:geo que contiene todas las capacidades de este programa (incluidas las ocultas).</string>
<string name="helper_locus_title">Locus</string>
<string name="helper_locus_description">Sencilla aplicación que muestra mapas en línea y permite descargarlos para ser usados sin conexión (sólo mapas no vectoriales). También permite registrar el recorrido, gestionar puntos de interés y más funciones interesantes.</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index a0f86e6..2f5fccb 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -817,8 +817,6 @@
<string name="license_dismiss">Rejeter</string>
<!-- helpers -->
- <string name="helper_manual_title">Manuel</string>
- <string name="helper_manual_description">Manuel complet pour c:geo contenant la description de toutes les fonctionnalités de cette application (y compris celle secrètes).</string>
<string name="helper_calendar_title">Module supplémentaire c:geo agenda</string>
<string name="helper_calendar_missing">Module supplémentaire c:geo agenda non installé</string>
<string name="helper_calendar_description">Permet d\'exporter les événements liés aux caches dans le calendrier Android.</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index e7018f9..689912c 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -759,8 +759,6 @@
<string name="license_dismiss">Elutasítás</string>
<!-- helpers -->
- <string name="helper_manual_title">Kézikönyv</string>
- <string name="helper_manual_description">Részletes kézikönyv a c:geo-hoz amiben az összes lehetőség leírása szerepel. (még a rejtettek is).</string>
<string name="helper_calendar_title">c:geo naptár add-on</string>
<string name="helper_calendar_missing">c:geo naptár add-on nincs telepítve.</string>
<string name="helper_calendar_description">Lehetővé teszi a geoládák exportálását az eszközöd naptárába.</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 9614526..a36493d 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -816,8 +816,6 @@
<string name="license_dismiss">Chiudi</string>
<!-- helpers -->
- <string name="helper_manual_title">Manual</string>
- <string name="helper_manual_description">Manuale dettagliato di c:geo che contiene la descrizione di tutte le possibilità offerte da questa applicazione, comprese quelle nascoste (in inglese).</string>
<string name="helper_calendar_title">c:geo calendario add-on</string>
<string name="helper_calendar_missing">c:geo calendario add-on non installato</string>
<string name="helper_calendar_description">Permette di esportare gli eventi cache nel calendario del tuo dispositivo.</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 5d7759e..42f16be 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -793,8 +793,6 @@
<string name="license_dismiss">閉じる</string>
<!-- helpers -->
- <string name="helper_manual_title">マニュアル</string>
- <string name="helper_manual_description">c:geoのマニュアル(英語)はこのアプリでできる事(隠れ機能も)の全てについて書いてあります。</string>
<string name="helper_calendar_title">c:geo - カレンダープラグイン</string>
<string name="helper_calendar_missing">c:geo - カレンダープラグインはインストールされていません。</string>
<string name="helper_calendar_description">イベントキャッシュをカレンダーアプリに登録することができます。</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 8ce95a5..f4dbd10 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -801,8 +801,6 @@
<string name="license_dismiss">Afwijzen</string>
<!-- helpers -->
- <string name="helper_manual_title">Handleiding</string>
- <string name="helper_manual_description">Uitgebreide handleiding voor c:geo welke alle mogelijkheden van deze applicatie uitlegt (ook de verborgen mogelijkheden).</string>
<string name="helper_calendar_title">c:geo kalender add-on</string>
<string name="helper_calendar_missing">c:geo kalender add-on niet geinstalleerd.</string>
<string name="helper_calendar_description">Maakt het mogelijk om Geocaching events in je kalender op te slaan.</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index b4fbca7..1752d03 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -781,8 +781,6 @@
<string name="license_dismiss">Odmów</string>
<!-- helpers -->
- <string name="helper_manual_title">Instrukcja obsługi</string>
- <string name="helper_manual_description">Obszerny przewodnik do c:geo wraz z opisem wszystkich możliwości tego programu (także ukrytych).</string>
<string name="helper_calendar_title">Dodatek Kalendarz c:geo</string>
<string name="helper_calendar_missing">Dodatek Kalendarz c:geo nie jest zainstalowany.</string>
<string name="helper_calendar_description">Umożliwia Tobie eksport skrzynek Wydarzenie do kalendarza w Twoim urządzeniu.</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index e4bcfd4..5916133 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -763,8 +763,6 @@
<string name="license_dismiss">Dispensar</string>
<!-- helpers -->
- <string name="helper_manual_title">Manual</string>
- <string name="helper_manual_description">Manual prático do c:geo, que contém a descrição de todas as funcionalidades desta aplicação (mesmo as que estão escondidas).</string>
<string name="helper_calendar_title">Add on calendário para c:geo </string>
<string name="helper_calendar_missing">Add on calendário para o c:geo não está instalado.</string>
<string name="helper_calendar_description">Permite exportar caches evento para o calendário do seu dispositivo.</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 616bd44..af796ba 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -764,8 +764,6 @@
<string name="license_dismiss">Zamietnutie</string>
<!-- helpers -->
- <string name="helper_manual_title">Manuál</string>
- <string name="helper_manual_description">Obsiahly manuál pre c:geo, ktorý obsahuje popisy všetkých možností tejto aplikácie (dokonca i skrytých).</string>
<string name="helper_calendar_title">Doplnok c:geo calendar</string>
<string name="helper_calendar_missing">Doplnok c:geo calendar nie je nainštalovaný</string>
<string name="helper_calendar_description">Umožní vám exportovať skrýše udalostí do kalendára na vašom zariadení.</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 0f23eed..0171288 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -816,8 +816,6 @@
<string name="license_dismiss">Avbryt</string>
<!-- helpers -->
- <string name="helper_manual_title">Manual</string>
- <string name="helper_manual_description">En utförlig manual för c:geo som beskriver alla möjligheter och ger en hel del tips. Manualen finns enbart på engelska.</string>
<string name="helper_calendar_title">c:geo kalendertillägg</string>
<string name="helper_calendar_missing">c:geo kalendertillägg är inte installerat</string>
<string name="helper_calendar_description">Gör det möjligt att exportera event till din kalender.</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 42abb8f..b537b74 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -827,8 +827,6 @@
<string name="license_dismiss">Dismiss</string>
<!-- helpers -->
- <string name="helper_manual_title">Manual</string>
- <string name="helper_manual_description">Comprehensive manual for c:geo that contains description of all possibilities of this application (even hidden ones).</string>
<string name="helper_calendar_title">c:geo calendar add-on</string>
<string name="helper_calendar_missing">c:geo calendar add-on not installed.</string>
<string name="helper_calendar_description">Enables you to export event caches into the calendar on your device.</string>
diff --git a/main/src/cgeo/geocaching/AbstractLoggingActivity.java b/main/src/cgeo/geocaching/AbstractLoggingActivity.java
index 37c3643..3e66d5e 100644
--- a/main/src/cgeo/geocaching/AbstractLoggingActivity.java
+++ b/main/src/cgeo/geocaching/AbstractLoggingActivity.java
@@ -20,10 +20,6 @@ public abstract class AbstractLoggingActivity extends AbstractActivity {
private static final int MENU_SIGNATURE = 1;
private static final int MENU_SMILEY = 2;
- protected AbstractLoggingActivity(String helpTopic) {
- super(helpTopic);
- }
-
@Override
public boolean onCreateOptionsMenu(final Menu menu) {
// signature menu
diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 5ad89fb..4dd9fd1 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -83,8 +83,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
public void onUpdateGeoData(final IGeoData geo) {
}
- protected AbstractPopupActivity(String helpTopic, int layout) {
- super(helpTopic);
+ protected AbstractPopupActivity(int layout) {
this.layout = layout;
}
@@ -112,12 +111,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
}).start();
}
- @Override
- public void goManual(View view) {
- super.goManual(view);
- finish();
- }
-
protected void init() {
cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 1e2377b..fe17c06 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -192,11 +192,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
};
protected ImagesList imagesList;
- public CacheDetailActivity() {
- // identifier for manual
- super("c:geolocation-cache-details");
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.cacheview);
diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index d51f9f2..4df428e 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -65,7 +65,7 @@ public class CachePopup extends AbstractPopupActivity {
}
public CachePopup() {
- super("c:geo-cache-info", R.layout.popup);
+ super(R.layout.popup);
}
@Override
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index b937ba0..f4b3d09 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -3,7 +3,6 @@ package cgeo.geocaching;
import butterknife.InjectView;
import cgeo.geocaching.activity.AbstractActivity;
-import cgeo.geocaching.activity.ActivityMixin;
import cgeo.geocaching.connector.ConnectorFactory;
import cgeo.geocaching.connector.IConnector;
import cgeo.geocaching.enumerations.CacheType;
@@ -537,11 +536,6 @@ public class EditWaypointActivity extends AbstractActivity {
return con.supportsOwnCoordinates() && con.uploadModifiedCoordinates(cache, waypointUploaded);
}
- @Override
- public void goManual(final View view) {
- ActivityMixin.goManual(this, id >= 0 ? "c:geo-waypoint-edit" : "c:geo-waypoint-new");
- }
-
public static void startActivityEditWaypoint(final Context context, final int waypointId) {
context.startActivity(new Intent(context, EditWaypointActivity.class)
.putExtra(Intents.EXTRA_WAYPOINT_ID, waypointId));
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index 7c8df5a..4abf310 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -53,10 +53,6 @@ public class ImageSelectActivity extends AbstractActivity {
private int scaleChoiceIndex;
private Uri imageUri;
- public ImageSelectActivity() {
- super("c:geo-selectimage");
- }
-
@Override
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.visit_image);
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 6b68225..7aee6ae 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -104,10 +104,6 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
}
};
- public LogTrackableActivity() {
- super("c:geo-log-trackable");
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.touch);
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 0843f66..cd573ba 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -4,7 +4,6 @@ import butterknife.InjectView;
import butterknife.Views;
import cgeo.geocaching.activity.AbstractActivity;
-import cgeo.geocaching.activity.ActivityMixin;
import cgeo.geocaching.connector.gc.Login;
import cgeo.geocaching.enumerations.CacheType;
import cgeo.geocaching.enumerations.StatusCode;
@@ -38,7 +37,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
-import android.widget.RelativeLayout;
import android.widget.TextView;
import java.util.ArrayList;
@@ -51,7 +49,6 @@ import java.util.Locale;
public class MainActivity extends AbstractActivity {
@InjectView(R.id.user_info) protected TextView userInfoView;
@InjectView(R.id.nav_satellites) protected TextView navSatellites;
- @InjectView(R.id.helper) protected RelativeLayout helper;
@InjectView(R.id.filter_button_title)protected TextView filterTitle;
@InjectView(R.id.map) protected View findOnMap;
@InjectView(R.id.search_offline) protected View findByOffline;
@@ -181,10 +178,6 @@ public class MainActivity extends AbstractActivity {
}
};
- public MainActivity() {
- super("c:geo-main-screen");
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
// don't call the super implementation with the layout argument, as that would set the wrong theme
@@ -203,26 +196,6 @@ public class MainActivity extends AbstractActivity {
version = Version.getVersionCode(this);
Log.i("Starting " + getPackageName() + ' ' + version + " a.k.a " + Version.getVersionName(this));
- try {
- if (!Settings.isHelpShown()) {
- if (helper != null) {
- helper.setVisibility(View.VISIBLE);
- helper.setClickable(true);
- helper.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View view) {
- ActivityMixin.goManual(MainActivity.this, "c:geo-intro");
- view.setVisibility(View.GONE);
- }
- });
- Settings.setHelpShown();
- }
- }
- } catch (Exception e) {
- // nothing
- }
-
init();
}
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index 746842d..fbd2f1b 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -102,10 +102,6 @@ public class NavigateAnyPointActivity extends AbstractActivity {
String distanceUnit = "";
- public NavigateAnyPointActivity() {
- super("c:geo-navigate-any");
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.point);
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index a3a0797..9c7e54e 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -37,10 +37,6 @@ public class SearchActivity extends AbstractActivity {
private EditText latEdit = null;
private EditText lonEdit = null;
- public SearchActivity() {
- super("c:geo-search");
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index d094358..bd99552 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -123,10 +123,6 @@ public class SettingsActivity extends AbstractActivity {
}
};
- public SettingsActivity() {
- super("c:geo-configuration");
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.init);
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 9f71f69..e5468f3 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -108,10 +108,6 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
}
};
- public TrackableActivity() {
- super("c:geo-trackable-details");
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.trackable_activity);
diff --git a/main/src/cgeo/geocaching/UsefulAppsActivity.java b/main/src/cgeo/geocaching/UsefulAppsActivity.java
index ce8bbdd..b12c5e0 100644
--- a/main/src/cgeo/geocaching/UsefulAppsActivity.java
+++ b/main/src/cgeo/geocaching/UsefulAppsActivity.java
@@ -13,8 +13,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import java.util.Locale;
-
public class UsefulAppsActivity extends AbstractActivity {
@InjectView(R.id.parent) protected LinearLayout parentLayout;
@@ -23,17 +21,6 @@ public class UsefulAppsActivity extends AbstractActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.useful_apps);
- final Locale loc = Locale.getDefault();
- final String language = loc.getLanguage();
-
- final String tutorialUrl;
- if ("de".equalsIgnoreCase(language)) {
- tutorialUrl = "gnu.android.app.cgeomanual.de";
- }
- else {
- tutorialUrl = "gnu.android.app.cgeomanual.en";
- }
- addApp(R.string.helper_manual_title, R.string.helper_manual_description, R.drawable.helper_manual, tutorialUrl);
addApp(R.string.helper_calendar_title, R.string.helper_calendar_description, R.drawable.cgeo, "cgeo.calendar");
addApp(R.string.helper_locus_title, R.string.helper_locus_description, R.drawable.helper_locus, "menion.android.locus");
addApp(R.string.helper_gpsstatus_title, R.string.helper_gpsstatus_description, R.drawable.helper_gpsstatus, "com.eclipsim.gpsstatus2");
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 28c8440..7c2d1ce 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -237,10 +237,6 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
return res.getString(R.string.log_post_rate) + " " + ratingTextValue(rating) + "*";
}
- public VisitCacheActivity() {
- super("c:geo-log");
- }
-
@Override
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.visit);
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index 43a758f..ad1d981 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -23,7 +23,7 @@ public class WaypointPopup extends AbstractPopupActivity {
private TextView waypointDistance = null;
public WaypointPopup() {
- super("c:geo-waypoint-info", R.layout.waypoint_popup);
+ super(R.layout.waypoint_popup);
}
@Override
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index ad65ca3..964ef96 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -16,22 +16,15 @@ import android.widget.EditText;
public abstract class AbstractActivity extends FragmentActivity implements IAbstractActivity {
- final private String helpTopic;
-
protected cgeoapplication app = null;
protected Resources res = null;
private boolean keepScreenOn = false;
protected AbstractActivity() {
- this(null);
- }
-
- protected AbstractActivity(final String helpTopic) {
- this.helpTopic = helpTopic;
+ this(false);
}
- protected AbstractActivity(final String helpTopic, final boolean keepScreenOn) {
- this(helpTopic);
+ protected AbstractActivity(final boolean keepScreenOn) {
this.keepScreenOn = keepScreenOn;
}
@@ -40,11 +33,6 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
ActivityMixin.goHome(this);
}
- @Override
- public void goManual(final View view) {
- ActivityMixin.goManual(this, helpTopic);
- }
-
final protected void setTitle(final String title) {
ActivityMixin.setTitle(this, title);
}
diff --git a/main/src/cgeo/geocaching/activity/AbstractListActivity.java b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
index ead47bd..47c747f 100644
--- a/main/src/cgeo/geocaching/activity/AbstractListActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
@@ -12,35 +12,24 @@ import android.view.View;
public abstract class AbstractListActivity extends FragmentListActivity implements
IAbstractActivity {
- private String helpTopic;
private boolean keepScreenOn = false;
protected cgeoapplication app = null;
protected Resources res = null;
protected AbstractListActivity() {
- this(null);
+ this(false);
}
protected AbstractListActivity(final boolean keepScreenOn) {
- this(null);
this.keepScreenOn = keepScreenOn;
}
- protected AbstractListActivity(final String helpTopic) {
- this.helpTopic = helpTopic;
- }
-
@Override
final public void goHome(View view) {
ActivityMixin.goHome(this);
}
- @Override
- public void goManual(View view) {
- ActivityMixin.goManual(this, helpTopic);
- }
-
final public void showProgress(final boolean show) {
ActivityMixin.showProgress(this, show);
}
diff --git a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
index 366a59d..8793c1c 100644
--- a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
@@ -29,10 +29,6 @@ import java.util.Map;
*/
public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends AbstractActivity {
- protected AbstractViewPagerActivity(String helpTopic) {
- super(helpTopic);
- }
-
/**
* A {@link List} of all available pages.
*
diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java
index bc524ec..12ab0be 100644
--- a/main/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
import android.app.Activity;
import android.app.AlertDialog;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Drawable;
@@ -21,8 +20,6 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
-import gnu.android.app.appmanualclient.AppManualReaderClient;
-
public final class ActivityMixin {
public final static void goHome(final Activity fromActivity) {
@@ -33,21 +30,6 @@ public final class ActivityMixin {
fromActivity.finish();
}
- public static void goManual(final Context context, final String helpTopic) {
- if (StringUtils.isBlank(helpTopic)) {
- return;
- }
- try {
- AppManualReaderClient.openManual(
- "c-geo",
- helpTopic,
- context,
- "http://manual.cgeo.org/");
- } catch (Exception e) {
- // nothing
- }
- }
-
public static void setTitle(final Activity activity, final CharSequence text) {
if (StringUtils.isBlank(text)) {
return;
diff --git a/main/src/cgeo/geocaching/activity/IAbstractActivity.java b/main/src/cgeo/geocaching/activity/IAbstractActivity.java
index 04709c6..61c218b 100644
--- a/main/src/cgeo/geocaching/activity/IAbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/IAbstractActivity.java
@@ -6,8 +6,6 @@ public interface IAbstractActivity {
public void goHome(View view);
- public void goManual(View view);
-
public void showToast(String text);
public void showShortToast(String text);
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 811425c..33dea8f 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -2,7 +2,6 @@ package cgeo.geocaching;
import cgeo.geocaching.activity.AbstractActivity;
import cgeo.geocaching.activity.AbstractListActivity;
-import cgeo.geocaching.activity.ActivityMixin;
import cgeo.geocaching.activity.FilteredActivity;
import cgeo.geocaching.activity.Progress;
import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
@@ -1574,21 +1573,6 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
CGeoMap.startActivitySearch(this, searchToUse, mapTitle);
}
- @Override
- public void goManual(View view) {
- switch (type) {
- case OFFLINE:
- ActivityMixin.goManual(this, "c:geo-stored");
- break;
- case HISTORY:
- ActivityMixin.goManual(this, "c:geo-history");
- break;
- default:
- ActivityMixin.goManual(this, "c:geo-nearby");
- break;
- }
- }
-
private void refreshCurrentList() {
switchListById(listId);
}
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index b5205a6..679e2f2 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -47,7 +47,7 @@ public class cgeonavigate extends AbstractActivity {
private CompassView compassView = null;
public cgeonavigate() {
- super("c:geo-compass", true);
+ super(true);
}
@Override
diff --git a/main/src/cgeo/geocaching/maps/AbstractMap.java b/main/src/cgeo/geocaching/maps/AbstractMap.java
index c028e51..d9ee751 100644
--- a/main/src/cgeo/geocaching/maps/AbstractMap.java
+++ b/main/src/cgeo/geocaching/maps/AbstractMap.java
@@ -63,8 +63,6 @@ public abstract class AbstractMap {
public abstract void goHome(View view);
- public abstract void goManual(View view);
-
public abstract void onSaveInstanceState(final Bundle outState);
}
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 111f384..436fcce 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -1576,12 +1576,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
ActivityMixin.goHome(activity);
}
- // open manual entry
- @Override
- public void goManual(View view) {
- ActivityMixin.goManual(activity, "c:geo-live-map");
- }
-
@Override
public View makeView() {
ImageView imageView = new ImageView(activity);
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
index 5649d19..a98241f 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
@@ -122,12 +122,6 @@ public class GoogleMapActivity extends MapActivity implements MapActivityImpl, F
mapBase.goHome(view);
}
- // open manual entry
- @Override
- public void goManual(View view) {
- mapBase.goManual(view);
- }
-
@Override
public void showFilterMenu(View view) {
// do nothing, the filter bar only shows the global filter
diff --git a/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java b/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java
index dc7dca5..e7deebd 100644
--- a/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java
+++ b/main/src/cgeo/geocaching/maps/interfaces/MapActivityImpl.java
@@ -35,6 +35,4 @@ public interface MapActivityImpl {
public abstract void goHome(View view);
- public abstract void goManual(View view);
-
}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
index f850402..a0384b8 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
@@ -117,12 +117,6 @@ public class MapsforgeMapActivity extends MapActivity implements MapActivityImpl
mapBase.goHome(view);
}
- // open manual entry
- @Override
- public void goManual(View view) {
- mapBase.goManual(view);
- }
-
@Override
public void showFilterMenu(View view) {
// do nothing, the filter bar only shows the global filter
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
index ed8a7bc..33ed30e 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapActivity024.java
@@ -117,12 +117,6 @@ public class MapsforgeMapActivity024 extends MapActivity implements MapActivityI
mapBase.goHome(view);
}
- // open manual entry
- @Override
- public void goManual(View view) {
- mapBase.goManual(view);
- }
-
@Override
public void showFilterMenu(View view) {
// do nothing, the filter bar only shows the global filter
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index 63a9b09..3d93a56 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -74,14 +74,6 @@ public class CoordinatesInputDialog extends Dialog {
setContentView(R.layout.coords);
- findViewById(R.id.action_bar_manual).setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View view) {
- ActivityMixin.goManual(context, "c:geo-geocoordinate-input");
- }
- });
-
final Spinner spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats);
final ArrayAdapter<CharSequence> adapter =
ArrayAdapter.createFromResource(context,
diff --git a/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java b/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java
deleted file mode 100644
index af4c03e..0000000
--- a/main/thirdparty/gnu/android/app/appmanualclient/AppManualReaderClient.java
+++ /dev/null
@@ -1,375 +0,0 @@
-package gnu.android.app.appmanualclient;
-
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * The "App Manual Reader" client is a class to be used in applications which
- * want to offer their users manuals through the gnu.android.appmanualreader
- * application. Such applications do not need to include the whole
- * "App Manual Reader" app but instead just have to include only this little
- * package. This package then provides the mechanism to open suitable installed
- * manuals. It does not include any manuals itself.
- * <p>
- *
- * (c) 2011 Geocrasher (geocrasher@gmx.eu)
- * <p>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- * <p>
- *
- * 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 Lesser General Public License for more
- * details.
- * <p>
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- * @author Geocrasher
- */
-public class AppManualReaderClient {
-
- /**
- * The URI scheme used to identify application manual URIs when flinging
- * Intents around within an Android device, in the hope that there are
- * activities registered which will handle such application manual URIs.
- * Usually, there won't be just a single activity registered but instead
- * many, depending on how many manuals are installed on an Android device.
- */
- public static final String URI_SCHEME_APPMANUAL = "appmanual";
-
- /**
- * Standardized topic for opening a manual at its beginning.
- *
- * @see #openManual(String, String, Context)
- * @see #openManual(String, String, Context, String)
- */
- public static final String TOPIC_HOME = "andtw-home";
- /**
- * Standardized topic for opening the index of a manual.
- *
- * @see #openManual(String, String, Context)
- * @see #openManual(String, String, Context, String)
- */
- public static final String TOPIC_INDEX = "andtw-index";
- /**
- * Standardized topic for opening a manual's "about" topic.
- *
- * @see #openManual(String, String, Context)
- * @see #openManual(String, String, Context, String)
- */
- public static final String TOPIC_ABOUT_MANUAL = "andtw-about";
-
- /**
- * Convenience function to open a manual at a specific topic. See
- * {@link #openManual(String, String, Context, String)} for a detailed
- * description.
- *
- * @param manualIdentifier
- * the identifier of the manual to open. This identifier must
- * uniquely identify the manual as such, independent of the
- * particular locale the manual is intended for.
- * @param topic
- * the topic to open. Please do not use spaces for topic names.
- * With respect to the TiddlyWiki infrastructure used for manuals
- * the topic needs to the tag of a (single) tiddler. This way
- * manuals can be localized (especially their topic titles)
- * without breaking an app's knowledge about topics. Some
- * standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
- * {@link #TOPIC_ABOUT_MANUAL}.
- * @param context
- * the context (usually an Activity) from which the manual is to
- * be opened. In particular, this context is required to derive
- * the proper current locale configuration in order to open
- * appropriate localized manuals, if installed.
- *
- * @exception ActivityNotFoundException
- * there is no suitable manual installed and all combinations
- * of locale scope failed to activate any manual.
- *
- * @see #openManual(String, String, Context, String, boolean)
- */
- public static void openManual(String manualIdentifier, String topic,
- Context context) throws ActivityNotFoundException {
- openManual(manualIdentifier, topic, context, null, false);
- }
-
- /**
- * Convenience function to open a manual at a specific topic. See
- * {@link #openManual(String, String, Context, String)} for a detailed
- * description.
- *
- * @param manualIdentifier
- * the identifier of the manual to open. This identifier must
- * uniquely identify the manual as such, independent of the
- * particular locale the manual is intended for.
- * @param topic
- * the topic to open. Please do not use spaces for topic names.
- * With respect to the TiddlyWiki infrastructure used for manuals
- * the topic needs to the tag of a (single) tiddler. This way
- * manuals can be localized (especially their topic titles)
- * without breaking an app's knowledge about topics. Some
- * standardized topics are predefined, such as {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
- * {@link #TOPIC_ABOUT_MANUAL}.
- * @param context
- * the context (usually an Activity) from which the manual is to
- * be opened. In particular, this context is required to derive
- * the proper current locale configuration in order to open
- * appropriate localized manuals, if installed.
- * @param fallbackUri
- * either <code>null</code> or a fallback URI to be used in case
- * the user has not installed any suitable manual.
- *
- * @exception ActivityNotFoundException
- * there is no suitable manual installed and all combinations
- * of locale scope failed to activate any manual.
- *
- * @see #openManual(String, String, Context, String, boolean)
- */
- public static void openManual(String manualIdentifier, String topic,
- Context context, String fallbackUri)
- throws ActivityNotFoundException {
- openManual(manualIdentifier, topic, context, fallbackUri, false);
- }
-
- /**
- * Opens a manual at a specific topic. At least it tries to open a manual.
- * As manuals are (usually) installed separately and we use late binding in
- * form of implicit intents, a lot of things can go wrong.
- *
- * We use late binding and the intent architecture in particular as follows:
- * first, we use our own URI scheme called "appmanual". Second, we use the
- * host field as a unique manual identifier (such as "c-geo" for the app
- * manuals for a map which must not be named by the powers that wanna be).
- * Third, a localized manual is differentiated as a path with a single
- * element in form of (in this precedence) "/lang_country_variant",
- * "/lang__variant", "/lang_country", "/lang", or "/". Fourth, the topic to
- * open is encoded as the a fragment "#topic=mytopic".
- *
- * In order to support localization, manuals can register themselves with
- * different URIs.
- *
- * @param manualIdentifier
- * the identifier of the manual to open. This identifier must
- * uniquely identify the manual as such, independent of the
- * particular locale the manual is intended for.
- * @param topic
- * the topic to open. Please do not use spaces for topic names.
- * With respect to the TiddlyWiki infrastructure used for manuals
- * the topic needs to the tag of a (single) tiddler. This way
- * manuals can be localized (especially their topic titles)
- * without breaking an app's knowledge about topics. Some
- * standardized topics are predefined, such as
- * {@link #TOPIC_HOME}, {@link #TOPIC_INDEX}, and
- * {@link #TOPIC_ABOUT_MANUAL}.
- * @param context
- * the context (usually an Activity) from which the manual is to
- * be opened. In particular, this context is required to derive
- * the proper current locale configuration in order to open
- * appropriate localized manuals, if installed.
- * @param fallbackUri
- * either <code>null</code> or a fallback URI to be used in case
- * the user has not installed any suitable manual.
- * @param contextAffinity
- * if <code>true</code>, then we try to open the manual within
- * the context, if possible. That is, if the package of the
- * calling context also offers suitable activity registrations,
- * then we will prefer them over any other registrations. If you
- * don't know what this means, then you probably don't need this
- * very special capability and should specify <code>false</code>
- * for this parameter.
- *
- * @exception ActivityNotFoundException
- * there is no suitable manual installed and all combinations
- * of locale scope failed to activate any manual and no
- * {@literal fallbackUri} was given.
- */
- public static void openManual(String manualIdentifier, String topic,
- Context context, String fallbackUri, boolean contextAffinity)
- throws ActivityNotFoundException {
- //
- // The path of an "appmanual:" URI consists simply of the locale
- // information. This allows manual packages to register themselves
- // for both very specific locales as well as very broad ones.
- //
- String localePath = "/"
- + context.getResources().getConfiguration().locale.toString();
- //
- // We later need this intent in order to try to launch an appropriate
- // manual (respectively its manual viewer). And yes, we need to set
- // the intent's category explicitly, even as we will later use
- // startActivity(): if we don't do this, the proper activity won't be
- // started albeit the filter almost matches. That dirty behavior (it is
- // documented wrong) had cost me half a day until I noticed some
- // informational log entry generated from the ActivityManager. Grrrr!
- //
- Intent intent = new Intent(Intent.ACTION_VIEW);
- int defaultIntentFlags = intent.getFlags();
- intent.addCategory(Intent.CATEGORY_DEFAULT);
- //
- // Try to open the manual in the following order (subject to
- // availability):
- // 1. manualIdentifier_lang_country_variant (can also be
- // manualIdentifier_lang__variant in some cases)
- // 2. manualIdentifier_lang_country
- // 3. manualIdentifier_lang
- // 4. manualIdentifier
- // Of course, manuals are free to register more than one Intent,
- // in particular, the should register also the plain manualIdentifier
- // as a suitable fallback strategy. Even when installing multiple
- // manuals this doesn't matter, as the user then can choose which
- // one to use on a single or permanent basis.
- //
- while (true) {
- Uri uri = Uri.parse(URI_SCHEME_APPMANUAL + "://" + manualIdentifier
- + localePath + "#topic='" + topic + "'");
- // Note: we do not use a MIME type for this.
- intent.setData(uri);
- intent.setFlags(defaultIntentFlags);
- if ( contextAffinity ) {
- //
- // What is happening here? Well, here we try something that we
- // would like to call "package affinity activity resolving".
- // Given an implicit(!) intent we try to figure out whether the
- // package of the context which is trying to open the manual is
- // able to resolve the intent. If this is the case, then we
- // simply turn the implicit intent into an explicit(!) intent.
- // We do this by setting the concrete module, that is: package
- // name (eventually the one of the calling context) and class
- // name within the package.
- //
- List<ResolveInfo> capableActivities = context
- .getPackageManager()
- .queryIntentActivityOptions(null, null, intent,
- PackageManager.MATCH_DEFAULT_ONLY);
- int capables = capableActivities.size();
- if ( capables > 1 ) {
- for ( int idx = 0; idx < capables; ++idx ) {
- ActivityInfo activityInfo = capableActivities.get(idx).activityInfo;
- if ( activityInfo.packageName.contentEquals(context
- .getPackageName()) ) {
- intent.setClassName(activityInfo.packageName,
- activityInfo.name);
- //
- // First match is okay, so we quit searching and
- // continue with the usual attempt to start the
- // activity. This should not fail, as we already
- // found a match; yet the code is very forgiving in
- // this respect and would just try another round
- // with "downsized" locale requirements.
- //
- break;
- }
- }
- }
- // FIXME
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
- } else {
- //
- // No context affinity required, thus we need to set some flags:
- //
- // ...NEW_TASK: we want to start the manual reader activity as a
- // separate
- // task so that it can be kept open, yet in the background when
- // returning to the application from which the manual was
- // opened.
- //
- // ...SINGLE_TOP:
- //
- // ...RESET_TASK_IF_NEEDED: clear the manual reader activities
- // down to the root activity. We've set the required
- // ...CLEAR_WHEN_TASK_RESET above when opening the meta-manual
- // with the context affinity.
- //
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_SINGLE_TOP
- | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
- }
- try {
- String logTag = "appmanualclient";
- if ( Log.isLoggable(logTag, Log.INFO) ) {
- Log.i(logTag,
- "Trying to activate manual: uri=" + uri.toString());
- }
- context.startActivity(intent);
- //
- // We could successfully activate the manual activity, so no
- // further trials are required.
- //
- return;
- } catch ( ActivityNotFoundException noActivity ) {
- //
- // Ensure that we switch back to implicit intent resolving for
- // the next round.
- //
- intent.setComponent(null);
- //
- // As long as we still have some locale information, reduce it
- // and try again a broader locale.
- //
- if ( localePath.length() > 1 ) {
- int underscore = localePath.lastIndexOf('_');
- if ( underscore > 0 ) {
- localePath = localePath.substring(0, underscore);
- //
- // Handle the case where we have a locale variant, yet
- // no locale country, thus two underscores in immediate
- // series. Get rid of both.
- //
- if ( localePath.endsWith("_") ) {
- localePath = localePath
- .substring(0, underscore - 1);
- }
- } else {
- //
- // Ready for the last round: try without any locale
- // modifiers.
- //
- localePath = "/";
- }
- } else {
- //
- // We've tried all combinations, so we've run out of them
- // and bail out.
- //
- break;
- }
- }
- //
- // Okay, go for the next round, we've updated (or rather trimmed)
- // the localeIdent, so let us try this.
- //
- }
- //
- // If we reach this code point then no suitable activity could be found
- // and activated. In case the caller specified a fallback URI we will
- // try to open that. As this will activate a suitable browser and this
- // is an asynchronous activity we won't get back any negative results,
- // such as 404's. Here we will only see such problems that prevented the
- // start of a suitable browsing activity.
- //
- if ( fallbackUri != null ) {
- intent = new Intent(Intent.ACTION_VIEW, Uri.parse(fallbackUri));
- intent.addCategory(Intent.CATEGORY_BROWSABLE);
- context.startActivity(intent);
- }
- //
- // We could not activate any manual and there was no fallback URI to
- // open, so we finally bail out unsuccessful with an exception.
- //
- throw new ActivityNotFoundException();
- }
-}