First batch of Material Design with complete new themes, styles and ActionBar drawables.

app/build.gradle

@@ -1,18 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
     buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "be.digitalia.fosdem"
         minSdkVersion 7
-        targetSdkVersion 19
+        targetSdkVersion 21
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
     }
 
     buildTypes {
@@ -24,6 +19,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.android.support:appcompat-v7:21.0.+'
-    compile 'com.github.chrisbanes.photoview:library:1.2.+'
+    // Version 1.2.3 has a bug and crashes when detecting 2-finger gestures. Use 1.2.2 instead.
+    compile 'com.github.chrisbanes.photoview:library:1.2.2'
 }

app/src/main/AndroidManifest.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
     package="be.digitalia.fosdem"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:installLocation="auto"
-    android:versionCode="700110"
+    android:versionCode="700130"
-    android:versionName="1.1.0" >
+    android:versionName="1.3.0">
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.NFC"/>
 
     <!-- Permissions required for alarms -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <!-- Make touch screen optional since all screens can be used with a pad -->
     <uses-feature
         android:name="android.hardware.touchscreen"
-        android:required="false" />
+        android:required="false"/>
 
     <application
         android:name="be.digitalia.fosdem.FosdemApplication"
@@ -28,73 +29,74 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".activities.MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.default_searchable"
-                android:value=".activities.SearchResultActivity" />
+                android:value=".activities.SearchResultActivity"/>
         </activity>
-        <activity android:name=".activities.TrackScheduleActivity" >
+        <activity android:name=".activities.TrackScheduleActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.MainActivity" />
+                android:value=".activities.MainActivity"/>
         </activity>
-        <activity android:name=".activities.TrackScheduleEventActivity" />
+        <activity android:name=".activities.TrackScheduleEventActivity"/>
-        <activity android:name=".activities.EventDetailsActivity" >
+        <activity android:name=".activities.EventDetailsActivity">
             <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <data android:mimeType="application/be.digitalia.fosdem" />
+                <data android:mimeType="application/be.digitalia.fosdem"/>
             </intent-filter>
         </activity>
-        <activity android:name=".activities.PersonInfoActivity" />
+        <activity android:name=".activities.PersonInfoActivity"/>
         <activity
             android:name=".activities.SearchResultActivity"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop">
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/main_searchable" />
+                android:resource="@xml/main_searchable"/>
         </activity>
         <!-- Clearing the Task Affinity allows this dialog activity to be displayed without bringing to front the main application with it. -->
         <activity
             android:name=".activities.RoomImageDialogActivity"
             android:excludeFromRecents="true"
             android:taskAffinity=""
-            android:theme="@style/DialogTheme" />
+            android:theme="@style/DialogTheme"/>
         <activity
             android:name=".activities.SettingsActivity"
-            android:label="@string/settings" />
+            android:label="@string/settings"/>
 
         <receiver
             android:name=".receivers.AlarmReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
 
         <service
             android:name=".services.AlarmIntentService"
-            android:exported="false" />
+            android:exported="false"/>
 
         <provider
             android:name=".providers.SearchSuggestionProvider"
             android:authorities="be.digitalia.fosdem.search"
-            android:exported="true" />
+            android:exported="true"/>
     </application>
 
 </manifest>

app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java

@@ -1,9 +1,5 @@
 package be.digitalia.fosdem.activities;
 
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Locale;
-
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -15,14 +11,16 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
-import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -31,21 +29,31 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
+import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
+import android.text.style.ForegroundColorSpan;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
+import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Locale;
+
 import be.digitalia.fosdem.R;
 import be.digitalia.fosdem.api.FosdemApi;
 import be.digitalia.fosdem.db.DatabaseManager;
