Make the locale edit alerts screen always dark themed:

pull/14/head
Sam Bosley 14 years ago
parent b395725fcc
commit e119dbbc93

@ -10,7 +10,6 @@ import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Spinner; import android.widget.Spinner;
@ -25,7 +24,6 @@ import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.service.ThemeService;
import com.twofortyfouram.SharedResources; import com.twofortyfouram.SharedResources;
/** /**
@ -100,7 +98,7 @@ public final class LocaleEditAlerts extends ListActivity {
/** Called when the activity is first created. */ /** Called when the activity is first created. */
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
ThemeService.forceTheme(R.style.Theme_White); setTheme(R.style.Theme);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.locale_edit_alerts); setContentView(R.layout.locale_edit_alerts);
@ -118,9 +116,9 @@ public final class LocaleEditAlerts extends ListActivity {
/* /*
* Load the Locale background frame from Locale * Load the Locale background frame from Locale
*/ */
((LinearLayout) findViewById(R.id.frame)).setBackgroundDrawable( // ((LinearLayout) findViewById(R.id.frame)).setBackgroundDrawable(
SharedResources.getDrawableResource(getPackageManager(), // SharedResources.getDrawableResource(getPackageManager(),
SharedResources.DRAWABLE_LOCALE_BORDER)); // SharedResources.DRAWABLE_LOCALE_BORDER));
// set up UI components // set up UI components
interval = (Spinner) findViewById(R.id.intervalSpinner); interval = (Spinner) findViewById(R.id.intervalSpinner);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
style="@style/Content">
<!-- At runtime, we'll load the Locale background frame --> <!-- At runtime, we'll load the Locale background frame -->
<LinearLayout <LinearLayout
@ -19,7 +20,7 @@
android:paddingBottom="10px" android:paddingBottom="10px"
android:gravity="center" android:gravity="center"
android:text="@string/locale_edit_intro" android:text="@string/locale_edit_intro"
style="@style/TextAppearance.Locale_Label" /> style="@style/TextAppearance" />
<FrameLayout <FrameLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -32,7 +33,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:scrollbars="vertical" android:scrollbars="vertical"
android:cacheColorHint="@android:color/white"/> android:background="@android:color/black"
android:cacheColorHint="@android:color/black"/>
</FrameLayout> </FrameLayout>
@ -42,14 +44,13 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="@string/locale_interval_label" android:text="@string/locale_interval_label"
style="@style/TextAppearance.Locale_Label" /> style="@style/TextAppearance" />
<Spinner android:id="@+id/intervalSpinner" <Spinner android:id="@+id/intervalSpinner"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:paddingBottom="10dip" android:paddingBottom="10dip"
android:textColor="@android:color/black"
android:entries="@array/locale_interval" /> android:entries="@array/locale_interval" />
</LinearLayout> </LinearLayout>

@ -12,7 +12,7 @@
<!-- Locale filter list styles --> <!-- Locale filter list styles -->
<style name="TextAppearance.LEA_Filter"> <style name="TextAppearance.LEA_Filter">
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/black</item> <item name="android:textColor">@android:color/white</item>
</style> </style>
<style name="TextAppearance.LEA_Header" parent="TextAppearance.LEA_Filter"> <style name="TextAppearance.LEA_Header" parent="TextAppearance.LEA_Filter">

Loading…
Cancel
Save