final refactoring

app/src/main/java/com/genius/wasylews/converterlab/di/module/DeviceUtilsModule.java

@@ -69,7 +69,7 @@ static NotificationCompat.Builder provideNotification(Context context,
         }
 
         return new NotificationCompat.Builder(context, "default")
-                .setSmallIcon(R.drawable.ic_launcher_background);
+                .setSmallIcon(R.mipmap.ic_launcher);
     }
 
     @Singleton

app/src/main/java/com/genius/wasylews/converterlab/presenter/HomePresenter.java

@@ -3,6 +3,7 @@
 
 import android.util.Log;
 
+import com.genius.wasylews.converterlab.BuildConfig;
 import com.genius.wasylews.converterlab.di.scope.PerActivity;
 import com.genius.wasylews.converterlab.view.BaseHomeView;
 import com.genius.wasylews.domain.model.Organization;
@@ -44,8 +45,10 @@ public void loadList() {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .doFinally(mView::hideProgress)
-                .subscribe(mView::showOrganizations,
-                        throwable -> Log.d(TAG, "Error on subscribe", throwable));
+                .subscribe(mView::showOrganizations, throwable -> {
+                    if (BuildConfig.DEBUG)
+                        Log.d(TAG, "Error on subscribe", throwable);
+                });
     }
 
     public void openOrganizationSite(Organization organization) {
@@ -68,7 +71,9 @@ public void findOrganizations(String filter) {
         mFindOrganizations.execute(filter)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(mView::showOrganizations,
-                        throwable -> Log.d(TAG, "Error on subscribe", throwable));
+                .subscribe(mView::showOrganizations, throwable -> {
+                            if (BuildConfig.DEBUG)
+                                Log.d(TAG, "Error on subscribe", throwable);
+                        });
     }
 }

app/src/main/java/com/genius/wasylews/converterlab/presenter/MapPresenter.java

