From 8bd412a31536d789885ed1b1c816b19d4288a0b7 Mon Sep 17 00:00:00 2001 From: serso Date: Sun, 7 Feb 2016 12:30:52 +0100 Subject: [PATCH] Remove Hugo --- app/build.gradle | 1 - .../android/calculator/BaseFragment.java | 3 --- .../calculator/CalculatorActivity.java | 3 --- .../calculator/CalculatorApplication.java | 19 ++++++++++++++----- .../android/calculator/DisplayView.java | 2 -- .../solovyev/android/calculator/Editor.java | 2 -- .../android/calculator/Preferences.java | 2 -- .../android/calculator/history/History.java | 2 -- build.gradle | 1 - 9 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 84e7d318..c8bbcf12 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,6 @@ apply plugin: 'com.android.application' apply plugin: 'maven' apply plugin: 'signing' apply plugin: 'com.neenbedankt.android-apt' -apply plugin: 'com.jakewharton.hugo' android { compileSdkVersion 23 diff --git a/app/src/main/java/org/solovyev/android/calculator/BaseFragment.java b/app/src/main/java/org/solovyev/android/calculator/BaseFragment.java index 563d020f..54b0050a 100644 --- a/app/src/main/java/org/solovyev/android/calculator/BaseFragment.java +++ b/app/src/main/java/org/solovyev/android/calculator/BaseFragment.java @@ -4,7 +4,6 @@ import android.os.Bundle; import android.support.annotation.StringRes; import android.support.v4.app.Fragment; import android.view.*; -import hugo.weaving.DebugLog; import javax.annotation.Nonnull; @@ -15,7 +14,6 @@ public abstract class BaseFragment extends Fragment { protected FragmentUi ui; - @DebugLog @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -35,7 +33,6 @@ public abstract class BaseFragment extends Fragment { protected void inject(@Nonnull AppComponent component) { } - @DebugLog @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View view = ui.onCreateView(inflater, container); diff --git a/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java index a47309b3..0c39b273 100644 --- a/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java +++ b/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java @@ -36,7 +36,6 @@ import android.view.*; import android.widget.TextView; import butterknife.Bind; import butterknife.ButterKnife; -import hugo.weaving.DebugLog; import org.solovyev.android.Activities; import org.solovyev.android.Android; import org.solovyev.android.calculator.history.History; @@ -153,7 +152,6 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference return result; } - @DebugLog @Override public void onCreate(@Nullable Bundle savedInstanceState) { final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); @@ -205,7 +203,6 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference } } - @DebugLog @Override protected void inject(@Nonnull AppComponent component) { super.inject(component); diff --git a/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java index 0d11aa1e..607d3de9 100644 --- a/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java +++ b/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java @@ -26,9 +26,9 @@ import android.content.SharedPreferences; import android.os.Handler; import android.preference.PreferenceManager; import android.util.Log; +import android.util.TimingLogger; import com.squareup.leakcanary.LeakCanary; import com.squareup.otto.Bus; -import hugo.weaving.DebugLog; import jscl.MathEngine; import org.acra.ACRA; import org.acra.ACRAConfiguration; @@ -99,20 +99,31 @@ public class CalculatorApplication extends android.app.Application implements Sh @Inject ActivityLauncher launcher; - @DebugLog + @Nonnull + private final TimingLogger timer = new TimingLogger("App", "onCreate"); + @Override public void onCreate() { + timer.reset(); + final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); final Languages languages = new Languages(preferences); + timer.addSplit("languages"); onPreCreate(preferences, languages); + timer.addSplit("onPreCreate"); + super.onCreate(); + timer.addSplit("super.onCreate"); initDagger(); + timer.addSplit("initDagger"); + onPostCreate(preferences, languages); + timer.addSplit("onPostCreate"); + timer.dumpToLog(); } - @DebugLog private void initDagger() { component = DaggerAppComponent.builder() .appModule(new AppModule(this)) @@ -122,7 +133,6 @@ public class CalculatorApplication extends android.app.Application implements Sh history.init(initThread); } - @DebugLog private void onPostCreate(@Nonnull SharedPreferences preferences, @Nonnull Languages languages) { App.init(this, languages); @@ -157,7 +167,6 @@ public class CalculatorApplication extends android.app.Application implements Sh } } - @DebugLog private void onPreCreate(@Nonnull SharedPreferences preferences, @Nonnull Languages languages) { // first we need to setup crash handler and memory leak analyzer if (AcraErrorReporter.ENABLED) { diff --git a/app/src/main/java/org/solovyev/android/calculator/DisplayView.java b/app/src/main/java/org/solovyev/android/calculator/DisplayView.java index e042dfd8..1dd07255 100644 --- a/app/src/main/java/org/solovyev/android/calculator/DisplayView.java +++ b/app/src/main/java/org/solovyev/android/calculator/DisplayView.java @@ -28,7 +28,6 @@ import android.content.res.Resources; import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.AttributeSet; -import hugo.weaving.DebugLog; import org.solovyev.android.Check; import org.solovyev.android.calculator.text.TextProcessor; import org.solovyev.android.calculator.text.TextProcessorEditorResult; @@ -40,7 +39,6 @@ import javax.annotation.Nonnull; import static android.util.TypedValue.COMPLEX_UNIT_SP; import static android.util.TypedValue.applyDimension; -@DebugLog public class DisplayView extends AutoResizeTextView { @Nonnull diff --git a/app/src/main/java/org/solovyev/android/calculator/Editor.java b/app/src/main/java/org/solovyev/android/calculator/Editor.java index 6226e6ed..71adbea7 100644 --- a/app/src/main/java/org/solovyev/android/calculator/Editor.java +++ b/app/src/main/java/org/solovyev/android/calculator/Editor.java @@ -27,7 +27,6 @@ import android.content.SharedPreferences; import com.squareup.otto.Bus; import com.squareup.otto.Subscribe; -import hugo.weaving.DebugLog; import org.solovyev.android.Check; import org.solovyev.android.calculator.text.TextProcessorEditorResult; import org.solovyev.android.calculator.view.EditorTextProcessor; @@ -56,7 +55,6 @@ public class Editor { textProcessor = new EditorTextProcessor(preferences); } - @DebugLog public void init() { bus.register(this); } diff --git a/app/src/main/java/org/solovyev/android/calculator/Preferences.java b/app/src/main/java/org/solovyev/android/calculator/Preferences.java index 5eebee77..bec5d51a 100644 --- a/app/src/main/java/org/solovyev/android/calculator/Preferences.java +++ b/app/src/main/java/org/solovyev/android/calculator/Preferences.java @@ -31,7 +31,6 @@ import android.support.annotation.LayoutRes; import android.support.annotation.StyleRes; import android.util.SparseArray; import android.view.ContextThemeWrapper; -import hugo.weaving.DebugLog; import jscl.AngleUnit; import jscl.NumeralBase; import org.solovyev.android.Check; @@ -60,7 +59,6 @@ public final class Preferences { throw new AssertionError(); } - @DebugLog static void setDefaultValues(@Nonnull SharedPreferences preferences) { // renew value after each application start Gui.showFixableErrorDialog.putDefault(preferences); diff --git a/app/src/main/java/org/solovyev/android/calculator/history/History.java b/app/src/main/java/org/solovyev/android/calculator/history/History.java index 9c8e29a6..4f232793 100644 --- a/app/src/main/java/org/solovyev/android/calculator/history/History.java +++ b/app/src/main/java/org/solovyev/android/calculator/history/History.java @@ -30,7 +30,6 @@ import android.text.TextUtils; import com.google.common.base.Strings; import com.squareup.otto.Bus; import com.squareup.otto.Subscribe; -import hugo.weaving.DebugLog; import org.json.JSONArray; import org.json.JSONException; import org.solovyev.android.Check; @@ -158,7 +157,6 @@ public class History { public History() { } - @DebugLog public void init(@NonNull Executor initThread) { Check.isMainThread(); bus.register(this); diff --git a/build.gradle b/build.gradle index 5fbecdbf..9605ba73 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:1.5.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4' - classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1' } }