From 00bee80e8253d175fd251fe257a37d0595082c88 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sun, 30 Dec 2018 11:44:17 +0100 Subject: [PATCH] fix lint warnings/errors --- .../demo/AnimateMarkersFragment.java | 3 ++- .../maps/extensions/demo/BaseActivity.java | 21 ------------------- .../maps/extensions/demo/BaseFragment.java | 3 ++- .../demo/ClusterGroupsFragment.java | 3 ++- .../DeclusterificationExampleFragment.java | 3 ++- .../demo/DemoClusterOptionsProvider.java | 4 ++-- .../maps/extensions/demo/DemoFragment.java | 3 ++- ...GooglePlayServicesErrorDialogFragment.java | 7 ++++++- ...deInfoWindowNotShowingClusterFragment.java | 5 ++++- ...oogleCodeInfoWindowNotShowingFragment.java | 3 ++- ...deInfoWindowNotShowingClusterFragment.java | 3 ++- ...oogleCodeInfoWindowNotShowingFragment.java | 3 ++- ...ZoomingInOrOutFromOtherRegionFragment.java | 3 ++- ...e45GitHubInfoWindowNotShowingFragment.java | 3 ++- .../demo/LaunchTimeTestFragment.java | 8 +++++-- .../maps/extensions/demo/MainActivity.java | 21 +++++++++++-------- .../extensions/demo/SimpleMapFragment.java | 3 ++- .../maps/extensions/demo/ToastHelper.java | 4 ++-- .../src/main/AndroidManifest.xml | 3 +++ 19 files changed, 57 insertions(+), 49 deletions(-) delete mode 100644 android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseActivity.java diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/AnimateMarkersFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/AnimateMarkersFragment.java index d3622af7..b7710e22 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/AnimateMarkersFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/AnimateMarkersFragment.java @@ -16,6 +16,7 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -46,7 +47,7 @@ public class AnimateMarkersFragment extends BaseFragment { private Random random = new Random(); @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseActivity.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseActivity.java deleted file mode 100644 index 83063fae..00000000 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseActivity.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2013 Maciej Górski - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package pl.mg6.android.maps.extensions.demo; - -import android.support.v7.app.ActionBarActivity; - -public class BaseActivity extends ActionBarActivity { -} diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseFragment.java index a84ef24a..98e022a6 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/BaseFragment.java @@ -16,6 +16,7 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; @@ -30,7 +31,7 @@ public abstract class BaseFragment extends Fragment { protected GoogleMap map; @Override - public void onViewCreated(View view, Bundle savedInstanceState) { + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); createMapFragmentIfNeeded(); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ClusterGroupsFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ClusterGroupsFragment.java index 5a98ef6b..96b2f82c 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ClusterGroupsFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ClusterGroupsFragment.java @@ -16,6 +16,7 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -38,7 +39,7 @@ public class ClusterGroupsFragment extends BaseFragment { private static final int DYNAMIC_GROUP = ClusterGroup.FIRST_USER; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DeclusterificationExampleFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DeclusterificationExampleFragment.java index d927a8d8..1a1f3869 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DeclusterificationExampleFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DeclusterificationExampleFragment.java @@ -17,6 +17,7 @@ import android.graphics.Point; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -36,7 +37,7 @@ public class DeclusterificationExampleFragment extends BaseFragment { private List declusterifiedMarkers; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoClusterOptionsProvider.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoClusterOptionsProvider.java index 4405c2e3..997a9af5 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoClusterOptionsProvider.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoClusterOptionsProvider.java @@ -41,14 +41,14 @@ public class DemoClusterOptionsProvider implements ClusterOptionsProvider { private static final int[] forCounts = {10, 100, 1000, 10000, Integer.MAX_VALUE}; private Bitmap[] baseBitmaps; - private LruCache cache = new LruCache(128); + private LruCache cache = new LruCache<>(128); private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); private Rect bounds = new Rect(); private ClusterOptions clusterOptions = new ClusterOptions().anchor(0.5f, 0.5f); - public DemoClusterOptionsProvider(Resources resources) { + DemoClusterOptionsProvider(Resources resources) { baseBitmaps = new Bitmap[res.length]; for (int i = 0; i < res.length; i++) { baseBitmaps[i] = BitmapFactory.decodeResource(resources, res[i]); diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoFragment.java index 498fb25d..ba0571fa 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/DemoFragment.java @@ -18,6 +18,7 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -76,7 +77,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa } @Override - public void onViewCreated(View view, Bundle savedInstanceState) { + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); setUpClusteringViews(view); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/GooglePlayServicesErrorDialogFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/GooglePlayServicesErrorDialogFragment.java index c7bcee02..14d5f8a9 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/GooglePlayServicesErrorDialogFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/GooglePlayServicesErrorDialogFragment.java @@ -17,6 +17,7 @@ import android.app.Dialog; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; @@ -67,10 +68,14 @@ public static void removeDialog(FragmentActivity activity) { } } + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { Bundle args = getArguments(); - int status = args.getInt(KEY_STATUS); + int status = 0; + if (args != null) { + status = args.getInt(KEY_STATUS); + } return GooglePlayServicesUtil.getErrorDialog(status, getActivity(), 0); } } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingClusterFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingClusterFragment.java index 6c6bf742..9d8d10d2 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingClusterFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingClusterFragment.java @@ -15,8 +15,10 @@ */ package pl.mg6.android.maps.extensions.demo; +import android.annotation.SuppressLint; import android.graphics.Color; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -31,7 +33,7 @@ public class Issue14GoogleCodeInfoWindowNotShowingClusterFragment extends BaseFragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } @@ -45,6 +47,7 @@ public View getInfoWindow(Marker marker) { return null; } + @SuppressLint("SetTextI18n") @Override public View getInfoContents(Marker marker) { TextView view = new TextView(getActivity()); diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingFragment.java index 86842f21..4afaf690 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue14GoogleCodeInfoWindowNotShowingFragment.java @@ -16,6 +16,7 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ public class Issue14GoogleCodeInfoWindowNotShowingFragment extends BaseFragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingClusterFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingClusterFragment.java index 1ee73b6e..51c1e719 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingClusterFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingClusterFragment.java @@ -18,6 +18,7 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -32,7 +33,7 @@ public class Issue15GoogleCodeInfoWindowNotShowingClusterFragment extends BaseFragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingFragment.java index 85a9bfc7..76f4d59c 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue15GoogleCodeInfoWindowNotShowingFragment.java @@ -17,6 +17,7 @@ import android.os.Bundle; import android.os.Handler; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -28,7 +29,7 @@ public class Issue15GoogleCodeInfoWindowNotShowingFragment extends BaseFragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue29GoogleCodeMarkerNotShownWhenZoomingInOrOutFromOtherRegionFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue29GoogleCodeMarkerNotShownWhenZoomingInOrOutFromOtherRegionFragment.java index 9eaa748f..6efdab70 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue29GoogleCodeMarkerNotShownWhenZoomingInOrOutFromOtherRegionFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue29GoogleCodeMarkerNotShownWhenZoomingInOrOutFromOtherRegionFragment.java @@ -16,6 +16,7 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -43,7 +44,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa } @Override - public void onViewCreated(View view, Bundle savedInstanceState) { + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); view.findViewById(R.id.issue_29_btn).setOnClickListener(new View.OnClickListener() { @Override diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue45GitHubInfoWindowNotShowingFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue45GitHubInfoWindowNotShowingFragment.java index da4fd5a7..bca5e097 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue45GitHubInfoWindowNotShowingFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/Issue45GitHubInfoWindowNotShowingFragment.java @@ -16,6 +16,7 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ public class Issue45GitHubInfoWindowNotShowingFragment extends BaseFragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/LaunchTimeTestFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/LaunchTimeTestFragment.java index 5ca1432e..1303eec5 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/LaunchTimeTestFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/LaunchTimeTestFragment.java @@ -17,6 +17,7 @@ import android.os.Bundle; import android.os.SystemClock; +import android.support.annotation.NonNull; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -53,7 +54,7 @@ static LaunchTimeTestFragment newInstance(int clusteringType) { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.launch_time_test, container, false); } @@ -66,7 +67,10 @@ protected SupportMapFragment createMapFragment() { @Override protected void setUpMap() { - int clusteringType = getArguments().getInt(EXTRA_CLUSTERING_TYPE, CLUSTERING_DISABLED); + int clusteringType = 0; + if (getArguments() != null) { + clusteringType = getArguments().getInt(EXTRA_CLUSTERING_TYPE, CLUSTERING_DISABLED); + } ClusteringSettings settings = new ClusteringSettings(); switch (clusteringType) { diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/MainActivity.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/MainActivity.java index b5b43d63..d120e68e 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/MainActivity.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/MainActivity.java @@ -16,11 +16,12 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; -import android.support.v7.app.ActionBarDrawerToggle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; @@ -28,7 +29,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; -public class MainActivity extends BaseActivity { +public class MainActivity extends AppCompatActivity { private DrawerLayout drawerLayout; private ActionBarDrawerToggle toggle; @@ -38,13 +39,13 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main); - drawerLayout = (DrawerLayout) findViewById(R.id.drawer); + drawerLayout = findViewById(R.id.drawer); initDrawerToggle(); String[] screens = {"Demo", "Animate markers", "Cluster groups", "\"Declusterification\"", "Grid clustering (dynamic)", "No clustering (dynamic)", "Grid clustering", "No clustering"}; - ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1, screens); - ListView listView = (ListView) findViewById(R.id.list); + ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, screens); + ListView listView = findViewById(R.id.list); listView.setAdapter(adapter); listView.setOnItemClickListener(new OnItemClickListener() { @Override @@ -56,7 +57,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) }); if (savedInstanceState == null) { if (GooglePlayServicesErrorDialogFragment.showDialogIfNotAvailable(this)) { - replaceMainFragment(new DemoFragment()); + replaceMainFragment(new DemoFragment()); } } } @@ -89,9 +90,11 @@ private void startExample(int position) { private void initDrawerToggle() { toggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.open_drawer, R.string.close_drawer); - drawerLayout.setDrawerListener(toggle); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setHomeButtonEnabled(true); + drawerLayout.addDrawerListener(toggle); + if (getSupportActionBar() != null) { + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setHomeButtonEnabled(true); + } } @Override diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/SimpleMapFragment.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/SimpleMapFragment.java index e7804c23..8143aa03 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/SimpleMapFragment.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/SimpleMapFragment.java @@ -16,6 +16,7 @@ package pl.mg6.android.maps.extensions.demo; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -29,7 +30,7 @@ public class SimpleMapFragment extends BaseFragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.simple_map, container, false); } diff --git a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ToastHelper.java b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ToastHelper.java index 8c48a439..d2dcf63d 100644 --- a/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ToastHelper.java +++ b/android-maps-extensions-demo/src/main/java/pl/mg6/android/maps/extensions/demo/ToastHelper.java @@ -3,12 +3,12 @@ import android.content.Context; import android.widget.Toast; -public class ToastHelper { +class ToastHelper { private ToastHelper() { } - public static void showToast(Context context, String text) { + static void showToast(Context context, String text) { if (context != null) { Toast.makeText(context, text, Toast.LENGTH_SHORT).show(); } diff --git a/android-maps-extensions/src/main/AndroidManifest.xml b/android-maps-extensions/src/main/AndroidManifest.xml index e3ec6630..744c538b 100644 --- a/android-maps-extensions/src/main/AndroidManifest.xml +++ b/android-maps-extensions/src/main/AndroidManifest.xml @@ -6,6 +6,9 @@ + + + \ No newline at end of file