@@ -14,7 +14,7 @@
 @PerActivity
 public class MapPresenter {
 
-    private GetOrganizationLocation mGetOrganizationLocation;
+    private final GetOrganizationLocation mGetOrganizationLocation;
     private BaseMapView mView;
 
     @Inject

app/src/main/java/com/genius/wasylews/converterlab/view/BitmapViewHolder.java

@@ -32,7 +32,7 @@ public class BitmapViewHolder {
     @BindView(R.id.share_currency_list)
     RecyclerView mRecyclerView;
 
-    private Context mContext;
+    private final Context mContext;
 
     @Inject
     public BitmapViewHolder(Context context) {

app/src/main/java/com/genius/wasylews/converterlab/view/activity/HomeActivity.java

@@ -31,10 +31,10 @@ public class HomeActivity extends DaggerAppCompatActivity implements BaseHomeVie
         OrganizationsAdapter.CardToolbarItemClickedListener {
 
     @Inject
-    HomePresenter presenter;
+    HomePresenter mPresenter;
 
     @Inject
-    OrganizationsAdapter adapter;
+    OrganizationsAdapter mAdapter;
 
     @Inject
     NotificationUtil mNotificationManager;
@@ -58,14 +58,14 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        mRecyclerView.setAdapter(adapter);
+        mRecyclerView.setAdapter(mAdapter);
 
-        adapter.setMenuItemClickedListener(this);
+        mAdapter.setMenuItemClickedListener(this);
 
-        mSwipeRefreshLayout.setOnRefreshListener(presenter::loadList);
+        mSwipeRefreshLayout.setOnRefreshListener(mPresenter::loadList);
 
-        presenter.setView(this);
-        presenter.loadList();
+        mPresenter.setView(this);
+        mPresenter.loadList();
     }
 
     @Override
@@ -80,7 +80,7 @@ public boolean onQueryTextSubmit(String s) {
 
             @Override
             public boolean onQueryTextChange(String s) {
-                presenter.findOrganizations(s);
+                mPresenter.findOrganizations(s);
                 return true;
             }
         });
@@ -89,7 +89,7 @@ public boolean onQueryTextChange(String s) {
 
     @Override
     public void showOrganizations(List<Organization> list) {
-        adapter.setOrganizations(list);
+        mAdapter.setOrganizations(list);
     }
 
     @Override
@@ -108,16 +108,16 @@ public void hideProgress() {
     public boolean onItemClicked(@IdRes int buttonId, Organization organization) {
         switch (buttonId) {
             case R.id.card_toolbar_link:
-                presenter.openOrganizationSite(organization);
+                mPresenter.openOrganizationSite(organization);
                 break;
             case R.id.card_toolbar_map:
-                presenter.showOnMap(organization);
+                mPresenter.showOnMap(organization);
                 break;
             case R.id.card_toolbar_phone:
-                presenter.callOrganization(organization);
+                mPresenter.callOrganization(organization);
                 break;
             case R.id.card_toolbar_details:
-                presenter.showDetails(organization);
+                mPresenter.showDetails(organization);
                 break;
             default:
                 return false;

app/src/main/java/com/genius/wasylews/converterlab/view/activity/MapActivity.java

@@ -24,7 +24,7 @@
 public class MapActivity extends DaggerAppCompatActivity implements OnMapReadyCallback, BaseMapView {
 
     @Inject
-    MapPresenter presenter;
+    MapPresenter mPresenter;
 
     private static final String EXTRA_ORGANIZATION = "ORGANIZATION_ID";
 
@@ -47,8 +47,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mapFragment.getMapAsync(this);
 
         String organizationId = getIntent().getStringExtra(EXTRA_ORGANIZATION);
-        presenter.setView(this);
-        presenter.showOnMap(organizationId);
+        mPresenter.setView(this);
+        mPresenter.showOnMap(organizationId);
     }
 
     @Override

app/src/main/java/com/genius/wasylews/converterlab/view/fragment/ShareDialogFragment.java

@@ -4,6 +4,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -64,7 +65,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.share_fragment_layout, container, false);
         ButterKnife.bind(this, rootView);
 
@@ -96,7 +97,7 @@ public void share() {
             shareIntent.setType("image/*");
             shareIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             startActivity(Intent.createChooser(shareIntent,
-                    getResources().getString(R.string.share_title)));
+                    getString(R.string.share_title)));
         }
     }
 

app/src/main/res/layout/activity_map.xml

@@ -1,5 +1,4 @@
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:map="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/map"
     android:name="com.google.android.gms.maps.SupportMapFragment"

device/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         <service
             android:name=".service.FetchService"
             android:enabled="true"
-            android:exported="true"></service>
+            android:exported="true" />
     </application>
 
 </manifest>

device/src/main/java/com/genius/wasylews/device/bitmap/BitmapProviderUtil.java

@@ -10,7 +10,7 @@
 import javax.inject.Inject;
 
 public class BitmapProviderUtil implements BitmapProvider {
-    private Context mContext;
+    private final Context mContext;
 
     @Inject
     public BitmapProviderUtil(Context context) {

device/src/main/java/com/genius/wasylews/device/location/LocationProvider.java

@@ -22,8 +22,8 @@
 @Singleton
 public class LocationProvider implements LocationManager {
 
-    private GeoDataClient mGeoDataClient;
-    private NetworkManager mNetworkManager;
+    private final GeoDataClient mGeoDataClient;
+    private final NetworkManager mNetworkManager;
 
     @Inject
     public LocationProvider(GeoDataClient geoDataClient, NetworkManager networkManager) {

device/src/main/java/com/genius/wasylews/device/preferences/PreferencesManager.java

@@ -9,7 +9,7 @@
 
 public class PreferencesManager {
 
-    private SharedPreferences mPreferences;
+    private final SharedPreferences mPreferences;
 
     @Inject
     public PreferencesManager(SharedPreferences preferences) {

domain/src/main/java/com/genius/wasylews/domain/usecase/GetOrganizationLocation.java

@@ -14,8 +14,8 @@
 @Singleton
 public class GetOrganizationLocation {
 
-    private LocationManager mLocationManager;
-    private Repository mRepository;
+    private final LocationManager mLocationManager;
+    private final Repository mRepository;
 
     @Inject
     public GetOrganizationLocation(LocationManager manager, Repository repository) {