Skip to content

Commit

Permalink
Refactored preferences, Updated info preferences, Added 0.4.14 APK
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Rust committed Jan 26, 2014
1 parent 27556d2 commit aa5eb85
Show file tree
Hide file tree
Showing 13 changed files with 458 additions and 364 deletions.
4 changes: 2 additions & 2 deletions apps/android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="st.alr.mqttitude"
android:versionCode="0413"
android:versionName="0.4.13 " >
android:versionCode="0414"
android:versionName="0.4.14 " >

<uses-feature
android:glEsVersion="0x00020000"
Expand Down
Binary file modified apps/android/apk/mqttitude.apk
View file
Binary file not shown.
66 changes: 53 additions & 13 deletions apps/android/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,25 @@
<string name="preferencesBackgroundUpdatesIntervalSummary">Minutes between automatic reporting</string>
<string name="preferencesBackroundUpdates">Automatic location reporting</string>
<string name="preferencesBackgroundUpdatesSummary">Report location automatically</string>

<string name="preferencesLocatorBackgroundDisplacement">Locator displacement</string>
<string name="preferencesLocatorBackgroundDisplacementSummary">Distance between location updates</string>
<string name="preferencesLocatorBackgroundInterval">Locator interval</string>
<string name="preferencesLocatorBackgroundIntervalSummary">Minutes between location updates</string>



<string name="preferencesInfo">Information</string>
<string name="preferencesRepositoryTitle">Repository</string>
<string name="preferencesRepositorySummary">Explore the code at Github</string>
<string name="preferencesMailTitle">Contact</string>
<string name="preferencesMailSummary">Contact the developers directly via mail</string>
<string name="preferencesRepository">Source Code</string>
<string name="preferencesRepositorySummary">github.com/binarybucks/mqttitude</string>
<string name="preferencesTwitter">Twitter</string>
<string name="preferencesTwitterSummary">twitter.com/mqttitude</string>

<string name="preferencesDonate">Donate Bitcoins</string>
<string name="preferencesDonateSummary">1DYpxrXRLQe5eLnT2FncyxjuQGBgWjtX2t</string>

<string name="preferencesMailTitle">Mail</string>
<string name="preferencesMailSummary">[email protected]</string>
<string name="connectivityConnecting">"Connecting"</string>
<string name="connectivityConnected">"Connected"</string>
<string name="connectivityDisconnecting">"Disconnecting"</string>
Expand All @@ -80,15 +94,15 @@
<string name="submit_confirm_message">tbd</string>
<string name="submit_confirm_button">tbd</string>
<string name="preferencesContactSettings">Contacts</string>
<string name="preferencesContactsEnabledTitle">Contact locations</string>
<string name="preferencesContactsEnabledSummary">Show contact locations</string>
<string name="preferencesContactsEnabledTitle">Subscribe</string>
<string name="preferencesContactsEnabledSummary">Subscribe to receive messages</string>
<string name="preferencesContactsTopic">Subscribe topic</string>
<string name="preferencesContactsTopicSummary">Topic for contact location updates</string>
<string name="preferencesContactsTopicSummary">Topic on which messages are received</string>
<string name="publish">Report</string>
<string name="preferencesIncludeBatterySummary">Include the device battery level in reports</string>
<string name="preferencesIncludeBatteryTitle">Include battery</string>
<string name="contactsLinkCloudStorageEnabledSummary">Store contacts in synced address book</string>
<string name="contactsLinkCloudStorageEnabledTitle">Update address book (beta)</string>
<string name="contactsLinkCloudStorageEnabledSummary">Store contact links in Google address book</string>
<string name="contactsLinkCloudStorageEnabledTitle">Update address book</string>
<string name="preferencesAutostartSummary">Automatically start on device boot</string>
<string name="preferencesAutostartTitle">Autostart</string>
<string name="description">Description</string>
Expand All @@ -103,9 +117,8 @@
<string name="waypointAdd">Add waypoint</string>
<string name="actionModeOneSelected">1 item selected</string>
<string name="actionModeMoreSelected">items selected</string>
<string name="currentLocationNotAvailable">The current location is not available</string>


<string name="currentLocationNotAvailable">The current location is not available</string>

<string-array name="connect_options_security">
<item>None</item>
<item>TLS</item>
Expand Down Expand Up @@ -141,5 +154,32 @@
<string name="title_activity_activity_wizzard">Wizzard</string>
<string name="title_test_list">tests</string>
<string name="title_test_detail">test Detail</string>

