diff options
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/layout/gcvote_dialog.xml | 10 | ||||
| -rw-r--r-- | main/res/layout/gcvote_rating_bar.xml | 26 | ||||
| -rw-r--r-- | main/res/layout/logcache_activity.xml | 21 | ||||
| -rw-r--r-- | main/res/menu/cache_options.xml | 6 | ||||
| -rw-r--r-- | main/res/values/changelog_master.xml | 1 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 2 |
6 files changed, 46 insertions, 20 deletions
diff --git a/main/res/layout/gcvote_dialog.xml b/main/res/layout/gcvote_dialog.xml new file mode 100644 index 0000000..221a8f5 --- /dev/null +++ b/main/res/layout/gcvote_dialog.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dip" + android:orientation="vertical" > + + <include layout="@layout/gcvote_rating_bar" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/gcvote_rating_bar.xml b/main/res/layout/gcvote_rating_bar.xml new file mode 100644 index 0000000..87d4ef5 --- /dev/null +++ b/main/res/layout/gcvote_rating_bar.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" > + + <RatingBar + android:id="@+id/gcvoteRating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:max="5" + android:numStars="5" + android:stepSize="0.5" + android:visibility="gone" /> + + <TextView + android:id="@+id/gcvoteLabel" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:padding="10dip" + android:text="@string/log_no_rating" + android:textColor="?text_color" + android:textSize="12sp" + android:visibility="gone" /> + +</merge> diff --git a/main/res/layout/logcache_activity.xml b/main/res/layout/logcache_activity.xml index de6b37a..2e966d1 100644 --- a/main/res/layout/logcache_activity.xml +++ b/main/res/layout/logcache_activity.xml @@ -74,26 +74,7 @@ tools:ignore="TextFields" /> </LinearLayout> - <RatingBar - android:id="@+id/gcvoteRating" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:max="5" - android:numStars="5" - android:stepSize="0.5" - android:visibility="gone" /> - - <TextView - android:id="@+id/gcvoteLabel" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:padding="10dip" - android:text="@string/log_no_rating" - android:textColor="?text_color" - android:textSize="12sp" - android:visibility="gone" /> + <include layout="@layout/gcvote_rating_bar" android:layout_width="wrap_content" android:layout_height="wrap_content"/> <LinearLayout android:id="@+id/tweet_box" diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml index 8fdb2aa..c6d7322 100644 --- a/main/res/menu/cache_options.xml +++ b/main/res/menu/cache_options.xml @@ -38,6 +38,12 @@ app:showAsAction="ifRoom"> </item> <item + android:id="@+id/menu_gcvote" + android:title="@string/cache_menu_vote" + android:visible="false" + app:showAsAction="ifRoom"> + </item> + <item android:id="@+id/menu_caches_around" android:icon="@drawable/ic_menu_rotate" android:title="@string/cache_menu_around" diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml index 00bcbfc..bfac8de 100644 --- a/main/res/values/changelog_master.xml +++ b/main/res/values/changelog_master.xml @@ -4,6 +4,7 @@ <string name="changelog_master" translatable="false"> <b>Next feature release:</b>\n · New: Waypoints created from personal notes can now be deleted\n + · New: More easy to use vote dialog in cache details\n · Fix: Up navigation did not work when c:geo was invoked from another app\n \n </string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 9c78ffb..3a40a18 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -419,6 +419,7 @@ <string name="init_gcvote">GCvote.com</string> <string name="init_gcvote_password_description">To be able to rate a cache, you need to follow the instructions at GCVote.com and enter your GCVote password here.</string> <string name="err_gcvote_send_rating">Error while sending rating, check GCVote password in settings or empty it.</string> + <string name="gcvote_sent">Voting successfully sent</string> <string name="init_twitter">Twitter</string> <string name="settings_activate_twitter">Activate</string> <string name="init_username">Username</string> @@ -716,6 +717,7 @@ <string name="cache_menu_navigon">Navigon</string> <string name="cache_menu_pebble">Pebble</string> <string name="cache_menu_android_wear">Android Wear</string> + <string name="cache_menu_vote">Vote</string> <string name="cache_status">Status</string> <string name="cache_status_offline_log">Saved Log</string> <string name="cache_status_found">Found</string> |