Updated logo

Started work on new settings screen

Author: ArdaXi

AndroidManifest.xml

@@ -57,7 +57,7 @@
             >         
         </service>
         <service android:name=".GCMIntentService" />
-        <activity android:name="PreferenceSettings" android:icon="@drawable/techinclogo_mono"></activity>
+        <activity android:name="SettingsActivity" android:icon="@drawable/techinclogo_mono"></activity>
 
     </application>
 

bin/AndroidManifest.xml

@@ -57,7 +57,7 @@
             >         
         </service>
         <service android:name=".GCMIntentService" />
-        <activity android:name="PreferenceSettings" android:icon="@drawable/techinclogo_mono"></activity>
+        <activity android:name="SettingsActivity" android:icon="@drawable/techinclogo_mono"></activity>
 
     </application>
 

bin/Techinc-Notify.apk

@@ -14,69 +14,79 @@ public static final class drawable {
         public static final int ic_launcher=0x7f020000;
         public static final int techinclogo=0x7f020001;
         public static final int techinclogo_mono=0x7f020002;
+        public static final int techinclogo_white=0x7f020003;
     }
     public static final class id {
-        public static final int apply=0x7f060014;
-        public static final int boot_start=0x7f060008;
-        public static final int butn_browse_sound=0x7f06000c;
-        public static final int label_open_url=0x7f060006;
-        public static final int label_pref_notify_sound=0x7f06000a;
-        public static final int label_pref_update_freq=0x7f06000d;
-        public static final int label_text=0x7f060000;
-        public static final int label_update_url=0x7f06000f;
-        public static final int menu_settings=0x7f060015;
-        public static final int monitoring=0x7f060004;
-        public static final int notify_sound=0x7f06000b;
-        public static final int open_url=0x7f060007;
-        public static final int refresh=0x7f060003;
-        public static final int reset=0x7f060013;
-        public static final int start=0x7f060011;
-        public static final int status=0x7f060002;
-        public static final int status_label=0x7f060001;
-        public static final int stop=0x7f060012;
-        public static final int toggle=0x7f060005;
-        public static final int update_freq=0x7f06000e;
-        public static final int update_url=0x7f060010;
-        public static final int vibrate=0x7f060009;
+        public static final int apply=0x7f070014;
+        public static final int boot_start=0x7f070008;
+        public static final int butn_browse_sound=0x7f07000c;
+        public static final int label_open_url=0x7f070006;
+        public static final int label_pref_notify_sound=0x7f07000a;
+        public static final int label_pref_update_freq=0x7f07000d;
+        public static final int label_text=0x7f070000;
+        public static final int label_update_url=0x7f07000f;
+        public static final int menu_settings=0x7f070015;
+        public static final int monitoring=0x7f070004;
+        public static final int notify_sound=0x7f07000b;
+        public static final int open_url=0x7f070007;
+        public static final int refresh=0x7f070003;
+        public static final int reset=0x7f070013;
+        public static final int start=0x7f070011;
+        public static final int status=0x7f070002;
+        public static final int status_label=0x7f070001;
+        public static final int stop=0x7f070012;
+        public static final int toggle=0x7f070005;
+        public static final int update_freq=0x7f07000e;
+        public static final int update_url=0x7f070010;
+        public static final int vibrate=0x7f070009;
     }
     public static final class layout {
         public static final int main=0x7f030000;
         public static final int settings=0x7f030001;
     }
     public static final class menu {
-        public static final int main=0x7f050000;
+        public static final int main=0x7f060000;
     }
     public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int button_browse=0x7f04000f;