<string name="keyDeviceName">deviceName</string>
<string name="keyBrokerHost">brokerHost</string>
<string name="keyBrokerPort">brokerPort</string>
<string name="keyBrokerPassword">brokerPassword</string>
<string name="keyBrokerUsername">userUsername</string>
<string name="keyBrokerAuth">brokerAuth</string>
<string name="keyBrokerSecurity">brokerSecurity</string>
<string name="keyBrokerSecuritySslCaPath">brokerSecuritySslCaPath</string>
<string name="keyPubAutoEnabled">backgroundUpdates</string>
<string name="keyPubAutoInterval">backgroundUpdatesInterval</string>
<string name="keyPubTopic">topic</string>
<string name="keyPubRetain">retain</string>
<string name="keyPubQos">qos</string>
<string name="keyPubIncludeBattery">includeBattery</string>
<string name="keyNotificationEnabled">notificationEnabled</string>
<string name="keyNotificationGeocoderEnabled">notificationGeocoder</string>
<string name="keyNotificationLocationEnabled">notificationLocation</string>
<string name="keyNotificationTickerPublish">notificationTickerOnPublishEnabled</string>
<string name="keyNotificationTickerGeofence">tickerOnWaypointTransitionEnabled</string>
<string name="keyTrackingUsername">notificationTickerOnPublishEnabled</string>
<string name="keySubEnabled">subEnabled</string>
<string name="keySubTopic">subTopic</string>
<string name="keyContactsLinkCloudStorageEnabled">contactsLinkCloudStorageEnabled</string>
<string name="keyAdvancedConnectionPreferencesEnabled">advancedMode</string>
<string name="keyAutostartOnBootEnabled">autostartOnBoot</string>
<string name="keyLocatorBackgroundDisplacement">backgroundDisplacement</string>
<string name="keyLocatorBackgroundInterval">backgroundInterval</string>

</resources>
124 changes: 58 additions & 66 deletions apps/android/res/xml/preferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,147 +12,131 @@
android:title="@string/preferencesTopicSettings" >
<CheckBoxPreference
android:defaultValue="false"
android:key="backgroundUpdates"
android:key="@string/keyPubAutoEnabled"
android:summary="@string/preferencesBackgroundUpdatesSummary"
android:title="@string/preferencesBackroundUpdates" />

<EditTextPreference
android:defaultValue="30"
android:dependency="backgroundUpdates"
android:dependency="@string/keyPubAutoEnabled"
android:dialogTitle="@string/preferencesBackgroundUpdatesInterval"
android:hint="30"
android:inputType="number"
android:key="backgroundUpdatesInterval"
android:key="@string/keyPubAutoInterval"
android:summary="@string/preferencesBackgroundUpdatesIntervalSummary"
android:title="@string/preferencesBackgroundUpdatesInterval" />
<CheckBoxPreference

<CheckBoxPreference
android:defaultValue="false"
android:key="includeBattery"
android:key="@string/keyPubIncludeBattery"
android:summary="@string/preferencesIncludeBatterySummary"
android:title="@string/preferencesIncludeBatteryTitle" />




</PreferenceScreen>
<PreferenceScreen
android:key="contactSettings"
android:title="@string/preferencesContactSettings" >
<CheckBoxPreference
android:defaultValue="true"
android:key="subEnabled"
android:summary="@string/preferencesContactsEnabledSummary"
android:title="@string/preferencesContactsEnabledTitle" />

<CheckBoxPreference
android:defaultValue="false"
android:dependency="subEnabled"
android:key="contactsLinkCloudStorageEnabled"
android:summary="@string/contactsLinkCloudStorageEnabledSummary"
android:title="@string/contactsLinkCloudStorageEnabledTitle" />


</PreferenceScreen>
<PreferenceScreen
android:key="activitySettings"
android:title="@string/preferencesNotification" >
<CheckBoxPreference
android:defaultValue="true"
android:key="notificationEnabled"
android:key="@string/keyNotificationEnabled"
android:summary="@string/preferencesNotificationSummary"
android:title="@string/preferencesNotificationTitle" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="notificationEnabled"
android:key="notificationLocation"
android:dependency="@string/keyNotificationEnabled"
android:key="@string/keyNotificationTickerPublish"
android:summary="@string/preferencesNotificationLocationSummary"
android:title="@string/preferencesNotificationLocationTitle" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="notificationLocation"
android:key="notificationGeocoder"
android:dependency="@string/keyNotificationEnabled"
android:key="@string/keyNotificationGeocoderEnabled"
android:summary="@string/preferencesNotificationGeocoderSummary"
android:title="@string/preferencesNotificationGeocoderTitle" />
<CheckBoxPreference
android:defaultValue="true"
android:key="notificationTickerOnPublishEnabled"
android:key="@string/keyNotificationTickerPublish"
android:summary="@string/preferencesNotificationTickerOnPublishSummary"
android:title="@string/preferencesNotificationTickerOnPublishTitle" />

