refactor: upgrade to butterknife 4

14 files changed, 34 insertions, 34 deletions

diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java
index 3ab9904..b9f198a 100644
--- a/main/src/cgeo/geocaching/AboutActivity.java
+++ b/main/src/cgeo/geocaching/AboutActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractViewPagerActivity;
 import cgeo.geocaching.ui.AbstractCachingPageViewCreator;
@@ -36,7 +36,7 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page>
         @Override
         public ScrollView getDispatchedView() {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_license_page, null);
-            Views.inject(this, view);
+            ButterKnife.inject(this, view);
             setClickListener(licenseLink, "http://www.apache.org/licenses/LICENSE-2.0.html");
             licenseText.setText(getRawResourceString(R.raw.license));
             return view;
@@ -50,7 +50,7 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page>
         @Override
         public ScrollView getDispatchedView() {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_contributors_page, null);
-            Views.inject(this, view);
+            ButterKnife.inject(this, view);
             contributors.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             return view;
         }
@@ -65,7 +65,7 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page>
         @Override
         public ScrollView getDispatchedView() {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_changes_page, null);
-            Views.inject(this, view);
+            ButterKnife.inject(this, view);
             changeLogRelease.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             final String changeLogMasterString = getString(R.string.changelog_master);
             if (StringUtils.isBlank(changeLogMasterString)) {
@@ -91,7 +91,7 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page>
         @Override
         public ScrollView getDispatchedView() {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_help_page, null);
-            Views.inject(this, view);
+            ButterKnife.inject(this, view);
             setClickListener(support, "mailto:support@cgeo.org");
             setClickListener(website, "http://www.cgeo.org/");
             setClickListener(facebook, "http://www.facebook.com/pages/cgeo/297269860090");
@@ -118,7 +118,7 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page>
         @Override
         public ScrollView getDispatchedView() {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_version_page, null);
-            Views.inject(this, view);
+            ButterKnife.inject(this, view);
             version.setText(Version.getVersionName(AboutActivity.this));
             setClickListener(donateButton, "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AQBS7UP76CXW2");
             return view;
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index d0273c5..7f9571a 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.AbstractViewPagerActivity;
@@ -1481,7 +1481,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             }
 
             view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_description_page, null);
-            Views.inject(this, view);
+            ButterKnife.inject(this, view);
 
             // cache short description
             if (StringUtils.isNotBlank(cache.getShortDescription())) {
diff --git a/main/src/cgeo/geocaching/CompassActivity.java b/main/src/cgeo/geocaching/CompassActivity.java
index a176b7d..8955afd 100644
--- a/main/src/cgeo/geocaching/CompassActivity.java
+++ b/main/src/cgeo/geocaching/CompassActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.enumerations.LoadFlags;
@@ -108,7 +108,7 @@ public class CompassActivity extends AbstractActivity {
         setDestCoords();
         setCacheInfo();
 
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         // make sure we can control the TTS volume
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
@@ -140,7 +140,7 @@ public class CompassActivity extends AbstractActivity {
         super.onConfigurationChanged(newConfig);
 
         setContentView(R.layout.compass_activity);
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         setTitle();
         setDestCoords();
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index a1b11c7..9e0a37d 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.settings.Settings;
@@ -61,7 +61,7 @@ public class ImageSelectActivity extends AbstractActivity {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.imageselect_activity);
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         scaleChoiceIndex = Settings.getLogImageScale();
         imageCaption = "";
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index dd3fa78..e549fdc 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.connector.gc.GCParser;
 import cgeo.geocaching.connector.gc.Login;
@@ -117,7 +117,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.logtrackable_activity);
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         // get parameters
         final Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 0daa124..1d4c22c 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.connector.ConnectorFactory;
@@ -205,7 +205,7 @@ public class MainActivity extends AbstractActivity {
         // don't call the super implementation with the layout argument, as that would set the wrong theme
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_activity);
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
             // If we had been open already, start from the last used activity.
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index d0733e5..c68c979 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
 import butterknife.Optional;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
@@ -124,7 +124,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.navigateanypoint_activity);
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         createHistoryView();
         init();
@@ -135,7 +135,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
         historyListView.addHeaderView(pointControls, null, false);
 
         // inject a second time to also find the dynamically expanded views above
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         if (getHistoryOfSearchedLocations().isEmpty()) {
             historyListView.addFooterView(getEmptyHistoryFooter(), null, false);
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 0756a00..334d99a 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.connector.ConnectorFactory;
@@ -84,7 +84,7 @@ public class SearchActivity extends AbstractActivity {
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.search));
 
-        Views.inject(this);
+        ButterKnife.inject(this);
         init();
     }
 