-        public static final int button_refresh=0x7f040019;
-        public static final int button_start_service=0x7f04000d;
-        public static final int button_stop_service=0x7f04000e;
-        public static final int closed=0x7f040017;
-        public static final int confirm_no=0x7f040012;
-        public static final int confirm_reset=0x7f040010;
-        public static final int confirm_yes=0x7f040011;
-        public static final int disable=0x7f04001c;
-        public static final int enable=0x7f04001d;
-        public static final int main_text=0x7f040014;
-        public static final int menu_settings=0x7f040013;
-        public static final int monitoring_disabled=0x7f04001b;
-        public static final int monitoring_enabled=0x7f04001a;
-        public static final int notify_closed=0x7f040002;
-        public static final int notify_open=0x7f040001;
-        public static final int open=0x7f040016;
-        public static final int pref_apply=0x7f04000a;
-        public static final int pref_boot_start=0x7f04000c;
-        public static final int pref_notify_sound=0x7f04000b;
-        public static final int pref_notify_vibrate=0x7f040007;
-        public static final int pref_open_url=0x7f040009;
-        public static final int pref_reset=0x7f040008;
-        public static final int pref_update_freq=0x7f040005;
-        public static final int pref_update_url=0x7f040006;
-        public static final int status=0x7f040015;
-        public static final int ticker_closed=0x7f040004;
-        public static final int ticker_open=0x7f040003;
-        public static final int unknown=0x7f040018;
-        public static final int updating=0x7f04001e;
+        public static final int app_name=0x7f050000;
+        public static final int button_browse=0x7f05000f;
+        public static final int button_refresh=0x7f050018;
+        public static final int button_start_service=0x7f05000d;
+        public static final int button_stop_service=0x7f05000e;
+        public static final int closed=0x7f050016;
+        public static final int confirm_no=0x7f050012;
+        public static final int confirm_reset=0x7f050010;
+        public static final int confirm_yes=0x7f050011;
+        public static final int disable=0x7f05001b;
+        public static final int enable=0x7f05001c;
+        public static final int main_text=0x7f050013;
+        public static final int menu_settings=0x7f05001e;
+        public static final int monitoring_disabled=0x7f05001a;
+        public static final int monitoring_enabled=0x7f050019;
+        public static final int notify_closed=0x7f050002;
+        public static final int notify_open=0x7f050001;
+        public static final int open=0x7f050015;
+        public static final int pref_apply=0x7f05000a;
+        public static final int pref_boot_start=0x7f05000c;
+        public static final int pref_notify_sound=0x7f05000b;
+        public static final int pref_notify_vibrate=0x7f050007;
+        public static final int pref_open_url=0x7f050009;
+        public static final int pref_reset=0x7f050008;
+        public static final int pref_update_freq=0x7f050005;
+        public static final int pref_update_url=0x7f050006;
+        public static final int ringtone_label=0x7f050023;
+        public static final int ringtone_summary=0x7f050024;
+        public static final int status=0x7f050014;
+        public static final int suppress_label=0x7f05001f;
+        public static final int suppress_summary=0x7f050020;
+        public static final int ticker_closed=0x7f050004;
+        public static final int ticker_open=0x7f050003;
+        public static final int unknown=0x7f050017;
+        public static final int updating=0x7f05001d;
+        public static final int vibrate_label=0x7f050021;
+        public static final int vibrate_summary=0x7f050022;
+    }
+    public static final class xml {
+        public static final int preferences=0x7f040000;
     }
 }

bin/classes.dex

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Techinc</string>
+    <string name="app_name">Technologia Incognita</string>
 
     <string name="notify_open">The space is currently open</string>
     <string name="notify_closed">The space is currently closed</string>
@@ -22,7 +22,6 @@
     <string name="confirm_reset">Are you sure you wish to reset ALL the settings back to default?</string>
     <string name="confirm_yes">Yes sure, blow them away.</string>
     <string name="confirm_no">Shit no!!</string>
-    <string name="menu_settings">Settings</string>
 
     <string name="main_text">
         This application monitors the current status of the Technologia Incognita hackerspace.\n
@@ -38,4 +37,9 @@
     <string name="disable">Disable</string>
     <string name="enable">Enable</string>
     <string name="updating">Updating…</string>
+    <string name="menu_settings">Settings</string>
+    
+    <string name="suppress_label">Suppress closed</string><string name="suppress_summary">Only notify when space opens</string>
+    <string name="vibrate_label">Vibrate</string><string name="vibrate_summary">Vibrate device on notification</string>
+    <string name="ringtone_label">Notification tone</string><string name="ringtone_summary">Select a sound to play with the notification</string>
 </resources>

bin/classes/nl/techinc/notify/GCMIntentService.class

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+    <CheckBoxPreference android:title="@string/suppress_label" android:summary="@string/suppress_summary" android:key="suppress"/><CheckBoxPreference android:title="@string/vibrate_label" android:summary="@string/vibrate_summary" android:key="vibrate"/>
+    <RingtonePreference android:ringtoneType="notification" android:title="@string/ringtone_label" android:showDefault="true" android:summary="@string/ringtone_summary" android:showSilent="true" android:key="ringtone"/>
+    
+    
+
+</PreferenceScreen>

bin/classes/nl/techinc/notify/NotifyActivity$1$1.class

@@ -18,7 +18,7 @@
 
 public class GCMIntentService extends GCMBaseIntentService {
 
-	private static final String GCM_URL = "http://techincnotify.appspot.com";
+	private static final String GCM_URL = "http://nathan7.eu:3000";
 	private static final int NOTE_ID = 1;
 	private String key;
 
@@ -31,7 +31,7 @@ protected void onError(Context context, String errorId) {
 	protected void onMessage(Context context, Intent intent) {
 		boolean state = !(intent.getStringExtra("state").equals("closed"));
 		NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-		int icon = state ? R.drawable.techinclogo : R.drawable.techinclogo_mono;
+		int icon = R.drawable.techinclogo_white;
 		CharSequence tickerText = state ? getString(R.string.ticker_open) : getString(R.string.ticker_closed);
 		long when = System.currentTimeMillis();
 		CharSequence contentTitle = getString(R.string.app_name);

bin/classes/nl/techinc/notify/NotifyActivity$1$2.class

@@ -108,7 +108,7 @@ public boolean onCreateOptionsMenu(Menu menu)
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case R.id.menu_settings:
-			startActivity(new Intent(this, PreferenceSettings.class));
+			startActivity(new Intent(this, SettingsActivity.class));
 			return true;
 		default:
 			return super.onOptionsItemSelected(item);

bin/classes/nl/techinc/notify/NotifyActivity.class

@@ -0,0 +1,17 @@
+package nl.techinc.notify;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+
+public class SettingsActivity extends PreferenceActivity {
+	private SharedPreferences sharedPreferences;
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) {     
+		super.onCreate(savedInstanceState);
+		sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+		addPreferencesFromResource(R.xml.preferences);
+	}
+}