Merge pull request #30 from amardeshbd/feature/add_timber_lib

[ADDED] Timber logging lib. Fixes #16
hossain-khan · Sep 25, 2016 · dc69f52 · dc69f52
2 parents 813b905 + e2f9f6e
commit dc69f52
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -78,4 +78,5 @@ ext {
     apacheOltuOauth2Version = '1.0.1'
     jodaTimeVersion = '2.9.4'
     glassfishJavaxAnnotationVersion = '10.0-b28'
+    timberLibraryVersion = '4.3.1'
 }
diff --git a/core-lib/build.gradle b/core-lib/build.gradle
@@ -49,6 +49,11 @@ dependencies {
     compile "io.reactivex:rxandroid:$rootProject.rxAndroidVersion"
 
 
+    // Logging framework
+    // https://github.com/JakeWharton/timber
+    compile "com.jakewharton.timber:timber:$rootProject.timberLibraryVersion"
+
+
     // ----------------------------------------------------------------
     // Android Unit and Instrumentation test
     // ----------------------------------------------------------------

diff --git a/core-lib/src/main/java/info/hossainkhan/android/core/CoreApplication.java b/core-lib/src/main/java/info/hossainkhan/android/core/CoreApplication.java
@@ -31,6 +31,7 @@
 import info.hossainkhan.android.core.dagger.components.DaggerAppComponent;
 import info.hossainkhan.android.core.dagger.modules.InteractorsModule;
 import info.hossainkhan.android.core.dagger.modules.NetworkModule;
+import timber.log.Timber;
 
 /**
  * Extended {@link Application} that is shared among all the android application modules.
@@ -44,6 +45,13 @@ public void onCreate() {
         super.onCreate();
 
         initAppComponent();
+        initLogger();
+    }
+
+    private void initLogger() {
+        if (BuildConfig.DEBUG) {
+            Timber.plant(new Timber.DebugTree());
+        }
     }
 
     private void initAppComponent() {

diff --git a/mobile/src/main/java/info/hossainkhan/dailynewsheadlines/HealinesPresenter.java b/mobile/src/main/java/info/hossainkhan/dailynewsheadlines/HealinesPresenter.java
@@ -25,12 +25,9 @@
 package info.hossainkhan.dailynewsheadlines;
 
 import android.support.annotation.NonNull;
-import android.util.Log;
-
-import javax.inject.Inject;
 
 import info.hossainkhan.android.core.CoreApplication;
-import info.hossainkhan.android.core.base.*;
+import info.hossainkhan.android.core.base.BasePresenter;
 import info.hossainkhan.android.core.headlines.HeadlinesContract;
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.StoriesApi;
@@ -40,6 +37,7 @@
 import rx.Subscriber;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
+import timber.log.Timber;
 
 import static com.google.android.gms.internal.zzs.TAG;
 
@@ -64,19 +62,19 @@ public void loadHeadlines(final boolean forceUpdate) {
                 .subscribe(new Subscriber<InlineResponse200>() {
                     @Override
                     public void onCompleted() {
-                        Log.d(TAG, "onCompleted() called");
+                        Timber.d(TAG, "onCompleted() called");
                         getView().setLoadingIndicator(false);
                     }
 
                     @Override
                     public void onError(final Throwable e) {
-                        Log.d(TAG, "onError() called with: e = [" + e + "]");
+                        Timber.d(TAG, "onError() called with: e = [" + e + "]");
                         getView().showLoadingHeadlinesError();
                     }
 
                     @Override
                     public void onNext(final InlineResponse200 inlineResponse200) {
-                        Log.d(TAG, "onNext() called");
+                        Timber.d(TAG, "onNext() called");
                         getView().showHeadlines(inlineResponse200.getResults());
                     }
                 });

diff --git a/mobile/src/main/java/info/hossainkhan/dailynewsheadlines/MainActivity.java b/mobile/src/main/java/info/hossainkhan/dailynewsheadlines/MainActivity.java
@@ -1,7 +1,6 @@
 package info.hossainkhan.dailynewsheadlines;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.TextView;
 
 import java.util.List;
@@ -11,6 +10,7 @@
 import info.hossainkhan.android.core.base.BaseActivity;
 import info.hossainkhan.android.core.headlines.HeadlinesContract;
 import io.swagger.client.model.Article;
+import timber.log.Timber;
 
 public class MainActivity  extends BaseActivity implements HeadlinesContract.View {
     private static final String TAG = "MainActivity";
@@ -36,33 +36,33 @@ protected void onCreate(Bundle savedInstanceState) {
     protected void onStart() {
         super.onStart();
 
-        Log.d(TAG, "onStart() called");
+        Timber.d(TAG, "onStart() called");
 
     }
 
     @Override
     public void setLoadingIndicator(final boolean active) {
-        Log.d(TAG, "setLoadingIndicator() called with: active = [" + active + "]");
+        Timber.d(TAG, "setLoadingIndicator() called with: active = [" + active + "]");
     }
 
     @Override
     public void showHeadlines(final List<Article> headlines) {
-        Log.d(TAG, "showHeadlines() called with: Headlines = [" + headlines.size() + "]");
+        Timber.d(TAG, "showHeadlines() called with: Headlines = [" + headlines.size() + "]");
         demoTextview.setText(headlines.toString());
     }
 
     @Override
     public void showHeadlineDetailsUi(final Article article) {
-        Log.d(TAG, "showHeadlineDetailsUi() called with: article = [" + article + "]");
+        Timber.d(TAG, "showHeadlineDetailsUi() called with: article = [" + article + "]");
     }
 
     @Override
     public void showLoadingHeadlinesError() {
-        Log.d(TAG, "showLoadingHeadlinesError() called");
+        Timber.d(TAG, "showLoadingHeadlinesError() called");
     }
 
     @Override
     public void showNoHeadlines() {
-        Log.d(TAG, "showNoHeadlines() called");
+        Timber.d(TAG, "showNoHeadlines() called");
     }
 }
diff --git a/tv/src/main/java/info/hossainkhan/dailynewsheadlines/MainFragment.java b/tv/src/main/java/info/hossainkhan/dailynewsheadlines/MainFragment.java
@@ -28,15 +28,15 @@
 import android.os.Bundle;
 import android.support.v17.leanback.app.BrowseFragment;
 import android.support.v17.leanback.widget.ArrayObjectAdapter;
-import android.support.v17.leanback.widget.ListRow;
 import android.support.v17.leanback.widget.ListRowPresenter;
 import android.support.v17.leanback.widget.OnItemViewClickedListener;
 import android.support.v17.leanback.widget.OnItemViewSelectedListener;
 import android.support.v17.leanback.widget.Presenter;
 import android.support.v17.leanback.widget.Row;
 import android.support.v17.leanback.widget.RowPresenter;
 import android.support.v4.app.ActivityOptionsCompat;
-import android.util.Log;
+
+import timber.log.Timber;
 
 
 public class MainFragment extends BrowseFragment {
@@ -83,7 +83,7 @@ private final class ItemViewClickedListener implements OnItemViewClickedListener
         @Override
         public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item,
                                   RowPresenter.ViewHolder rowViewHolder, Row row) {
-            Log.d(TAG, "onItemClicked() called with: itemViewHolder = [" + itemViewHolder + "], " +
+            Timber.d(TAG, "onItemClicked() called with: itemViewHolder = [" + itemViewHolder + "], " +
                     "item = [" + item + "], rowViewHolder = [" + rowViewHolder + "], row = [" + row + "]");
 
             Intent intent = null;