diff --git a/main/src/cgeo/geocaching/SelectMapfileActivity.java b/main/src/cgeo/geocaching/SelectMapfileActivity.java
index 9d86fa5..c617012 100644
--- a/main/src/cgeo/geocaching/SelectMapfileActivity.java
+++ b/main/src/cgeo/geocaching/SelectMapfileActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.files.AbstractFileListActivity;
 import cgeo.geocaching.files.IFileSelectionView;
@@ -38,7 +38,7 @@ public class SelectMapfileActivity extends AbstractFileListActivity<FileSelectio
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         mapFile = Settings.getMapFile();
 
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 69123fe..6752344 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.AbstractViewPagerActivity;
@@ -349,7 +349,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
         @Override
         public ScrollView getDispatchedView() {
             view = (ScrollView) getLayoutInflater().inflate(R.layout.trackable_details_view, null);
-            Views.inject(this, view);
+            ButterKnife.inject(this, view);
 
             final CacheDetailsCreator details = new CacheDetailsCreator(TrackableActivity.this, detailsList);
 
diff --git a/main/src/cgeo/geocaching/UsefulAppsActivity.java b/main/src/cgeo/geocaching/UsefulAppsActivity.java
index 08206ff..c0f2d6f 100644
--- a/main/src/cgeo/geocaching/UsefulAppsActivity.java
+++ b/main/src/cgeo/geocaching/UsefulAppsActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.ui.AbstractViewHolder;
@@ -70,7 +70,7 @@ public class UsefulAppsActivity extends AbstractActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.usefulapps_activity);
 
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         list.setAdapter(new ArrayAdapter<HelperApp>(this, R.layout.usefulapps_item, HELPER_APPS) {
             @Override
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index b1e4b92..5633e6f 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.geopoint.Geopoint;
@@ -37,7 +37,7 @@ public class WaypointPopup extends AbstractPopupActivity {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Views.inject(this);
+        ButterKnife.inject(this);
         // get parameters
         final Bundle extras = getIntent().getExtras();
         if (extras != null) {
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index 6e74928..1f44536 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.activity;
 
-import butterknife.Views;
+import butterknife.ButterKnife;
 
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.compatibility.Compatibility;
@@ -104,7 +104,7 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
         setContentView(resourceLayoutID);
 
         // create view variables
-        Views.inject(this);
+        ButterKnife.inject(this);
     }
 
     private void initializeCommonFields() {
diff --git a/main/src/cgeo/geocaching/ui/AbstractViewHolder.java b/main/src/cgeo/geocaching/ui/AbstractViewHolder.java
index cc5cd4d..b1cb719 100644
--- a/main/src/cgeo/geocaching/ui/AbstractViewHolder.java
+++ b/main/src/cgeo/geocaching/ui/AbstractViewHolder.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.ui;
 
-import butterknife.Views;
+import butterknife.ButterKnife;
 
 import android.view.View;
 
@@ -12,7 +12,7 @@ import android.view.View;
 public abstract class AbstractViewHolder {
 
     protected AbstractViewHolder(View view) {
-        Views.inject(this, view);
+        ButterKnife.inject(this, view);
         view.setTag(this);
     }