Clean up

app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesActivity.java

@@ -88,7 +88,7 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        App.getPreferences().registerOnSharedPreferenceChangeListener(this);
+        preferences.registerOnSharedPreferenceChangeListener(this);
 
         final Intent intent = getIntent();
         final int preferenceTitle = intent.getIntExtra(EXTRA_PREFERENCE_TITLE, 0);
@@ -139,7 +139,7 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc
     @Override
     protected void onDestroy() {
         checkout.stop();
-        App.getPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        preferences.unregisterOnSharedPreferenceChangeListener(this);
         super.onDestroy();
     }
 

app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesFragment.java

@@ -10,9 +10,7 @@ import android.support.v4.app.FragmentActivity;
 import android.util.SparseArray;
 import android.view.View;
 import android.widget.ListView;
-
 import org.solovyev.android.calculator.AdView;
-import org.solovyev.android.calculator.App;
 import org.solovyev.android.calculator.Engine;
 import org.solovyev.android.calculator.Preferences;
 import org.solovyev.android.calculator.R;
@@ -22,12 +20,14 @@ import org.solovyev.android.checkout.BillingRequests;
 import org.solovyev.android.checkout.Checkout;
 import org.solovyev.android.checkout.ProductTypes;
 import org.solovyev.android.checkout.RequestListener;
-
-import java.util.List;
+import org.solovyev.android.wizard.Wizards;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.inject.Inject;
+import java.util.List;
 
+import static org.solovyev.android.calculator.App.cast;
 import static org.solovyev.android.calculator.wizard.CalculatorWizards.DEFAULT_WIZARD_FLOW;
 import static org.solovyev.android.wizard.WizardUi.startWizard;
 
@@ -38,6 +38,12 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
     private Preference buyPremiumPreference;
     @Nullable
     private AdView adView;
+    @Inject
+    SharedPreferences preferences;
+    @Inject
+    Languages languages;
+    @Inject
+    Wizards wizards;
 
     @Nonnull
     public static PreferencesFragment create(int preferencesResId, int layoutResId) {
@@ -49,8 +55,9 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        cast(this).getComponent().inject(this);
 
-        App.getPreferences().registerOnSharedPreferenceChangeListener(this);
+        preferences.registerOnSharedPreferenceChangeListener(this);
     }
 
     private void setPreferenceIntent(int xml, @Nonnull PreferencesActivity.PrefDef def) {
@@ -80,7 +87,7 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
             restartWizardPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    startWizard(App.getWizards(), DEFAULT_WIZARD_FLOW, getActivity());
+                    startWizard(wizards, DEFAULT_WIZARD_FLOW, getActivity());
                     return true;
                 }
             });
@@ -122,7 +129,6 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
             }
         });
 
-        final SharedPreferences preferences = App.getPreferences();
         onSharedPreferenceChanged(preferences, Engine.Preferences.Output.round.getKey());
     }
 
@@ -132,7 +138,6 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
         }
 
         final ListPreference language = (ListPreference) preferenceManager.findPreference(Preferences.Gui.language.getKey());
-        final Languages languages = App.getLanguages();
         final List<Language> languagesList = languages.getList();
         final CharSequence[] entries = new CharSequence[languagesList.size()];
         final CharSequence[] entryValues = new CharSequence[languagesList.size()];
@@ -195,7 +200,7 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
 
     @Override
     public void onDestroy() {
-        App.getPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        preferences.unregisterOnSharedPreferenceChangeListener(this);
         super.onDestroy();
     }
 

app/src/main/java/org/solovyev/android/calculator/preferences/PurchaseDialogActivity.java

@@ -30,11 +30,10 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
-
 import org.solovyev.android.calculator.App;
-import org.solovyev.android.calculator.BaseActivity;
 import org.solovyev.android.calculator.BaseDialogFragment;
 import org.solovyev.android.calculator.R;
+import org.solovyev.android.calculator.ga.Ga;
 import org.solovyev.android.checkout.*;
 
 import javax.annotation.Nonnull;
@@ -49,6 +48,8 @@ public class PurchaseDialogActivity extends AppCompatActivity implements Request
     Billing billing;
     @Inject
     Products products;
+    @Inject
+    Ga ga;
     ActivityCheckout checkout;
 
     @Override
@@ -69,12 +70,12 @@ public class PurchaseDialogActivity extends AppCompatActivity implements Request
     @Override
     protected void onStart() {
         super.onStart();
-        BaseActivity.reportActivityStart(this);
+        ga.getAnalytics().reportActivityStart(this);
     }
 
     @Override
     protected void onStop() {
-        BaseActivity.reportActivityStop(this);
+        ga.getAnalytics().reportActivityStop(this);
         super.onStop();
     }