diff --git a/app-android/project.properties b/app-android/project.properties index a3ee5ab..655eb8f 100644 --- a/app-android/project.properties +++ b/app-android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17 +target=Google Inc.:Google APIs:14 diff --git a/app-android/res/layout/activity_canvas.xml b/app-android/res/layout/activity_canvas.xml index 6fd299c..1818a83 100644 --- a/app-android/res/layout/activity_canvas.xml +++ b/app-android/res/layout/activity_canvas.xml @@ -10,6 +10,7 @@ android:layout_height="fill_parent" android:layout_alignParentRight="true" android:layout_alignParentTop="true" + android:background="@color/Dark" android:orientation="vertical" > diff --git a/app-android/res/values/colors.xml b/app-android/res/values/colors.xml new file mode 100644 index 0000000..18d7d93 --- /dev/null +++ b/app-android/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #2E2E2E + + \ No newline at end of file diff --git a/app-android/res/values/strings.xml b/app-android/res/values/strings.xml index 8e01210..287484a 100644 --- a/app-android/res/values/strings.xml +++ b/app-android/res/values/strings.xml @@ -9,5 +9,6 @@ About / Help Title bar will only be hidden when hardware menu button is present Ignores touch events from fingers + Use Dark Background diff --git a/app-android/res/xml/layout_preferences.xml b/app-android/res/xml/layout_preferences.xml new file mode 100644 index 0000000..bc468f9 --- /dev/null +++ b/app-android/res/xml/layout_preferences.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app-android/res/xml/preference_headers.xml b/app-android/res/xml/preference_headers.xml index 3b9039a..82034ae 100644 --- a/app-android/res/xml/preference_headers.xml +++ b/app-android/res/xml/preference_headers.xml @@ -5,5 +5,7 @@ android:title="Networking" />
+
diff --git a/app-android/src/at/bitfire/gfxtablet/CanvasView.java b/app-android/src/at/bitfire/gfxtablet/CanvasView.java index 52cb10d..206b896 100644 --- a/app-android/src/at/bitfire/gfxtablet/CanvasView.java +++ b/app-android/src/at/bitfire/gfxtablet/CanvasView.java @@ -24,12 +24,14 @@ public class CanvasView extends View implements OnSharedPreferenceChangeListener // disable until networking has been configured setEnabled(false); - setBackgroundColor(0xFFD0D0D0); + setBackgroundColor(0xFFD0D0D0); //0x2A2A2A settings = PreferenceManager.getDefaultSharedPreferences(context); settings.registerOnSharedPreferenceChangeListener(this); + reconfigureAcceptedInputDevices(); + this.reconfigureLayout(); this.netClient = netClient; new ConfigureNetworkingTask().execute(); } @@ -39,7 +41,17 @@ public class CanvasView extends View implements OnSharedPreferenceChangeListener if (key.equals(SettingsActivity.KEY_PREF_HOST)) new ConfigureNetworkingTask().execute(); else if (key.equals(SettingsActivity.KEY_PREF_STYLUS_ONLY)) - reconfigureAcceptedInputDevices(); + this.reconfigureAcceptedInputDevices(); + else if (key.equals(SettingsActivity.KEY_PREF_DARKCANVAS)) + this.reconfigureLayout(); + } + + void reconfigureLayout() + { + if (settings.getBoolean(SettingsActivity.KEY_PREF_DARKCANVAS, false)) + setBackgroundColor(0x2E2E2E); + else + setBackgroundColor(0xFFD0D0D0); } void reconfigureAcceptedInputDevices() { diff --git a/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java b/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java index aa8d76a..69beca7 100644 --- a/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java +++ b/app-android/src/at/bitfire/gfxtablet/SettingsActivity.java @@ -18,7 +18,8 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref public static final String KEY_PREF_HOST = "host_preference", KEY_PREF_STYLUS_ONLY = "stylus_only_preference", - KEY_PREF_FULLSCREEN = "fullscreen_preference"; + KEY_PREF_FULLSCREEN = "fullscreen_preference", + KEY_PREF_DARKCANVAS = "darkcanvas_preference"; @Override @@ -64,4 +65,12 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref addPreferencesFromResource(R.xml.drawing_preferences); } } + + public static class LayoutPrefsFragment extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.layout_preferences); + } + } }