@@ -63,11 +71,11 @@ import be.digitalia.fosdem.fragments.TracksFragment;
 public class MainActivity extends ActionBarActivity implements ListView.OnItemClickListener {
 
 	private enum Section {
-		TRACKS(TracksFragment.class, R.string.menu_tracks, R.drawable.ic_action_event, true),
+		TRACKS(TracksFragment.class, R.string.menu_tracks, R.drawable.ic_event_grey600_24dp, true),
-		BOOKMARKS(BookmarksListFragment.class, R.string.menu_bookmarks, R.drawable.ic_action_important, false),
+		BOOKMARKS(BookmarksListFragment.class, R.string.menu_bookmarks, R.drawable.ic_bookmark_grey600_24dp, false),
-		LIVE(LiveFragment.class, R.string.menu_live, R.drawable.ic_action_play_over_video, false),
+		LIVE(LiveFragment.class, R.string.menu_live, R.drawable.ic_play_circle_outline_grey600_24dp, false),
-		SPEAKERS(PersonsListFragment.class, R.string.menu_speakers, R.drawable.ic_action_group, false),
+		SPEAKERS(PersonsListFragment.class, R.string.menu_speakers, R.drawable.ic_people_grey600_24dp, false),
-		MAP(MapFragment.class, R.string.menu_map, R.drawable.ic_action_map, false);
+		MAP(MapFragment.class, R.string.menu_map, R.drawable.ic_map_grey600_24dp, false);
 
 		private final String fragmentClassName;
 		private final int titleResId;
@@ -108,6 +116,7 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 
 	private Section currentSection;
 
+	private ProgressBar progressBar;
 	private DrawerLayout drawerLayout;
 	private ActionBarDrawerToggle drawerToggle;
 	private View mainMenu;
@@ -120,8 +129,8 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 
 		@Override
 		public void onReceive(Context context, Intent intent) {
-			setSupportProgressBarIndeterminate(false);
+			progressBar.setIndeterminate(false);
-			setSupportProgress(intent.getIntExtra(FosdemApi.EXTRA_PROGRESS, 0) * 100);
+			progressBar.setProgress(intent.getIntExtra(FosdemApi.EXTRA_PROGRESS, 0));
 		}
 	};
 
@@ -130,8 +139,10 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 		@Override
 		public void onReceive(Context context, Intent intent) {
 			// Hide the progress bar with a fill and fade out animation
-			setSupportProgressBarIndeterminate(false);
+			progressBar.setIndeterminate(false);
-			setSupportProgress(10000);
+			progressBar.setProgress(100);
+			progressBar.startAnimation(AnimationUtils.loadAnimation(MainActivity.this, android.R.anim.fade_out));
+			progressBar.setVisibility(View.GONE);
 
 			int result = intent.getIntExtra(FosdemApi.EXTRA_RESULT, FosdemApi.RESULT_ERROR);
 			String message;
@@ -177,14 +188,18 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		supportRequestWindowFeature(Window.FEATURE_PROGRESS);
 		setContentView(R.layout.main);
 
+		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
+
+		progressBar = (ProgressBar) findViewById(R.id.progress);
+
 		// Setup drawer layout
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
 		drawerLayout.setDrawerShadow(getResources().getDrawable(R.drawable.drawer_shadow), Gravity.LEFT);
-		drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.drawable.ic_drawer, R.string.main_menu, R.string.close_menu) {
+		drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.main_menu, R.string.close_menu) {
 
 			@Override
 			public void onDrawerOpened(View drawerView) {
@@ -277,7 +292,7 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 		super.onStart();
 
 		// Ensure the progress bar is hidden when starting
-		setSupportProgressBarVisibility(false);
+		progressBar.setVisibility(View.GONE);
 
 		// Monitor the schedule download
 		LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
@@ -390,8 +405,9 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 	@SuppressLint("NewApi")
 	public void startDownloadSchedule() {
 		// Start by displaying indeterminate progress, determinate will come later
-		setSupportProgressBarIndeterminate(true);
+		progressBar.clearAnimation();
-		setSupportProgressBarVisibility(true);
+		progressBar.setIndeterminate(true);
+		progressBar.setVisibility(View.VISIBLE);
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 			new DownloadScheduleAsyncTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 		} else {
@@ -420,10 +436,18 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 
 		private Section[] sections = Section.values();
 		private LayoutInflater inflater;
+		private int currentSectionForegroundColor;
 		private int currentSectionBackgroundColor;
 
 		public MainMenuAdapter(LayoutInflater inflater) {
 			this.inflater = inflater;
+			// Select the primary color to tint the current section
+			TypedArray a = getTheme().obtainStyledAttributes(new int[]{R.attr.colorPrimary});
+			try {
+				currentSectionForegroundColor = a.getColor(0, Color.TRANSPARENT);
+			} finally {
+				a.recycle();
+			}
 			currentSectionBackgroundColor = getResources().getColor(R.color.translucent_grey);
 		}
 
@@ -451,10 +475,22 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 			Section section = getItem(position);
 
 			TextView tv = (TextView) convertView.findViewById(R.id.section_text);
-			tv.setText(section.getTitleResId());
+			SpannableString sectionTitle = new SpannableString(getString(section.getTitleResId()));
-			tv.setCompoundDrawablesWithIntrinsicBounds(section.getIconResId(), 0, 0, 0);
+			Drawable sectionIcon = getResources().getDrawable(section.getIconResId());
-			// Show highlighted background for current section
+			int backgroundColor;
-			tv.setBackgroundColor((section == currentSection) ? currentSectionBackgroundColor : Color.TRANSPARENT);
+			if (section == currentSection) {
+				// Special color for the current section
+				//sectionTitle.setSpan(new StyleSpan(Typeface.BOLD), 0, sectionTitle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+				sectionTitle.setSpan(new ForegroundColorSpan(currentSectionForegroundColor), 0, sectionTitle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+				// We need to mutate the drawable before applying the ColorFilter, or else all the similar drawable instances will be tinted.
+				sectionIcon.mutate().setColorFilter(currentSectionForegroundColor, PorterDuff.Mode.SRC_IN);
+				backgroundColor = currentSectionBackgroundColor;
+			} else {
+				backgroundColor = Color.TRANSPARENT;
+			}
+			tv.setText(sectionTitle);
+			tv.setCompoundDrawablesWithIntrinsicBounds(sectionIcon, null, null, null);
+			tv.setBackgroundColor(backgroundColor);
 
 			return convertView;
 		}

app/src/main/java/be/digitalia/fosdem/adapters/EventsAdapter.java

@@ -73,7 +73,7 @@ public class EventsAdapter extends CursorAdapter {
 		}
 		spannableString.setSpan(holder.titleSizeSpan, 0, eventTitle.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		holder.title.setText(spannableString);
-		int bookmarkDrawable = DatabaseManager.toBookmarkStatus(cursor) ? R.drawable.ic_small_starred : 0;
+		int bookmarkDrawable = DatabaseManager.toBookmarkStatus(cursor) ? R.drawable.ic_bookmark_grey600_24dp : 0;
 		holder.title.setCompoundDrawablesWithIntrinsicBounds(0, 0, bookmarkDrawable, 0);
 
 		holder.trackName.setText(event.getTrack().getName());

app/src/main/java/be/digitalia/fosdem/fragments/BookmarksListFragment.java

@@ -14,6 +14,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
+
 import be.digitalia.fosdem.R;
 import be.digitalia.fosdem.activities.EventDetailsActivity;
 import be.digitalia.fosdem.adapters.EventsAdapter;
@@ -24,9 +25,8 @@ import be.digitalia.fosdem.widgets.BookmarksMultiChoiceModeListener;
 
 /**
  * Bookmarks list, optionally filterable.
- * 
+ *
  * @author Christophe Beyls
- * 
  */
 public class BookmarksListFragment extends ListFragment implements LoaderCallbacks<Cursor> {
 
@@ -75,7 +75,9 @@ public class BookmarksListFragment extends ListFragment implements LoaderCallbac
 
 	private void updateOptionsMenu() {
 		if (filterMenuItem != null) {
-			filterMenuItem.setIcon(upcomingOnly ? R.drawable.ic_action_filter_selected : R.drawable.ic_action_filter);
+			filterMenuItem.setIcon(upcomingOnly ?
+					R.drawable.ic_filter_list_selected_white_24dp
+					: R.drawable.ic_filter_list_white_24dp);
 			upcomingOnlyMenuItem.setChecked(upcomingOnly);
 		}
 	}
@@ -90,12 +92,12 @@ public class BookmarksListFragment extends ListFragment implements LoaderCallbac
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.upcoming_only:
+			case R.id.upcoming_only:
-			upcomingOnly = !upcomingOnly;
+				upcomingOnly = !upcomingOnly;
-			updateOptionsMenu();
+				updateOptionsMenu();
-			getActivity().getPreferences(Context.MODE_PRIVATE).edit().putBoolean(PREF_UPCOMING_ONLY, upcomingOnly).commit();
+				getActivity().getPreferences(Context.MODE_PRIVATE).edit().putBoolean(PREF_UPCOMING_ONLY, upcomingOnly).commit();
-			getLoaderManager().restartLoader(BOOKMARKS_LOADER_ID, null, this);
+				getLoaderManager().restartLoader(BOOKMARKS_LOADER_ID, null, this);
-			return true;
+				return true;
 		}
 		return false;
 	}

app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.java

@@ -1,9 +1,5 @@
 package be.digitalia.fosdem.fragments;
 
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.List;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -32,6 +28,11 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.List;
+
 import be.digitalia.fosdem.R;
 import be.digitalia.fosdem.activities.PersonInfoActivity;
 import be.digitalia.fosdem.db.DatabaseManager;
@@ -201,10 +202,10 @@ public class EventDetailsFragment extends Fragment {
 
 				if (isBookmarked) {
 					bookmarkMenuItem.setTitle(R.string.remove_bookmark);
-					bookmarkMenuItem.setIcon(R.drawable.ic_action_important);
+					bookmarkMenuItem.setIcon(R.drawable.ic_bookmark_white_24dp);
 				} else {
 					bookmarkMenuItem.setTitle(R.string.add_bookmark);
-					bookmarkMenuItem.setIcon(R.drawable.ic_action_not_important);
+					bookmarkMenuItem.setIcon(R.drawable.ic_bookmark_outline_white_24dp);
 				}
 			}
 		}
@@ -219,14 +220,14 @@ public class EventDetailsFragment extends Fragment {
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.bookmark:
+			case R.id.bookmark:
-			if (isBookmarked != null) {
+				if (isBookmarked != null) {
-				new UpdateBookmarkAsyncTask(event).execute(isBookmarked);
+					new UpdateBookmarkAsyncTask(event).execute(isBookmarked);
-			}
+				}
-			return true;
+				return true;
-		case R.id.add_to_agenda:
+			case R.id.add_to_agenda:
-			addToAgenda();
+				addToAgenda();
-			return true;
+				return true;
 		}
 		return false;
 	}

app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java

@@ -321,7 +321,7 @@ public class TrackScheduleListFragment extends ListFragment implements Handler.C
 			spannableString.setSpan(holder.boldStyleSpan, 0, eventTitle.length() + personsSummary.length() + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 
 			holder.text.setText(spannableString);
-			int bookmarkDrawable = DatabaseManager.toBookmarkStatus(cursor) ? R.drawable.ic_small_starred : 0;
+			int bookmarkDrawable = DatabaseManager.toBookmarkStatus(cursor) ? R.drawable.ic_bookmark_grey600_24dp : 0;
 			holder.text.setCompoundDrawablesWithIntrinsicBounds(0, 0, bookmarkDrawable, 0);
 		}
 

app/src/main/java/be/digitalia/fosdem/services/AlarmIntentService.java

@@ -202,7 +202,7 @@ public class AlarmIntentService extends IntentService {
 						PendingIntent mapPendingIntent = PendingIntent.getActivity(this, 0, mapIntent,
 								PendingIntent.FLAG_UPDATE_CURRENT);
 						CharSequence mapTitle = getString(R.string.room_map);
-						notificationBuilder.addAction(new NotificationCompat.Action(R.drawable.ic_action_place, mapTitle,
+						notificationBuilder.addAction(new NotificationCompat.Action(R.drawable.ic_place_white_24dp, mapTitle,
 								mapPendingIntent));
 						// Use bigger action icon for wearable notification
 						wearableExtender.addAction(new NotificationCompat.Action(R.drawable.ic_place_white_wear, mapTitle,