From 580608d37d35031abb2a7f1fc9314eebe3c68a99 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Tue, 18 Nov 2014 19:47:00 +0100 Subject: [PATCH] Started work on Material design version of Transdroid. Certainly still bugged and need to figure out lots of (often major, liek the split action bar) design details. --- app/build.gradle | 8 ++-- app/src/main/AndroidManifest.xml | 2 +- .../transdroid/core/gui/DetailsActivity.java | 29 +++--------- .../transdroid/core/gui/TorrentsActivity.java | 43 +++++------------- .../lists/NoProgressHeaderTransformer.java | 17 ------- .../core/gui/navigation/DialogHelper.java | 2 +- .../gui/navigation/FilterListAdapter.java | 5 +++ .../core/gui/rss/RssfeedsActivity.java | 9 ++-- .../core/gui/rss/RssitemsActivity.java | 9 ++-- .../gui/settings/HelpSettingsActivity.java | 2 +- .../settings/KeyBoundPreferencesActivity.java | 4 +- .../gui/settings/MainSettingsActivity.java | 2 +- .../NotificationSettingsActivity.java | 2 +- .../gui/settings/RssfeedSettingsActivity.java | 2 +- .../gui/settings/ServerSettingsActivity.java | 2 +- .../gui/settings/SystemSettingsActivity.java | 2 +- .../settings/WebsearchSettingsActivity.java | 2 +- .../seedbox/SeedstuffSettingsActivity.java | 2 +- .../seedbox/XirvikDediSettingsActivity.java | 2 +- .../seedbox/XirvikSemiSettingsActivity.java | 2 +- .../seedbox/XirvikSharedSettingsActivity.java | 2 +- .../core/widget/ListWidgetConfigActivity.java | 10 ++--- .../main/res/layout/actionbar_navigation.xml | 1 + app/src/main/res/values/colors.xml | 5 ++- .../res/values/styles_transdroid_dark.xml | 35 ++------------- .../res/values/styles_transdroid_light.xml | 45 ++----------------- 26 files changed, 63 insertions(+), 183 deletions(-) delete mode 100644 app/src/main/java/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java diff --git a/app/build.gradle b/app/build.gradle index ef8a2aef..9a658fb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'android-apt' apply from: '../signing.gradle' android { - compileSdkVersion 19 + compileSdkVersion 21 buildToolsVersion '20.0.0' defaultConfig { minSdkVersion 15 - targetSdkVersion 19 + targetSdkVersion 21 versionCode 216 versionName '2.3.0-beta' } @@ -46,9 +46,9 @@ dependencies { compile 'org.androidannotations:androidannotations-api:3.1' compile 'com.j256.ormlite:ormlite-core:4.48' compile 'com.j256.ormlite:ormlite-android:4.48' - compile 'com.github.chrisbanes.actionbarpulltorefresh:library:0.8' - compile 'de.keyboardsurfer.android.widget:crouton:1.8.+' + compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.+' + compile 'com.android.support:appcompat-v7:21.0.0' compile 'com.android.support:support-annotations:20.0.0' apt "org.androidannotations:androidannotations:3.1" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2f24b2c4..8378a6c6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -44,7 +44,7 @@ android:hardwareAccelerated="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@android:style/Theme.Holo" > + android:theme="@style/Theme.AppCompat" > autoRefreshTask; @@ -194,7 +188,6 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, // Set the theme according to the user preference if (SystemSettings_.getInstance_(this).useDarkTheme()) { setTheme(R.style.TransdroidTheme_Dark); - getActionBar().setIcon(R.drawable.ic_activity_torrents); } // Catch any uncaught exception to log it Thread.setDefaultUncaughtExceptionHandler(new LogUncaughtExceptionHandler(this, @@ -208,7 +201,7 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, // Set up navigation, with an action bar spinner, server status indicator and possibly (if room) with a filter // list serverStatusView = ServerStatusView_.build(this); - ActionBar actionBar = getActionBar(); + ActionBar actionBar = getSupportActionBar(); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); actionBar.setHomeButtonEnabled(false); actionBar.setDisplayShowTitleEnabled(false); @@ -391,7 +384,7 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, stopAutoRefresh(); } }); - item.setOnActionExpandListener(new OnActionExpandListener() { + MenuItemCompat.setOnActionExpandListener(item, new MenuItemCompat.OnActionExpandListener() { @Override public boolean onMenuItemActionExpand(MenuItem item) { return true; @@ -404,7 +397,7 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, return true; } }); - item.setActionView(searchView); + MenuItemCompat.setActionView(item, searchView); searchMenu = item; } return true; @@ -428,7 +421,7 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, menu.findItem(R.id.action_help).setVisible(true); if (fragmentTorrents != null) fragmentTorrents.updateConnectionStatus(false, null); - getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); return true; } @@ -449,7 +442,7 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, menu.findItem(R.id.action_help).setVisible(false); if (fragmentTorrents != null) fragmentTorrents.updateConnectionStatus(true, currentConnection.getType()); - getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); + getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); return true; } @@ -571,7 +564,7 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, filterSelected(selectedServer, false); addFromIntent(); skipNextOnNavigationItemSelectedCalls++; // Prevent this selection from launching filterSelected() again - getActionBar().setSelectedNavigationItem(position + 1); + getSupportActionBar().setSelectedNavigationItem(position + 1); } /** @@ -665,7 +658,6 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, // Adding a local .torrent file; the title we show is just the file name if (dataUri.getScheme().equals("file")) { addTorrentByFile(data, title); - return; } } @@ -737,20 +729,7 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, */ @Override public void addRefreshableView(View view) { - if (pullToRefreshAttacher == null) { - // Still need to initialise the PullToRefreshAttacher - Options options = new PullToRefreshAttacher.Options(); - options.headerTransformer = new NoProgressHeaderTransformer(); - pullToRefreshAttacher = PullToRefreshAttacher.get(this, options); - } - pullToRefreshAttacher.addRefreshableView(view, new OnRefreshListener() { - @Override - public void onRefreshStarted(View view) { - // Just refresh the full screen, now that the user has pulled to refresh - pullToRefreshAttacher.setRefreshComplete(); - refreshScreen(); - } - }); + // TODO Add new style pull to refresh library } @OptionsItem(resName = "action_refresh") diff --git a/app/src/main/java/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java b/app/src/main/java/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java deleted file mode 100644 index d3632169..00000000 --- a/app/src/main/java/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.transdroid.core.gui.lists; - -import org.transdroid.R; - -import uk.co.senab.actionbarpulltorefresh.library.DefaultHeaderTransformer; -import android.app.Activity; -import android.view.View; - -public class NoProgressHeaderTransformer extends DefaultHeaderTransformer { - - @Override - public void onViewCreated(Activity activity, View headerView) { - super.onViewCreated(activity, headerView); - setProgressBarColor(activity.getResources().getColor(R.color.green)); - } - -} diff --git a/app/src/main/java/org/transdroid/core/gui/navigation/DialogHelper.java b/app/src/main/java/org/transdroid/core/gui/navigation/DialogHelper.java index d5b90a94..9052fe96 100644 --- a/app/src/main/java/org/transdroid/core/gui/navigation/DialogHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/DialogHelper.java @@ -48,7 +48,7 @@ public class DialogHelper extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(dialog.getDialogLayoutId()); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); } @Override diff --git a/app/src/main/java/org/transdroid/core/gui/navigation/FilterListAdapter.java b/app/src/main/java/org/transdroid/core/gui/navigation/FilterListAdapter.java index c75e509d..98686e24 100644 --- a/app/src/main/java/org/transdroid/core/gui/navigation/FilterListAdapter.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/FilterListAdapter.java @@ -114,4 +114,9 @@ public class FilterListAdapter extends MergeAdapter { notifyDataSetChanged(); } + @Override + public int getViewTypeCount() { + return 1; + } + } diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java index b6dd48f0..ab931f6a 100644 --- a/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java @@ -36,16 +36,16 @@ import org.transdroid.core.rssparser.Channel; import org.transdroid.core.rssparser.RssParser; import android.annotation.TargetApi; -import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; import android.text.TextUtils; import de.keyboardsurfer.android.widget.crouton.Crouton; @EActivity(resName = "activity_rssfeeds") -public class RssfeedsActivity extends Activity { +public class RssfeedsActivity extends ActionBarActivity { // Settings and local data @Bean @@ -65,7 +65,6 @@ public class RssfeedsActivity extends Activity { // Set the theme according to the user preference if (SystemSettings_.getInstance_(this).useDarkTheme()) { setTheme(R.style.TransdroidTheme_Dark); - getActionBar().setIcon(R.drawable.ic_activity_torrents); } super.onCreate(savedInstanceState); } @@ -73,8 +72,8 @@ public class RssfeedsActivity extends Activity { @AfterViews protected void init() { // Simple action bar with up button and correct title font - getActionBar().setDisplayHomeAsUpEnabled(true); - getActionBar().setTitle(NavigationHelper.buildCondensedFontString(getString(R.string.rss_feeds))); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setTitle(NavigationHelper.buildCondensedFontString(getString(R.string.rss_feeds))); } @TargetApi(Build.VERSION_CODES.HONEYCOMB) diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java index 50c69460..a5d3f380 100644 --- a/app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java @@ -28,13 +28,13 @@ import org.transdroid.core.gui.navigation.NavigationHelper; import org.transdroid.core.rssparser.Channel; import android.annotation.TargetApi; -import android.app.Activity; import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; @EActivity(resName = "activity_rssitems") -public class RssitemsActivity extends Activity { +public class RssitemsActivity extends ActionBarActivity { @Extra protected Channel rssfeed = null; @@ -49,7 +49,6 @@ public class RssitemsActivity extends Activity { // Set the theme according to the user preference if (SystemSettings_.getInstance_(this).useDarkTheme()) { setTheme(R.style.TransdroidTheme_Dark); - getActionBar().setIcon(R.drawable.ic_activity_torrents); } super.onCreate(savedInstanceState); } @@ -64,8 +63,8 @@ public class RssitemsActivity extends Activity { } // Simple action bar with up button and torrent name as title - getActionBar().setDisplayHomeAsUpEnabled(true); - getActionBar().setTitle(NavigationHelper.buildCondensedFontString(rssfeedName)); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setTitle(NavigationHelper.buildCondensedFontString(rssfeedName)); // Get the intent extras and show them to the already loaded fragment fragmentItems.update(rssfeed, false); diff --git a/app/src/main/java/org/transdroid/core/gui/settings/HelpSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/HelpSettingsActivity.java index 525cfdab..62561437 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/HelpSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/HelpSettingsActivity.java @@ -57,7 +57,7 @@ public class HelpSettingsActivity extends PreferenceActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Just load the system-related preferences from XML addPreferencesFromResource(R.xml.pref_help); diff --git a/app/src/main/java/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java index d291a6ec..1f89a390 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java @@ -78,14 +78,14 @@ public abstract class KeyBoundPreferencesActivity extends PreferenceActivity { // Monitor preference changes PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener( onPreferenceChangeListener); - }; + } protected void onPause() { super.onPause(); // Stop monitoring preference changes PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener( onPreferenceChangeListener); - }; + } private OnSharedPreferenceChangeListener onPreferenceChangeListener = new OnSharedPreferenceChangeListener() { @Override diff --git a/app/src/main/java/org/transdroid/core/gui/settings/MainSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/MainSettingsActivity.java index 0f4d02a9..10e635fa 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/MainSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/MainSettingsActivity.java @@ -166,7 +166,7 @@ public class MainSettingsActivity extends PreferenceActivity { protected void onResume() { super.onResume(); - getActionBar().setDisplayHomeAsUpEnabled(true); + //TODO getActionBar().setDisplayHomeAsUpEnabled(true); prefs = getPreferenceManager().getSharedPreferences(); if (getPreferenceScreen() != null) { diff --git a/app/src/main/java/org/transdroid/core/gui/settings/NotificationSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/NotificationSettingsActivity.java index 72e7971d..66a57dcb 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/NotificationSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/NotificationSettingsActivity.java @@ -43,7 +43,7 @@ public class NotificationSettingsActivity extends PreferenceActivity implements protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the notification-related preferences from XML and update availability thereof addPreferencesFromResource(R.xml.pref_notifications); diff --git a/app/src/main/java/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java index 59785028..c302cde6 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java @@ -46,7 +46,7 @@ public class RssfeedSettingsActivity extends KeyBoundPreferencesActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the raw preferences to show in this screen init(R.xml.pref_rssfeed, ApplicationSettings_.getInstance_(this).getMaxRssfeed()); diff --git a/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java index 1a8b3d59..8c36f0bf 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java @@ -52,7 +52,7 @@ public class ServerSettingsActivity extends KeyBoundPreferencesActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the raw preferences to show in this screen init(R.xml.pref_server, ApplicationSettings_.getInstance_(this).getMaxNormalServer()); diff --git a/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java index 52def869..743b6ba8 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java @@ -160,7 +160,7 @@ public class SystemSettingsActivity extends PreferenceActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Just load the system-related preferences from XML addPreferencesFromResource(R.xml.pref_system); diff --git a/app/src/main/java/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java index 3dbe1e81..1b94f9c8 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java @@ -46,7 +46,7 @@ public class WebsearchSettingsActivity extends KeyBoundPreferencesActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the raw preferences to show in this screen init(R.xml.pref_websearch, ApplicationSettings_.getInstance_(this).getMaxWebsearch()); diff --git a/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java index 17433b8f..9b266942 100644 --- a/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java @@ -42,7 +42,7 @@ public class SeedstuffSettingsActivity extends KeyBoundPreferencesActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the raw preferences to show in this screen init(R.xml.pref_seedbox_seedstuff, diff --git a/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java index 429fc0e8..b220bfe8 100644 --- a/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java @@ -42,7 +42,7 @@ public class XirvikDediSettingsActivity extends KeyBoundPreferencesActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the raw preferences to show in this screen init(R.xml.pref_seedbox_xirvikdedi, diff --git a/app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java index 79cd7ff3..5fd42862 100644 --- a/app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java @@ -42,7 +42,7 @@ public class XirvikSemiSettingsActivity extends KeyBoundPreferencesActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the raw preferences to show in this screen init(R.xml.pref_seedbox_xirviksemi, diff --git a/app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java index fd5f6389..fe066e82 100644 --- a/app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java @@ -59,7 +59,7 @@ public class XirvikSharedSettingsActivity extends KeyBoundPreferencesActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); + // TODO getActionBar().setDisplayHomeAsUpEnabled(true); // Load the raw preferences to show in this screen init(R.xml.pref_seedbox_xirvikshared, diff --git a/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java index 783b46a4..b2f1bb78 100644 --- a/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java +++ b/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java @@ -17,12 +17,12 @@ package org.transdroid.core.widget; import android.annotation.TargetApi; -import android.app.ActionBar; -import android.app.Activity; import android.appwidget.AppWidgetManager; import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.view.View; import android.view.View.OnClickListener; import android.widget.CheckBox; @@ -66,7 +66,7 @@ import java.util.List; @TargetApi(Build.VERSION_CODES.HONEYCOMB) @EActivity(resName = "activity_widgetconfig") -public class ListWidgetConfigActivity extends Activity { +public class ListWidgetConfigActivity extends ActionBarActivity { // Views and adapters @ViewById @@ -182,11 +182,11 @@ public class ListWidgetConfigActivity extends Activity { // Set up action bar with a done button // Inspired by NoNonsenseNotes's ListWidgetConfig.java (Apache License, Version 2.0) - getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, + getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE); View doneButtonFrame = getLayoutInflater().inflate(R.layout.actionbar_donebutton, null); doneButtonFrame.findViewById(R.id.actionbar_done).setOnClickListener(doneClicked); - getActionBar().setCustomView(doneButtonFrame); + getSupportActionBar().setCustomView(doneButtonFrame); } diff --git a/app/src/main/res/layout/actionbar_navigation.xml b/app/src/main/res/layout/actionbar_navigation.xml index 208bbe27..83393863 100644 --- a/app/src/main/res/layout/actionbar_navigation.xml +++ b/app/src/main/res/layout/actionbar_navigation.xml @@ -19,6 +19,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical" + android:minWidth="120dp" android:paddingRight="@dimen/margin_half" > - #8acc12 + #80c713 + #4b6617 #7dbb21 #c81113 #aada62 @@ -30,7 +31,7 @@ #de3939 #9e9e9e #c8e88e - #8acc12 + #80c713 #4b6617 #9e9e9e diff --git a/app/src/main/res/values/styles_transdroid_dark.xml b/app/src/main/res/values/styles_transdroid_dark.xml index 9af553e7..636eca05 100644 --- a/app/src/main/res/values/styles_transdroid_dark.xml +++ b/app/src/main/res/values/styles_transdroid_dark.xml @@ -18,38 +18,9 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/styles_transdroid_light.xml b/app/src/main/res/values/styles_transdroid_light.xml index d45b464d..a711ba42 100644 --- a/app/src/main/res/values/styles_transdroid_light.xml +++ b/app/src/main/res/values/styles_transdroid_light.xml @@ -19,48 +19,9 @@ - - - - - - - - - - - - - - - \ No newline at end of file