mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

Turn some private fields to package-local fields to avoid unnecessary indirections through synthetic methods generated for inner classes.

Browse source
This commit is contained in:
Christophe Beyls 2016-08-27 21:29:05 +02:00
parent 0d01274b4a
commit 9ebce6034f
20 changed files with 58 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/android/support/v4/preference/PreferenceFragment.java
View file

@ -29,8 +29,8 @@ import android.widget.ListView;
public abstract class PreferenceFragment extends Fragment { public abstract class PreferenceFragment extends Fragment {
private static final int FIRST_REQUEST_CODE = 100; private static final int FIRST_REQUEST_CODE = 100;
private static final int MSG_BIND_PREFERENCES = 1; static final int MSG_BIND_PREFERENCES = 1;
private static final int MSG_REQUEST_FOCUS = 2; static final int MSG_REQUEST_FOCUS = 2;
private static final String PREFERENCES_TAG = "android:preferences"; private static final String PREFERENCES_TAG = "android:preferences";
private static final float HC_HORIZONTAL_PADDING = 16; private static final float HC_HORIZONTAL_PADDING = 16;
@ -51,7 +51,7 @@ public abstract class PreferenceFragment extends Fragment {
private boolean mHavePrefs; private boolean mHavePrefs;
private boolean mInitDone; private boolean mInitDone;
private ListView mList; ListView mList;
private PreferenceManager mPreferenceManager; private PreferenceManager mPreferenceManager;
@Override @Override
@ -213,7 +213,7 @@ public abstract class PreferenceFragment extends Fragment {
} }
} }
private void bindPreferences() { void bindPreferences() {
final PreferenceScreen preferenceScreen = getPreferenceScreen(); final PreferenceScreen preferenceScreen = getPreferenceScreen();
if (preferenceScreen != null) { if (preferenceScreen != null) {
preferenceScreen.bind(getListView()); preferenceScreen.bind(getListView());

20
app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
View file

@ -116,10 +116,10 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback
} }
} }
private static final int SELECT_MENU_SECTION_WHAT = 1; static final int SELECT_MENU_SECTION_WHAT = 1;
private static final int SELECT_MENU_FOOTER_WHAT = 2; static final int SELECT_MENU_FOOTER_WHAT = 2;
private static final long MENU_ACTION_DELAY = 400L; static final long MENU_ACTION_DELAY = 400L;
private static final long DATABASE_VALIDITY_DURATION = DateUtils.DAY_IN_MILLIS; private static final long DATABASE_VALIDITY_DURATION = DateUtils.DAY_IN_MILLIS;
private static final long DOWNLOAD_REMINDER_SNOOZE_DURATION = DateUtils.DAY_IN_MILLIS; private static final long DOWNLOAD_REMINDER_SNOOZE_DURATION = DateUtils.DAY_IN_MILLIS;
@ -129,15 +129,15 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback
private static final String LAST_UPDATE_DATE_FORMAT = "d MMM yyyy kk:mm:ss"; private static final String LAST_UPDATE_DATE_FORMAT = "d MMM yyyy kk:mm:ss";
private Handler handler; Handler handler;
private Toolbar toolbar; private Toolbar toolbar;
private ProgressBar progressBar; ProgressBar progressBar;
// Main menu // Main menu
private Section currentSection; Section currentSection;
private DrawerLayout drawerLayout; DrawerLayout drawerLayout;
private ActionBarDrawerToggle drawerToggle; private ActionBarDrawerToggle drawerToggle;
private View mainMenu; View mainMenu;
private TextView lastUpdateTextView; private TextView lastUpdateTextView;
private MainMenuAdapter menuAdapter; private MainMenuAdapter menuAdapter;
@ -286,7 +286,7 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback
} }
} }
private void updateLastUpdateTime() { void updateLastUpdateTime() {
long lastUpdateTime = DatabaseManager.getInstance().getLastUpdateTime(); long lastUpdateTime = DatabaseManager.getInstance().getLastUpdateTime();
lastUpdateTextView.setText(getString(R.string.last_update, lastUpdateTextView.setText(getString(R.string.last_update,
(lastUpdateTime == -1L) (lastUpdateTime == -1L)
@ -493,7 +493,7 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback
} }
} }
private final View.OnClickListener sectionClickListener = new View.OnClickListener() { final View.OnClickListener sectionClickListener = new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
int sectionIndex = ((ViewGroup) view.getParent()).indexOfChild(view); int sectionIndex = ((ViewGroup) view.getParent()).indexOfChild(view);

2
app/src/main/java/be/digitalia/fosdem/alarms/FosdemAlarmManager.java
View file

@ -101,7 +101,7 @@ public class FosdemAlarmManager implements OnSharedPreferenceChangeListener {
lbm.unregisterReceiver(bookmarksReceiver); lbm.unregisterReceiver(bookmarksReceiver);
} }
private void startUpdateAlarms() { void startUpdateAlarms() {
Intent serviceIntent = new Intent(context, AlarmIntentService.class); Intent serviceIntent = new Intent(context, AlarmIntentService.class);
serviceIntent.setAction(AlarmIntentService.ACTION_UPDATE_ALARMS); serviceIntent.setAction(AlarmIntentService.ACTION_UPDATE_ALARMS);
context.startService(serviceIntent); context.startService(serviceIntent);

14
app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.java
View file

@ -59,12 +59,12 @@ public class EventDetailsFragment extends Fragment {
ImageView getActionButton(); ImageView getActionButton();
} }
private static class EventDetails { static class EventDetails {
List<Person> persons; List<Person> persons;
List<Link> links; List<Link> links;
} }
private static class ViewHolder { static class ViewHolder {
LayoutInflater inflater; LayoutInflater inflater;
TextView personsTextView; TextView personsTextView;
ViewGroup linksContainer; ViewGroup linksContainer;
@ -75,10 +75,10 @@ public class EventDetailsFragment extends Fragment {
private static final String ARG_EVENT = "event"; private static final String ARG_EVENT = "event";
private Event event; Event event;
private int personsCount = 1; int personsCount = 1;
private Boolean isBookmarked; Boolean isBookmarked;
private ViewHolder holder; ViewHolder holder;
private MenuItem bookmarkMenuItem; private MenuItem bookmarkMenuItem;
private ImageView actionButton; private ImageView actionButton;
@ -239,7 +239,7 @@ public class EventDetailsFragment extends Fragment {
.createChooserIntent(); .createChooserIntent();
} }
private void updateOptionsMenu() { void updateOptionsMenu() {
if (actionButton != null) { if (actionButton != null) {
// Action Button is used as bookmark button // Action Button is used as bookmark button

2
app/src/main/java/be/digitalia/fosdem/fragments/PersonsListFragment.java
View file

@ -140,7 +140,7 @@ public class PersonsListFragment extends SmoothListFragment implements LoaderCal
return indexer.getSections(); return indexer.getSections();
} }
private static class ViewHolder { static class ViewHolder {
public TextView textView; public TextView textView;
public Person person; public Person person;
} }

2
app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java
View file

@ -309,7 +309,7 @@ public class TrackScheduleListFragment extends SmoothListFragment implements Han
holder.room.setText(event.getRoomName()); holder.room.setText(event.getRoomName());
} }
private static class ViewHolder { static class ViewHolder {
TextView time; TextView time;
TextView title; TextView title;
TextView persons; TextView persons;

2
app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java
View file

@ -29,7 +29,7 @@ import be.digitalia.fosdem.model.Day;
public class TracksFragment extends Fragment implements LoaderCallbacks<List<Day>> { public class TracksFragment extends Fragment implements LoaderCallbacks<List<Day>> {
private static class ViewHolder { static class ViewHolder {
View contentView; View contentView;
View emptyView; View emptyView;
ViewPager pager; ViewPager pager;

2
app/src/main/java/be/digitalia/fosdem/fragments/TracksListFragment.java
View file

@ -130,7 +130,7 @@ public class TracksListFragment extends SmoothListFragment implements LoaderCall
holder.type.setText(holder.track.getType().getNameResId()); holder.type.setText(holder.track.getType().getNameResId());
} }
private static class ViewHolder { static class ViewHolder {
TextView name; TextView name;
TextView type; TextView type;
Track track; Track track;

4
app/src/main/java/be/digitalia/fosdem/loaders/BookmarkStatusLoader.java
View file

@ -18,7 +18,7 @@ import android.support.v4.content.LocalBroadcastManager;
*/ */
public class BookmarkStatusLoader extends AsyncTaskLoader<Boolean> { public class BookmarkStatusLoader extends AsyncTaskLoader<Boolean> {
private final Event event; final Event event;
private Boolean isBookmarked; private Boolean isBookmarked;
private final BroadcastReceiver addBookmarkReceiver = new BroadcastReceiver() { private final BroadcastReceiver addBookmarkReceiver = new BroadcastReceiver() {
@ -51,7 +51,7 @@ public class BookmarkStatusLoader extends AsyncTaskLoader<Boolean> {
lbm.registerReceiver(removeBookmarksReceiver, new IntentFilter(DatabaseManager.ACTION_REMOVE_BOOKMARKS)); lbm.registerReceiver(removeBookmarksReceiver, new IntentFilter(DatabaseManager.ACTION_REMOVE_BOOKMARKS));
} }
private void updateBookmark(Boolean result) { void updateBookmark(Boolean result) {
if (isStarted()) { if (isStarted()) {
cancelLoad(); cancelLoad();
} }

2
app/src/main/java/be/digitalia/fosdem/model/Day.java
View file

@ -84,7 +84,7 @@ public class Day implements Parcelable {
} }
}; };
private Day(Parcel in) { Day(Parcel in) {
index = in.readInt(); index = in.readInt();
long time = in.readLong(); long time = in.readLong();
if (time != 0L) { if (time != 0L) {

2
app/src/main/java/be/digitalia/fosdem/model/Event.java
View file

@ -219,7 +219,7 @@ public class Event implements Parcelable {
} }
}; };
private Event(Parcel in) { Event(Parcel in) {
id = in.readLong(); id = in.readLong();
day = Day.CREATOR.createFromParcel(in); day = Day.CREATOR.createFromParcel(in);
long time = in.readLong(); long time = in.readLong();

2
app/src/main/java/be/digitalia/fosdem/model/Link.java
View file

@ -68,7 +68,7 @@ public class Link implements Parcelable {
} }
}; };
private Link(Parcel in) { Link(Parcel in) {
url = in.readString(); url = in.readString();
description = in.readString(); description = in.readString();
} }

2
app/src/main/java/be/digitalia/fosdem/model/Person.java
View file

@ -77,7 +77,7 @@ public class Person implements Parcelable {
} }
}; };
private Person(Parcel in) { Person(Parcel in) {
id = in.readLong(); id = in.readLong();
name = in.readString(); name = in.readString();
} }

2
app/src/main/java/be/digitalia/fosdem/model/Track.java
View file

@ -100,7 +100,7 @@ public class Track implements Parcelable {
} }
}; };
private Track(Parcel in) { Track(Parcel in) {
name = in.readString(); name = in.readString();
type = Type.values()[in.readInt()]; type = Type.values()[in.readInt()];
} }

2
app/src/main/java/be/digitalia/fosdem/utils/NfcSenderUtils.java
View file

@ -44,7 +44,7 @@ class NfcSenderUtils {
return true; return true;
} }
private static NdefRecord createMimeRecord(String mimeType, byte[] payload) { static NdefRecord createMimeRecord(String mimeType, byte[] payload) {
byte[] mimeBytes = mimeType.getBytes(Charset.forName("US-ASCII")); byte[] mimeBytes = mimeType.getBytes(Charset.forName("US-ASCII"));
return new NdefRecord(NdefRecord.TNF_MIME_MEDIA, mimeBytes, new byte[0], payload); return new NdefRecord(NdefRecord.TNF_MIME_MEDIA, mimeBytes, new byte[0], payload);
} }

22
app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java
View file

@ -21,15 +21,7 @@ public class AdapterLinearLayout extends LinearLayout {
*/ */
public static abstract class Adapter<T> { public static abstract class Adapter<T> {
private final DataSetObservable mDataSetObservable = new DataSetObservable(); final DataSetObservable mDataSetObservable = new DataSetObservable();
private void registerDataSetObserver(DataSetObserver observer) {
mDataSetObservable.registerObserver(observer);
}
private void unregisterDataSetObserver(DataSetObserver observer) {
mDataSetObservable.unregisterObserver(observer);
}
public void notifyDataSetChanged() { public void notifyDataSetChanged() {
mDataSetObservable.notifyChanged(); mDataSetObservable.notifyChanged();
@ -42,7 +34,7 @@ public class AdapterLinearLayout extends LinearLayout {
public abstract View getView(int position, View convertView, ViewGroup parent); public abstract View getView(int position, View convertView, ViewGroup parent);
} }
private class AdapterLinearLayoutDataSetObserver extends DataSetObserver { class AdapterLinearLayoutDataSetObserver extends DataSetObserver {
@Override @Override
public void onChanged() { public void onChanged() {
populateFromAdapter(); populateFromAdapter();
@ -67,13 +59,13 @@ public class AdapterLinearLayout extends LinearLayout {
return; return;
} }
if (mAdapter != null && mDataSetObserver != null) { if (mAdapter != null && mDataSetObserver != null) {
mAdapter.unregisterDataSetObserver(mDataSetObserver); mAdapter.mDataSetObservable.unregisterObserver(mDataSetObserver);
} }
removeAllViews(); removeAllViews();
mAdapter = adapter; mAdapter = adapter;
if (adapter != null && mDataSetObserver != null) { if (adapter != null && mDataSetObserver != null) {
populateFromAdapter(); populateFromAdapter();
adapter.registerDataSetObserver(mDataSetObserver); adapter.mDataSetObservable.registerObserver(mDataSetObserver);
} }
} }
@ -83,7 +75,7 @@ public class AdapterLinearLayout extends LinearLayout {
mDataSetObserver = new AdapterLinearLayoutDataSetObserver(); mDataSetObserver = new AdapterLinearLayoutDataSetObserver();
if (mAdapter != null) { if (mAdapter != null) {
populateFromAdapter(); populateFromAdapter();
mAdapter.registerDataSetObserver(mDataSetObserver); mAdapter.mDataSetObservable.registerObserver(mDataSetObserver);
} }
} }
@ -91,12 +83,12 @@ public class AdapterLinearLayout extends LinearLayout {
protected void onDetachedFromWindow() { protected void onDetachedFromWindow() {
super.onDetachedFromWindow(); super.onDetachedFromWindow();
if (mAdapter != null) { if (mAdapter != null) {
mAdapter.unregisterDataSetObserver(mDataSetObserver); mAdapter.mDataSetObservable.unregisterObserver(mDataSetObserver);
} }
mDataSetObserver = null; mDataSetObserver = null;
} }
private void populateFromAdapter() { void populateFromAdapter() {
final Adapter adapter = mAdapter; final Adapter adapter = mAdapter;
final int currentCount = getChildCount(); final int currentCount = getChildCount();
final int newCount = adapter.getCount(); final int newCount = adapter.getCount();

2
app/src/main/java/be/digitalia/fosdem/widgets/BookmarksMultiChoiceModeListener.java
View file

@ -75,7 +75,7 @@ public class BookmarksMultiChoiceModeListener implements MultiChoiceModeListener
public void onDestroyActionMode(ActionMode mode) { public void onDestroyActionMode(ActionMode mode) {
} }
private static class RemoveBookmarksAsyncTask extends AsyncTask<long[], Void, Void> { static class RemoveBookmarksAsyncTask extends AsyncTask<long[], Void, Void> {
@Override @Override
protected Void doInBackground(long[]... params) { protected Void doInBackground(long[]... params) {

4
app/src/main/java/be/digitalia/fosdem/widgets/ScrimInsetsFrameLayout.java
View file

@ -31,8 +31,8 @@ import android.widget.FrameLayout;
import be.digitalia.fosdem.R; import be.digitalia.fosdem.R;
public class ScrimInsetsFrameLayout extends FrameLayout { public class ScrimInsetsFrameLayout extends FrameLayout {
private Drawable mInsetForeground; Drawable mInsetForeground;
private Rect mInsets; Rect mInsets;
private Rect mTempRect = new Rect(); private Rect mTempRect = new Rect();
public ScrimInsetsFrameLayout(Context context) { public ScrimInsetsFrameLayout(Context context) {

16
app/src/main/java/be/digitalia/fosdem/widgets/SlidingTabLayout.java
View file

@ -61,14 +61,14 @@ public class SlidingTabLayout extends HorizontalScrollView {
private ColorStateList mTextColor; private ColorStateList mTextColor;
private ViewPager mViewPager; ViewPager mViewPager;
private PagerAdapter mAdapter; private PagerAdapter mAdapter;
private final InternalViewPagerListener mPageChangeListener = new InternalViewPagerListener(); private final InternalViewPagerListener mPageChangeListener = new InternalViewPagerListener();
private final PagerAdapterObserver mPagerAdapterObserver = new PagerAdapterObserver(); private final PagerAdapterObserver mPagerAdapterObserver = new PagerAdapterObserver();
private TabListener mTabListener; TabListener mTabListener;
private final SlidingTabStrip mTabStrip; final SlidingTabStrip mTabStrip;
public SlidingTabLayout(Context context) { public SlidingTabLayout(Context context) {
this(context, null); this(context, null);
@ -179,7 +179,7 @@ public class SlidingTabLayout extends HorizontalScrollView {
notifyDataSetChanged(); notifyDataSetChanged();
} }
private void notifyDataSetChanged() { void notifyDataSetChanged() {
mTabStrip.removeAllViews(); mTabStrip.removeAllViews();
if (mViewPager != null) { if (mViewPager != null) {
populateTabStrip(); populateTabStrip();
@ -242,7 +242,7 @@ public class SlidingTabLayout extends HorizontalScrollView {
} }
} }
private void scrollToTab(int tabIndex, float positionOffset) { void scrollToTab(int tabIndex, float positionOffset) {
final int tabStripChildCount = mTabStrip.getChildCount(); final int tabStripChildCount = mTabStrip.getChildCount();
if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) { if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) {
return; return;
@ -257,7 +257,7 @@ public class SlidingTabLayout extends HorizontalScrollView {
} }
} }
private class InternalViewPagerListener implements ViewPager.OnPageChangeListener { class InternalViewPagerListener implements ViewPager.OnPageChangeListener {
private int mScrollState; private int mScrollState;
@Override @Override
@ -295,7 +295,7 @@ public class SlidingTabLayout extends HorizontalScrollView {
} }
} }
private class PagerAdapterObserver extends DataSetObserver { class PagerAdapterObserver extends DataSetObserver {
@Override @Override
public void onChanged() { public void onChanged() {
notifyDataSetChanged(); notifyDataSetChanged();
@ -307,7 +307,7 @@ public class SlidingTabLayout extends HorizontalScrollView {
} }
} }
private class TabClickListener implements View.OnClickListener { class TabClickListener implements View.OnClickListener {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
final int childCount = mTabStrip.getChildCount(); final int childCount = mTabStrip.getChildCount();

12
app/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java
View file

@ -39,14 +39,14 @@ import be.digitalia.fosdem.R;
*/ */
public class UnderlinePageIndicator extends View implements PageIndicator { public class UnderlinePageIndicator extends View implements PageIndicator {
private static final int INVALID_POINTER = -1; private static final int INVALID_POINTER = -1;
private static final int FADE_FRAME_MS = 30; static final int FADE_FRAME_MS = 30;
private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
private boolean mFades; boolean mFades;
private int mFadeDelay; private int mFadeDelay;
private int mFadeLength; private int mFadeLength;
private int mFadeBy; int mFadeBy;
private ViewPager mViewPager; private ViewPager mViewPager;
private int mScrollState; private int mScrollState;
@ -58,7 +58,7 @@ public class UnderlinePageIndicator extends View implements PageIndicator {
private int mActivePointerId = INVALID_POINTER; private int mActivePointerId = INVALID_POINTER;
private boolean mIsDragging; private boolean mIsDragging;
private final Runnable mFadeRunnable = new Runnable() { final Runnable mFadeRunnable = new Runnable() {
@Override public void run() { @Override public void run() {
if (!mFades) return; if (!mFades) return;
@ -354,7 +354,7 @@ public class UnderlinePageIndicator extends View implements PageIndicator {
super(superState); super(superState);
} }
private SavedState(Parcel in) { SavedState(Parcel in) {
super(in); super(in);
currentPage = in.readInt(); currentPage = in.readInt();
} }