diff --git a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java index d0bb37d..5456e05 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java @@ -25,7 +25,9 @@ import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.support.v4.content.ContextCompat; import android.support.v4.content.LocalBroadcastManager; +import android.support.v4.view.GravityCompat; import android.support.v4.view.MenuItemCompat; import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.TextViewCompat; @@ -39,7 +41,6 @@ import android.text.Spanned; import android.text.format.DateUtils; 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; @@ -222,7 +223,7 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback // Setup drawer layout getSupportActionBar().setDisplayHomeAsUpEnabled(true); drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); - drawerLayout.setDrawerShadow(getResources().getDrawable(R.drawable.drawer_shadow), Gravity.LEFT); + drawerLayout.setDrawerShadow(ContextCompat.getDrawable(this, R.drawable.drawer_shadow), GravityCompat.START); drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.main_menu, R.string.close_menu) { @Override @@ -475,7 +476,7 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback TextView tv = (TextView) convertView.findViewById(R.id.section_text); SpannableString sectionTitle = new SpannableString(getString(section.getTitleResId())); - Drawable sectionIcon = getResources().getDrawable(section.getIconResId()); + Drawable sectionIcon = ContextCompat.getDrawable(MainActivity.this, section.getIconResId()); if (section == currentSection) { // Special color for the current section sectionTitle.setSpan(new ForegroundColorSpan(currentSectionForegroundColor), 0, sectionTitle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); diff --git a/app/src/main/java/be/digitalia/fosdem/db/DatabaseManager.java b/app/src/main/java/be/digitalia/fosdem/db/DatabaseManager.java index 2b3f3c1..df57247 100644 --- a/app/src/main/java/be/digitalia/fosdem/db/DatabaseManager.java +++ b/app/src/main/java/be/digitalia/fosdem/db/DatabaseManager.java @@ -610,7 +610,7 @@ public class DatabaseManager { final String matchQuery = query + "*"; String[] selectionArgs = new String[]{matchQuery, "%" + query + "%", matchQuery, String.valueOf(limit)}; // Query is similar to getSearchResults but returns different columns, does not join the Day table or the Bookmark table and limits the result set. - Cursor cursor = helper.getReadableDatabase().rawQuery( + return helper.getReadableDatabase().rawQuery( "SELECT e.id AS " + BaseColumns._ID + ", et.title AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ", IFNULL(GROUP_CONCAT(p.name, ', '), '') || ' - ' || t.name AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 @@ -637,7 +637,6 @@ public class DatabaseManager { + " )" + " GROUP BY e.id" + " ORDER BY e.start_time ASC LIMIT ?", selectionArgs); - return cursor; } public static Event toEvent(Cursor cursor, Event event) { diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java index 8e793b7..a7cd34b 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java @@ -1,6 +1,5 @@ package be.digitalia.fosdem.fragments; -import android.app.Activity; import android.content.Context; import android.content.res.TypedArray; import android.database.Cursor; @@ -93,10 +92,10 @@ public class TrackScheduleListFragment extends SmoothListFragment implements Han } @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (activity instanceof Callbacks) { - listener = (Callbacks) activity; + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof Callbacks) { + listener = (Callbacks) context; } } @@ -237,9 +236,6 @@ public class TrackScheduleListFragment extends SmoothListFragment implements Han private static class TrackScheduleAdapter extends CursorAdapter { - private static final int[] PRIMARY_TEXT_COLORS - = new int[]{android.R.attr.textColorPrimary, android.R.attr.textColorPrimaryInverse}; - private final LayoutInflater inflater; private final DateFormat timeDateFormat; private final int timeBackgroundColor; @@ -255,9 +251,9 @@ public class TrackScheduleListFragment extends SmoothListFragment implements Han timeBackgroundColor = ContextCompat.getColor(context, R.color.schedule_time_background); timeRunningBackgroundColor = ContextCompat.getColor(context, R.color.schedule_time_running_background); - TypedArray a = context.getTheme().obtainStyledAttributes(PRIMARY_TEXT_COLORS); - timeForegroundColor = a.getColor(0, 0); - timeRunningForegroundColor = a.getColor(1, 0); + TypedArray a = context.getTheme().obtainStyledAttributes(R.styleable.PrimaryTextColors); + timeForegroundColor = a.getColor(R.styleable.PrimaryTextColors_android_textColorPrimary, 0); + timeRunningForegroundColor = a.getColor(R.styleable.PrimaryTextColors_android_textColorPrimaryInverse, 0); a.recycle(); } diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java index 30bf39b..f7ea5aa 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java @@ -1,7 +1,5 @@ package be.digitalia.fosdem.fragments; -import java.util.List; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -18,13 +16,16 @@ import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + +import com.example.android.common.view.SlidingTabLayout; + +import java.util.List; + import be.digitalia.fosdem.R; import be.digitalia.fosdem.db.DatabaseManager; import be.digitalia.fosdem.loaders.GlobalCacheLoader; import be.digitalia.fosdem.model.Day; -import com.example.android.common.view.SlidingTabLayout; - public class TracksFragment extends Fragment implements LoaderCallbacks> { private static class ViewHolder { @@ -136,7 +137,7 @@ public class TracksFragment extends Fragment implements LoaderCallbacks - + - + - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_navigation_drawer.xml b/app/src/main/res/layout/include_navigation_drawer.xml index 2a06e69..2b1331c 100644 --- a/app/src/main/res/layout/include_navigation_drawer.xml +++ b/app/src/main/res/layout/include_navigation_drawer.xml @@ -23,6 +23,7 @@ diff --git a/app/src/main/res/layout/track_schedule_event.xml b/app/src/main/res/layout/track_schedule_event.xml index a237f0e..31d9716 100644 --- a/app/src/main/res/layout/track_schedule_event.xml +++ b/app/src/main/res/layout/track_schedule_event.xml @@ -1,7 +1,7 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index faf2688..ec2ab3b 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -16,4 +16,9 @@ + + + + + \ No newline at end of file