<CheckBoxPreference
android:defaultValue="true"
android:key="tickerOnWaypointTransitionEnabled"
android:key="@string/keyNotificationTickerGeofence"
android:summary="@string/preferencesNotificationTickerOnWaypointTransitionSummary"
android:title="@string/preferencesNotificationTickerOnWaypointTransitionTitle" />


</PreferenceScreen>
<PreferenceScreen
android:key="advanced"
android:title="@string/preferencesAdvancedTitle" >
<CheckBoxPreference
android:defaultValue="false"
android:key="advancedMode"
android:key="@string/keyAdvancedConnectionPreferencesEnabled"
android:summary="@string/preferencesAdvancedConnectionSummary"
android:title="@string/preferencesAdvancedConnectionTitle" />

<EditTextPreference
android:defaultValue=""
android:dialogTitle="@string/preferencesTopic"
android:key="topic"
android:key="@string/keyPubTopic"
android:summary="@string/preferencesTopicSummary"
android:title="@string/preferencesTopic" />

<ListPreference
android:defaultValue="0"
android:entries="@array/qos_readable"
android:entryValues="@array/qos"
android:key="qos"
android:key="@string/keyPubQos"
android:summary="@string/preferencesQOSSummary"
android:title="@string/preferencesQOS" />

<CheckBoxPreference
android:defaultValue="true"
android:key="retain"
android:key="@string/keyPubRetain"
android:summary="@string/preferencesRetainSummary"
android:title="@string/preferencesRetain" />


<CheckBoxPreference
android:defaultValue="true"
android:key="@string/keySubEnabled"
android:summary="@string/preferencesContactsEnabledSummary"
android:title="@string/preferencesContactsEnabledTitle" />

<EditTextPreference
android:defaultValue=""
android:dependency="@string/keySubEnabled"
android:defaultValue="mqttitude/+/+"
android:dialogTitle="@string/preferencesContactsTopic"
android:key="subTopic"
android:hint="mqttitude/+/+"
android:key="@string/keySubTopic"
android:summary="@string/preferencesContactsTopicSummary"
android:title="@string/preferencesContactsTopic" />
<CheckBoxPreference

<CheckBoxPreference
android:defaultValue="false"
android:dependency="@string/keySubEnabled"
android:key="@string/keyContactsLinkCloudStorageEnabled"
android:summary="@string/contactsLinkCloudStorageEnabledSummary"
android:title="@string/contactsLinkCloudStorageEnabledTitle" />

<CheckBoxPreference
android:defaultValue="false"
android:key="autostartOnBoot"
android:summary="@string/preferencesAutostartSummary"
android:key="@string/keyAutostartOnBootEnabled"
android:summary="@string/preferencesAutostartSummary"
android:title="@string/preferencesAutostartTitle" />



<EditTextPreference
android:defaultValue="500"
android:dialogTitle="@string/preferencesLocatorBackgroundDisplacement"
android:hint="500"
android:inputType="number"
android:key="backgroundDisplacement"
android:summary="Minimal distance (m) between location changes"
android:dialogTitle="Background displacement"

android:title="Background displacement" />


android:key="@string/keyLocatorBackgroundDisplacement"
android:summary="@string/preferencesLocatorBackgroundDisplacementSummary"
android:title="@string/preferencesLocatorBackgroundDisplacement" />
<EditTextPreference
android:defaultValue="30"
android:dialogTitle="@string/preferencesLocatorBackgroundInterval"
android:hint="30"
android:inputType="number"
android:key="backgroundInterval"
android:summary="Interval (m) between location changes"
android:dialogTitle="Background interval"

android:title="Background interval" />

android:key="@string/keyLocatorBackgroundInterval"
android:summary="@string/preferencesLocatorBackgroundIntervalSummary"
android:title="@string/preferencesLocatorBackgroundInterval" />
</PreferenceScreen>
<PreferenceScreen
android:key="activityInfo"
Expand All @@ -164,8 +148,18 @@
<Preference
android:key="repo"
android:summary="@string/preferencesRepositorySummary"
android:title="@string/preferencesRepositoryTitle" />
android:title="@string/preferencesRepository" />

<Preference
android:key="twitter"
android:summary="@string/preferencesTwitterSummary"
android:title="@string/preferencesTwitter" />

<Preference
android:key="donate"
android:summary="@string/preferencesDonateSummary"
android:title="@string/preferencesDonate" />

<st.alr.mqttitude.preferences.ImplementedDialogPreference
android:dialogLayout="@layout/preferences_licenses"
android:negativeButtonText=""
Expand All @@ -176,8 +170,6 @@
<Preference
android:key="versionReadOnly"
android:title="@string/preferencesVersionTitle" />


</PreferenceScreen>

</PreferenceScreen>
Loading

0 comments on commit aa5eb85

Please sign in to comment.