diff options
Diffstat (limited to 'main/res/values')
| -rw-r--r-- | main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | main/res/values/changelog_master.xml | 19 | ||||
| -rw-r--r-- | main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | main/res/values/preference_keys.xml | 10 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 39 | ||||
| -rw-r--r-- | main/res/values/styles.xml | 6 | ||||
| -rw-r--r-- | main/res/values/themes.xml | 123 |
7 files changed, 99 insertions, 100 deletions
diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index ab1db9f..be33f09 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -42,7 +42,6 @@ <!-- attributes for custom made preferences --> - <attr name="title" format="string" /> <attr name="text" format="string" /> <attr name="url" format="string" /> <attr name="urlButton" format="string" /> diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml index 1e3c3d4..c62ec3a 100644 --- a/main/res/values/changelog_master.xml +++ b/main/res/values/changelog_master.xml @@ -2,5 +2,24 @@ <resources> <!-- changelog for the master branch --> <string name="changelog_master" translatable="false"> + <b>Next feature release:</b>\n + · New: Implemented actionbar menus\n + · New: Show also own logs on friend log page\n + · New: Navigate - WhereYouGo will invoke automatic cartridge download in WhereYouGo\n + · New: Filter for caches which are not found\n + · New: Show "Import from web" also if not yet registered\n + · New: Popup list of changes on first start after upgrade\n + · New: Android Beam (NFC Sharing)\n + · New: Debugging option to save memory dumps on user demand\n + · Fix: Hiding own caches on opencaching\n + · Fix: Webcam caches not marked as found after posting log\n + · Fix: Archived caches now also hidden if hiding disabled caches is active\n + · Fix: Filter invalid characters in GPX files\n + · Fix: All caches shown as owned if no username stored\n + · Fix: GPX import from mail failing on some devices\n + · Fix: Updating cache history should not ask for list to save caches\n + · Fix: Speed now always shown in km or miles per hour\n + \n + \n </string> </resources> diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index 0e85c36..30d00df 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources> + <color name="background_main_transparent">#D0000000</color> <color name="just_white">#FFFFFFFF</color> <color name="just_black">#FF000000</color> <color name="background_dark">#FF000000</color> diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml index 6036be3..e77cd79 100644 --- a/main/res/values/preference_keys.xml +++ b/main/res/values/preference_keys.xml @@ -19,6 +19,7 @@ <string name="preference_screen_ox">preference_screen_ox</string> <string name="preference_screen_twitter">preference_screen_twitter</string> <string name="preference_screen_navigation_menu">fakekey_navigation_menu_screen</string> + <string name="preference_screen_sendtocgeo">preference_screen_sendtocgeo</string> <string name="pref_fakekey_ocde_authorization">fakekey_ocde_authorization</string> <string name="pref_fakekey_ocpl_authorization">fakekey_ocpl_authorization</string> <string name="pref_fakekey_ocnl_authorization">fakekey_ocnl_authorization</string> @@ -45,6 +46,7 @@ <string name="pref_showaddress">showaddress</string> <string name="pref_useenglish">useenglish</string> <string name="pref_units">units</string> + <string name="pref_alwaysshowoverflowmenu">alwaysshowoverflowmenu</string> <string name="pref_autoloaddesc">autoloaddesc</string> <string name="pref_ratingwanted">ratingwanted</string> <string name="pref_friendlogswanted">friendlogswanted</string> @@ -134,7 +136,6 @@ <string name="pref_navigation_menu_google_bike">navigationGoogleBike</string> <string name="pref_navigation_menu_google_maps_directions">navigationMapsDirections</string> <string name="pref_navigation_menu_cache_beacon">navigationCacheBeacon</string> - <string name="pref_navigation_menu_gcc">navigationGcc</string> <string name="pref_navigation_menu_where_you_go">navigationWhereYouGo</string> <string name="pref_navigation_menu_pebble">navigationPebble</string> <string name="pref_navigation_menu_mapswithme">navigationMapsWithMe</string> @@ -167,5 +168,8 @@ <string name="pref_twitter_cache_message">twitter_cache_message</string> <string name="pref_twitter_trackable_message">twitter_trackable_message</string> <string name="pref_ec_icons">ec_icons</string> - -</resources>
\ No newline at end of file + <string name="pref_memory_dump">memory_dump</string> + <string name="pref_appearance">pref_appearance</string> + <string name="pref_changelog_last_version">changelog_last_version</string> + <string name="pref_caches_history">caches_history</string> +</resources> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 2aa3d00..b1c7544 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -92,21 +92,9 @@ <string name="log_saving_and_uploading">Sending log and uploading image…</string> <string name="log_clear">Clear</string> <string name="log_post">Submit Log</string> - <string name="log_post_rate">Submit Log & Rate</string> - <string name="log_post_no_rate">Submit Log & Do not Rate</string> <string name="log_post_not_possible">Loading Log Page…</string> <string name="log_add">Add</string> - <string name="log_rating">Rating</string> <string name="log_no_rating">No rating</string> - <string name="log_stars_1">1 Star</string> - <string name="log_stars_15">1.5 Stars</string> - <string name="log_stars_2">2 Stars</string> - <string name="log_stars_25">2.5 Stars</string> - <string name="log_stars_3">3 Stars</string> - <string name="log_stars_35">3.5 Stars</string> - <string name="log_stars_4">4 Stars</string> - <string name="log_stars_45">4.5 Stars</string> - <string name="log_stars_5">5 Stars</string> <string name="log_stars_1_description">Poor</string> <string name="log_stars_15_description">Fairly poor</string> <string name="log_stars_2_description">Below average</string> @@ -125,7 +113,6 @@ <string name="log_smilies">Smilies</string> <string name="log_image">Image</string> <string name="log_image_attach">Attach Image</string> - <string name="log_image_edit">Edit Image</string> <string name="log_image_stored">Existing</string> <string name="log_image_camera">New</string> <string name="log_image_caption">Caption</string> @@ -238,6 +225,7 @@ <string name="info_select_logimage_cancelled">Image selection or capture was cancelled.</string> <string name="info_stored_image">New image saved to:</string> <string name="info_storing_static_maps">Trying to store static maps</string> + <string name="info_cache_saved">The cache has been stored locally</string> <!-- location service --> <string name="loc_last">Last known</string> @@ -247,6 +235,8 @@ <string name="loc_trying">Trying to Locate</string> <string name="loc_no_addr">Unknown address</string> <string name="loc_gps_disabled">GPS disabled</string> + <string name="menu_centerposition">Center on my position</string> + <!-- standard menu --> <string name="menu_about">About c:geo</string> @@ -343,10 +333,8 @@ <string name="caches_clear_offlinelogs_progress">Clearing offline logs</string> <!-- caches lists --> - <string name="list_menu">List</string> <string name="list_menu_create">Create new list</string> <string name="list_menu_drop">Drop current list</string> - <string name="list_menu_change">Change list</string> <string name="list_menu_rename">Rename current list</string> <string name="list_title">Pick a list</string> <string name="list_inbox">Stored</string> @@ -451,8 +439,8 @@ <string name="init_signature_template_log">Log text</string> <string name="init_ratingwanted">GCvote Rating</string> <string name="init_summary_ratingwanted">Load cache rating from GCvote.com</string> - <string name="init_friendlogswanted">Show Friends\' Logs</string> - <string name="init_summary_friendlogswanted">Display additional logbook page for logs from friends</string> + <string name="init_friends_and_own_logs_wanted">Show Friends\'/Own</string> + <string name="init_summary_friends_and_own_logs_wanted">Display additional logbook page for friends\' and own logs</string> <string name="init_openlastdetailspage">Last Details Page</string> <string name="init_summary_openlastdetailspage">Open details with last used page</string> <string name="init_autoload">Long Description</string> @@ -464,6 +452,8 @@ <string name="init_captcha">Show CAPTCHA</string> <string name="init_summary_captcha">Show CAPTCHA if necessary (only Basic Member)</string> <string name="init_useenglish">Use English</string> + <string name="init_showoverflowmenu">Always show overflow menu</string> + <string name="init_showoverflow_summary">Always show the overflow menu (three dots ⋮) even if the device has a menu button (Restart needed)</string> <string name="init_summary_useenglish">Use English language for c:geo (Restart needed)</string> <string name="init_exclude">Exclude Own and Found</string> <string name="init_summary_exclude">Exclude caches you own or have found</string> @@ -541,6 +531,9 @@ <string name="init_maintenance">Maintenance</string> <string name="init_maintenance_directories_note">c:geo stores images, log images and other files related to a cache in a separate directory. In some cases (like importing/exporting the database) this directory may contain outdated files, which can be deleted here.</string> <string name="init_maintenance_directories">Delete orphaned files</string> + <string name="init_create_memory_dump">Create memory dump</string> + <string name="init_memory_dump">Memory dump</string> + <string name="init_memory_dumped">Memory dumped to %s</string> <string name="settings_open_website">Open website</string> <string name="settings_settings">Settings</string> <string name="settings_information">Information</string> @@ -632,8 +625,6 @@ <string name="cache_personal_note_uploading">Uploading personal note</string> <string name="cache_personal_note_upload_done">Personal note uploaded</string> <string name="cache_personal_note_upload_cancelled">Personal note upload cancelled</string> - <string name="cache_personal_note_unstored">Cache not stored</string> - <string name="cache_personal_note_store">The cache will be stored first to allow a personal note.</string> <string name="cache_description">Description</string> <string name="cache_description_long">Long Description</string> <string name="cache_description_table_note">Description contains table formatting which may need to be viewed at %s to be seen correctly.</string> @@ -659,7 +650,7 @@ <string name="cache_waypoints_add">Add Waypoint</string> <string name="cache_hint">Hint</string> <string name="cache_logs">Logbook</string> - <string name="cache_logsfriends">Logbook (Friends)</string> + <string name="cache_logs_friends_and_own">Friends/Own Logs</string> <string name="cache_dialog_loading_details">Loading cache details…</string> <string name="cache_dialog_loading_details_status_loadpage">Loading page</string> <string name="cache_dialog_loading_details_status_details">Processing details</string> @@ -705,7 +696,6 @@ <string name="cache_menu_refresh">Refresh</string> <string name="cache_menu_share">Share cache</string> <string name="cache_menu_move_list">Move to different list</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -715,6 +705,7 @@ <string name="cache_status">Status</string> <string name="cache_status_offline_log">Saved Log</string> <string name="cache_status_found">Found</string> + <string name="cache_not_status_found">Not Found</string> <string name="cache_status_archived">Archived</string> <string name="cache_status_disabled">Disabled</string> <string name="cache_status_premium">Premium Members only</string> @@ -847,10 +838,7 @@ <string name="map_view_map">Map view</string> <string name="map_modes">Map settings</string> <string name="map_trail_show">Show trail</string> - <string name="map_trail_hide">Hide trail</string> <string name="map_circles_show">Show circles</string> - <string name="map_circles_hide">Hide circles</string> - <string name="map_mycaches_show">Show own/found caches</string> <string name="map_mycaches_hide">Hide own/found caches</string> <string name="map_theme_builtin">Default</string> <string name="map_theme_select">Select map theme</string> @@ -1226,7 +1214,6 @@ <string name="website">Website: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manual: <a href="">c:geo in a Nutshell</a></string> <string name="market">Android: <a href="">c:geo on Google Play</a></string> <string name="about_twitter">Should <b>c:geo</b> publish a new status on Twitter every time you log a cache?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1285,4 +1272,6 @@ <!-- shortcuts --> <string name="cgeo_shortcut">c:geo shortcut</string> <string name="create_shortcut">Create shortcut</string> + <string name="send">Send</string> + </resources> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index c566122..ffcb6aa 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -70,7 +70,7 @@ <item name="android:padding">2dip</item> <item name="android:scaleType">center</item> <item name="android:focusable">true</item> - <item name="android:src">@drawable/actionbar_home</item> + <item name="android:src">@drawable/actionbar_cgeo</item> <item name="android:background">@drawable/actionbar_button</item> </style> @@ -102,6 +102,10 @@ <item name="android:text">c:geo</item> </style> + <style name="actionbar_myposition"> + <item name="android:button">@drawable/ic_menu_myposition</item> + </style> + <!-- button: full width --> <style name="button_full" parent="button"> <item name="android:layout_width">fill_parent</item> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index ed64ef5..82a4422 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="cgeo_main" parent="android:style/Theme.Wallpaper.NoTitleBar"> + + <style name="cgeo_main" parent="@style/Theme.AppCompat"> + + <!-- copy the style elements of the Wallpaper theme since AppCombat has no Wallpaper theme --> + <item name="android:windowBackground">@color/background_main_transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowShowWallpaper">true</item> + <!-- system elements --> <item name="android:windowContentOverlay">@null</item> + + </style> + + <style name="cgeo" parent="@style/Theme.AppCompat"> + + + <item name="android:buttonStyle">@style/button</item> + <item name="android:editTextStyle">@style/edittext</item> + <item name="android:windowContentOverlay">@null</item> + + <!-- own values: colors --> + <item name="just_color">@color/just_black</item> + <item name="text_color_link">@color/link</item> + <item name="button_color_enabled">@color/button_enabled</item> + <item name="button_color_disabled">@color/button_disabled</item> </style> - <style name="cgeo" parent="android:style/Theme.NoTitleBar"> - <!-- system elements --> + <!-- Identical to cgeo aside from different parent style --> + <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar"> + + <!-- For some reason we get the non inversed texts here (bug in abc?), explicitly set text styles --> + <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse</item> + <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse</item> + + <item name="android:buttonStyle">@style/button</item> <item name="android:editTextStyle">@style/edittext</item> <item name="android:windowContentOverlay">@null</item> @@ -21,6 +49,8 @@ <item name="button_color_disabled">@color/button_disabled</item> </style> + + <style name="dark" parent="cgeo"> <!-- own values: colors --> @@ -50,10 +80,10 @@ <item name="compass">0</item> </style> - <style name="light" parent="cgeo"> + <style name="light" parent="cgeo_light"> <!-- own values: colors --> - <item name="android:windowBackground">@color/just_white</item> + <item name="android:windowBackground">@color/just_white</item> <item name="text_color">@color/text_light</item> <item name="text_color_headline">@color/text_headline_light</item> <item name="text_color_grey">@color/text_grey_light</item> @@ -80,80 +110,33 @@ <item name="compass">1</item> </style> - <style name="cgeo_popup" parent="android:style/Theme.Dialog"> - - <!-- system elements --> - <item name="android:buttonStyle">@style/button</item> - <item name="android:editTextStyle">@style/edittext</item> - <item name="android:windowNoTitle">true</item> + + <style name="cgeo.Translucent.Light" parent="light"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowAnimationStyle">@android:style/Animation</item> </style> - <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. --> - <style name="popup_dark" parent="cgeo_popup"> - <!-- own values: colors --> - <item name="just_color">@color/just_black</item> - <item name="text_color">@color/text_dark</item> - <item name="text_color_headline">@color/text_headline_dark</item> - <item name="text_color_grey">@color/text_grey_dark</item> - <item name="text_color_hint">@color/text_hint_dark</item> - <item name="text_color_link">@color/link</item> - <item name="button_color_enabled">@color/button_enabled</item> - <item name="button_color_disabled">@color/button_disabled</item> - <item name="background_color">@color/background_dark</item> - <item name="background_color_notice">@color/background_dark_notice</item> - <item name="background_color_transparent">@color/background_dark_transparent</item> - <item name="separator_color">@color/separator_dark</item> + <style name="cgeo.Translucent" parent="dark"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowAnimationStyle">@android:style/Animation</item> + </style> - <!-- own values: drawables --> - <item name="button">@drawable/action_button_dark</item> - <item name="input">@drawable/input_bcg_dark</item> - <item name="inventory">@drawable/inventory_background_dark</item> - <item name="favorite">@drawable/favorite_background_dark</item> - <item name="favorite_r">@drawable/favorite_background_red_dark</item> - <item name="favorite_o">@drawable/favorite_background_orange_dark</item> - <item name="favorite_g">@drawable/favorite_background_green_dark</item> - <item name="close">@drawable/map_close_dark</item> - <item name="log_img_icon">@drawable/log_img_dark</item> - <item name="actionbar_compass">@drawable/actionbar_compass_dark</item> - <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large</item> + <style name="cgeo_popup" parent="cgeo.Translucent.Light"> + <item name="android:windowNoTitle">true</item> + </style> - <!-- own values: other --> - <item name="compass">0</item> + <style name="popup_dark" parent="cgeo.Translucent"> </style> - <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. --> <style name="popup_light" parent="cgeo_popup"> - - <!-- own values: colors --> - <item name="android:windowBackground">@color/just_white</item> - <item name="text_color">@color/text_light</item> - <item name="text_color_headline">@color/text_headline_light</item> - <item name="text_color_grey">@color/text_grey_light</item> - <item name="text_color_hint">@color/text_hint_light</item> - <item name="background_color">@color/background_light</item> - <item name="background_color_notice">@color/background_light_notice</item> - <item name="background_color_transparent">@color/background_light_transparent</item> - <item name="separator_color">@color/separator_light</item> - - <!-- own values: drawables --> - <item name="button">@drawable/action_button_light</item> - <item name="input">@drawable/input_bcg_light</item> - <item name="inventory">@drawable/inventory_background_light</item> - <item name="favorite">@drawable/favorite_background_light</item> - <item name="favorite_r">@drawable/favorite_background_red_light</item> - <item name="favorite_o">@drawable/favorite_background_orange_light</item> - <item name="favorite_g">@drawable/favorite_background_green_light</item> - <item name="close">@drawable/map_close_light</item> - <item name="log_img_icon">@drawable/log_img_light</item> - <item name="actionbar_compass">@drawable/actionbar_compass_light</item> - <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large.Inverse</item> - - <!-- own values: other --> - <item name="compass">1</item> </style> - <style name="settings" parent="android:Theme"> + <style name="settings" parent="@style/Theme.AppCompat"> <item name="settings_cloud">@drawable/settings_cloud_white</item> <item name="settings_details">@drawable/settings_details_white</item> <item name="settings_eye">@drawable/settings_eye_white</item> @@ -165,7 +148,7 @@ <item name="settings_info_icon">@drawable/settings_info_icon_white</item> </style> - <style name="settings.light" parent="android:Theme.Light"> + <style name="settings.light" parent="@style/Theme.AppCompat.Light"> <item name="settings_cloud">@drawable/settings_cloud_black</item> <item name="settings_details">@drawable/settings_details_black</item> <item name="settings_eye">@drawable/settings_eye_black</item> |