From 482734f8d088d2df50786b73714022c208786fcb Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 11 Mar 2015 16:25:55 +0300 Subject: [PATCH] Renamed fragments & added statistics to list fragments. --- .../mapswithme/country/DownloadActivity.java | 4 ++-- .../mapswithme/country/DownloadFragment.java | 4 ++-- .../maps/DownloadResourcesActivity.java | 4 ++-- .../src/com/mapswithme/maps/MWMActivity.java | 4 ++-- ...{MWMFragment.java => BaseMwmFragment.java} | 21 +------------------ ...vity.java => BaseMwmFragmentActivity.java} | 2 +- ...Fragment.java => BaseMwmListFragment.java} | 15 +++++++++++-- .../maps/bookmarks/BookmarkActivity.java | 4 ++-- .../bookmarks/BookmarkCategoriesActivity.java | 4 ++-- .../bookmarks/BookmarkCategoriesFragment.java | 4 ++-- .../maps/bookmarks/BookmarkListActivity.java | 4 ++-- .../maps/bookmarks/BookmarksListFragment.java | 4 ++-- .../ChooseBookmarkCategoryActivity.java | 4 ++-- .../ChooseBookmarkCategoryFragment.java | 4 ++-- .../maps/search/SearchActivity.java | 4 ++-- .../maps/search/SearchFragment.java | 4 ++-- .../maps/settings/StoragePathActivity.java | 4 ++-- .../maps/settings/StoragePathFragment.java | 4 ++-- .../nvidia/devtech/NvEventQueueFragment.java | 4 ++-- 19 files changed, 47 insertions(+), 55 deletions(-) rename android/src/com/mapswithme/maps/base/{MWMFragment.java => BaseMwmFragment.java} (57%) rename android/src/com/mapswithme/maps/base/{MWMFragmentActivity.java => BaseMwmFragmentActivity.java} (96%) rename android/src/com/mapswithme/maps/base/{MWMListFragment.java => BaseMwmListFragment.java} (62%) diff --git a/android/src/com/mapswithme/country/DownloadActivity.java b/android/src/com/mapswithme/country/DownloadActivity.java index 978cab40d1..001d79b38e 100644 --- a/android/src/com/mapswithme/country/DownloadActivity.java +++ b/android/src/com/mapswithme/country/DownloadActivity.java @@ -4,10 +4,10 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; -public class DownloadActivity extends MWMFragmentActivity +public class DownloadActivity extends BaseMwmFragmentActivity { private DownloadFragment mDownloadFragment; diff --git a/android/src/com/mapswithme/country/DownloadFragment.java b/android/src/com/mapswithme/country/DownloadFragment.java index fddcda69cb..c2637fcdcd 100644 --- a/android/src/com/mapswithme/country/DownloadFragment.java +++ b/android/src/com/mapswithme/country/DownloadFragment.java @@ -12,11 +12,11 @@ import android.widget.TextView; import com.mapswithme.maps.MWMActivity; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMListFragment; +import com.mapswithme.maps.base.BaseMwmListFragment; import com.mapswithme.maps.base.OnBackPressListener; import com.mapswithme.util.UiUtils; -public class DownloadFragment extends MWMListFragment implements View.OnClickListener, ActiveCountryTree.ActiveCountryListener, OnBackPressListener +public class DownloadFragment extends BaseMwmListFragment implements View.OnClickListener, ActiveCountryTree.ActiveCountryListener, OnBackPressListener { private ExtendedDownloadAdapterWrapper mExtendedAdapter; private DownloadedAdapter mDownloadedAdapter; diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java index 7fa863d1c4..3529924caa 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java @@ -21,7 +21,7 @@ import com.mapswithme.maps.MWMActivity.OpenUrlTask; import com.mapswithme.maps.MapStorage.Index; import com.mapswithme.maps.api.Const; import com.mapswithme.maps.api.ParsedMmwRequest; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.util.ConnectionState; import com.mapswithme.util.Constants; @@ -35,7 +35,7 @@ import java.io.InputStream; import java.io.OutputStream; @SuppressLint("StringFormatMatches") -public class DownloadResourcesActivity extends MWMFragmentActivity +public class DownloadResourcesActivity extends BaseMwmFragmentActivity implements LocationHelper.LocationListener, MapStorage.Listener { private static final String TAG = DownloadResourcesActivity.class.getName(); diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index bda826c338..965d65ffb0 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -46,7 +46,7 @@ import com.mapswithme.maps.Framework.OnBalloonListener; import com.mapswithme.maps.MapStorage.Index; import com.mapswithme.maps.ads.LikesManager; import com.mapswithme.maps.api.ParsedMmwRequest; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.bookmarks.BookmarkActivity; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; import com.mapswithme.maps.bookmarks.data.Bookmark; @@ -84,7 +84,7 @@ import java.io.Serializable; import java.util.Stack; import java.util.concurrent.TimeUnit; -public class MWMActivity extends MWMFragmentActivity +public class MWMActivity extends BaseMwmFragmentActivity implements LocationHelper.LocationListener, OnBalloonListener, View.OnTouchListener, BasePlacePageAnimationController.OnVisibilityChangedListener, OnClickListener, Framework.RoutingListener, MapFragment.MapRenderingListener { diff --git a/android/src/com/mapswithme/maps/base/MWMFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java similarity index 57% rename from android/src/com/mapswithme/maps/base/MWMFragment.java rename to android/src/com/mapswithme/maps/base/BaseMwmFragment.java index 1e84bc67e3..5dfff3fc2a 100644 --- a/android/src/com/mapswithme/maps/base/MWMFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java @@ -1,28 +1,9 @@ package com.mapswithme.maps.base; -import android.os.Bundle; import android.support.v4.app.Fragment; -public class MWMFragment extends Fragment +public class BaseMwmFragment extends Fragment { - @Override - public void onCreate(Bundle arg0) - { - super.onCreate(arg0); - } - - @Override - public void onStart() - { - super.onStart(); - } - - @Override - public void onStop() - { - super.onStop(); - } - @Override public void onResume() { diff --git a/android/src/com/mapswithme/maps/base/MWMFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java similarity index 96% rename from android/src/com/mapswithme/maps/base/MWMFragmentActivity.java rename to android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java index ab2bccd2c8..c3b0fcad4b 100644 --- a/android/src/com/mapswithme/maps/base/MWMFragmentActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java @@ -13,7 +13,7 @@ import com.mapswithme.util.statistics.Statistics; import ru.mail.mrgservice.MRGService; -public class MWMFragmentActivity extends ActionBarActivity +public class BaseMwmFragmentActivity extends ActionBarActivity { @Override protected void onCreate(Bundle arg0) diff --git a/android/src/com/mapswithme/maps/base/MWMListFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java similarity index 62% rename from android/src/com/mapswithme/maps/base/MWMListFragment.java rename to android/src/com/mapswithme/maps/base/BaseMwmListFragment.java index 1c7073b493..afe4b89d7c 100644 --- a/android/src/com/mapswithme/maps/base/MWMListFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java @@ -8,7 +8,7 @@ import android.view.View; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; -public abstract class MWMListFragment extends ListFragment +public abstract class BaseMwmListFragment extends ListFragment { private Toolbar mToolbar; @@ -27,5 +27,16 @@ public abstract class MWMListFragment extends ListFragment return mToolbar; } - // TODO collect some statistics + public void onResume() + { + super.onResume(); + org.alohalytics.Statistics.logEvent("$onResume", this.getClass().getSimpleName()); + } + + @Override + public void onPause() + { + super.onPause(); + org.alohalytics.Statistics.logEvent("$onPause", this.getClass().getSimpleName()); + } } diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkActivity.java index 768122d879..f9d5ac007a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkActivity.java @@ -14,7 +14,7 @@ import android.widget.EditText; import android.widget.TextView; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.bookmarks.data.Bookmark; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.bookmarks.data.Icon; @@ -23,7 +23,7 @@ import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; import com.mapswithme.util.statistics.Statistics; -public class BookmarkActivity extends MWMFragmentActivity +public class BookmarkActivity extends BaseMwmFragmentActivity { public static final String BOOKMARK_POSITION = "bookmark_position"; public static final String PIN = "pin"; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java index b77848d774..86ee5a1637 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java @@ -5,9 +5,9 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; -public class BookmarkCategoriesActivity extends MWMFragmentActivity +public class BookmarkCategoriesActivity extends BaseMwmFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java index b31b46e239..60febbb3ae 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java @@ -11,10 +11,10 @@ import android.widget.AdapterView; import android.widget.ListView; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMListFragment; +import com.mapswithme.maps.base.BaseMwmListFragment; import com.mapswithme.maps.bookmarks.data.BookmarkManager; -public class BookmarkCategoriesFragment extends MWMListFragment +public class BookmarkCategoriesFragment extends BaseMwmListFragment { private int mSelectedPosition; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java index c1f6786b47..ad88e2159b 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java @@ -4,10 +4,10 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; -public class BookmarkListActivity extends MWMFragmentActivity +public class BookmarkListActivity extends BaseMwmFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java index d2df2355a3..d5bc1327a1 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java @@ -24,7 +24,7 @@ import com.mapswithme.maps.Framework; import com.mapswithme.maps.MWMActivity; import com.mapswithme.maps.MWMApplication; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMListFragment; +import com.mapswithme.maps.base.BaseMwmListFragment; import com.mapswithme.maps.bookmarks.data.Bookmark; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; import com.mapswithme.maps.bookmarks.data.BookmarkManager; @@ -32,7 +32,7 @@ import com.mapswithme.maps.bookmarks.data.ParcelablePoint; import com.mapswithme.maps.bookmarks.data.Track; import com.mapswithme.util.ShareAction; -public class BookmarksListFragment extends MWMListFragment +public class BookmarksListFragment extends BaseMwmListFragment { public static final String TAG = "BookmarkListActivity"; diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryActivity.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryActivity.java index 5552b7fc96..61f069cf30 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryActivity.java @@ -6,9 +6,9 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; -public class ChooseBookmarkCategoryActivity extends MWMFragmentActivity +public class ChooseBookmarkCategoryActivity extends BaseMwmFragmentActivity { @Override protected void onCreate(Bundle arg0) diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java index 4f4e45d134..66fbc5f17a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java @@ -15,13 +15,13 @@ import android.widget.ListView; import android.widget.TextView; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMListFragment; +import com.mapswithme.maps.base.BaseMwmListFragment; import com.mapswithme.maps.bookmarks.data.Bookmark; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.bookmarks.data.ParcelablePoint; import com.mapswithme.util.statistics.Statistics; -public class ChooseBookmarkCategoryFragment extends MWMListFragment +public class ChooseBookmarkCategoryFragment extends BaseMwmListFragment { private FooterHelper mFooterHelper; private ChooseBookmarkCategoryAdapter mAdapter; diff --git a/android/src/com/mapswithme/maps/search/SearchActivity.java b/android/src/com/mapswithme/maps/search/SearchActivity.java index 90ce5e212b..7975cce32c 100644 --- a/android/src/com/mapswithme/maps/search/SearchActivity.java +++ b/android/src/com/mapswithme/maps/search/SearchActivity.java @@ -6,10 +6,10 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; -public class SearchActivity extends MWMFragmentActivity +public class SearchActivity extends BaseMwmFragmentActivity { public static final String EXTRA_QUERY = "search_query"; diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index 92ed7c0269..f2c42169ca 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.mapswithme.maps.MWMActivity; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMListFragment; +import com.mapswithme.maps.base.BaseMwmListFragment; import com.mapswithme.maps.base.OnBackPressListener; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.util.InputUtils; @@ -30,7 +30,7 @@ import com.mapswithme.util.Utils; import com.mapswithme.util.statistics.Statistics; -public class SearchFragment extends MWMListFragment implements View.OnClickListener, LocationHelper.LocationListener, OnBackPressListener +public class SearchFragment extends BaseMwmListFragment implements View.OnClickListener, LocationHelper.LocationListener, OnBackPressListener { // These constants should be equal with // Java_com_mapswithme_maps_SearchActivity_nativeRunSearch routine. diff --git a/android/src/com/mapswithme/maps/settings/StoragePathActivity.java b/android/src/com/mapswithme/maps/settings/StoragePathActivity.java index 0db884faf4..c84927d26d 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathActivity.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathActivity.java @@ -5,9 +5,9 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMFragmentActivity; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; -public class StoragePathActivity extends MWMFragmentActivity +public class StoragePathActivity extends BaseMwmFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) diff --git a/android/src/com/mapswithme/maps/settings/StoragePathFragment.java b/android/src/com/mapswithme/maps/settings/StoragePathFragment.java index ff276135f9..9823828dbf 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathFragment.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathFragment.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.view.View; import android.widget.ListView; -import com.mapswithme.maps.base.MWMListFragment; +import com.mapswithme.maps.base.BaseMwmListFragment; -public class StoragePathFragment extends MWMListFragment implements StoragePathManager.SetStoragePathListener +public class StoragePathFragment extends BaseMwmListFragment implements StoragePathManager.SetStoragePathListener { private StoragePathManager mPathManager = new StoragePathManager(); private StoragePathAdapter mAdapter; diff --git a/android/src/com/nvidia/devtech/NvEventQueueFragment.java b/android/src/com/nvidia/devtech/NvEventQueueFragment.java index 38c168f1df..377ea2b831 100644 --- a/android/src/com/nvidia/devtech/NvEventQueueFragment.java +++ b/android/src/com/nvidia/devtech/NvEventQueueFragment.java @@ -14,11 +14,11 @@ import android.view.View; import android.view.ViewGroup; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.MWMFragment; +import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.StubLogger; -public abstract class NvEventQueueFragment extends MWMFragment implements View.OnTouchListener, View.OnFocusChangeListener +public abstract class NvEventQueueFragment extends BaseMwmFragment implements View.OnTouchListener, View.OnFocusChangeListener { private static final String TAG = NvEventQueueFragment.class.getSimpleName();