Some cleanup.

Author: android10

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivityBackpressureSamples.java

@@ -42,11 +42,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
  @Override
  protected void onDestroy() {
- this.subscription.unsubscribe();
+ subscription.unsubscribe();
  super.onDestroy();
  }
 
  private void initialize() {
- this.subscription = Subscriptions.empty();
+ subscription = Subscriptions.empty();
  }
 }

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivityObservableCompositionSamples.java

@@ -34,14 +34,14 @@ protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_samples_observable_composition);
  ButterKnife.bind(this);
- this.initialize();
+ initialize();
  }
 
  private void initialize() {
- this.navigator = new Navigator();
+ navigator = new Navigator();
  }
 
  @OnClick(R.id.btn_sampleConcatVsFlatMap) void navigateToObservableConcatVsFlatMap() {
- this.navigator.navigateToObservableConcatVsFlatMap(this);
+ navigator.navigateToObservableConcatVsFlatMap(this);
  }
 }

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivityObservableConcatVsFlatMapSample.java

@@ -38,7 +38,6 @@
 public class ActivityObservableConcatVsFlatMapSample extends BaseActivity {
 
  private static final String LOG_TAG = "ConcatVsFlatMap";
-
  private static final String SEPARATOR = " ";
 
  @Bind(R.id.tv_streamOriginalOrder) TextView tv_streamOriginalOrder;
@@ -64,14 +63,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
  @Override
  protected void onDestroy() {
- this.subscription.unsubscribe();
+ subscription.unsubscribe();
  super.onDestroy();
  }
 
  private void initialize() {
- this.dataManager = new LocalDataManager(new RandomStringGenerator(), new NumberGenerator(),
+ dataManager = new LocalDataManager(new RandomStringGenerator(), new NumberGenerator(),
  JobExecutor.getInstance());
- this.subscription = Subscriptions.empty();
+ subscription = Subscriptions.empty();
  }
 
  @OnClick(R.id.btn_flatMap) void onFlatMapClick() {
@@ -95,7 +94,7 @@ private void initialize() {
  }
  };
 
- this.buildNumbersObservable()
+ buildNumbersObservable()
  .flatMap(dataManager::squareOfAsync)
  .observeOn(AndroidSchedulers.mainThread())
  .subscribe(observer);
@@ -122,14 +121,14 @@ private void initialize() {
  }
  };
 
- this.buildNumbersObservable()
+ buildNumbersObservable()
  .concatMap(dataManager::squareOfAsync)
  .observeOn(AndroidSchedulers.mainThread())
  .subscribe(observer);
  }
 
  private Observable<Integer> buildNumbersObservable() {
- return this.dataManager.numbers();
+ return dataManager.numbers();
  }
 
  private void showToast(String message) {
@@ -141,11 +140,11 @@ private void debugLog(String message) {
  }
 
  private void printFlatMapResult(String result) {
- this.tv_flatMapResult.setText(result);
+ tv_flatMapResult.setText(result);
  }
 
  private void printConcatMapResult(String result) {
- this.tv_concatMapResult.setText(result);
+ tv_concatMapResult.setText(result);
  }
 
  private void populateData() {

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/BaseActivity.java

@@ -24,5 +24,10 @@ public abstract class BaseActivity extends Activity {
 
  @Override protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
+ initialize();
+ }
+
+ private void initialize() {
+ this.navigator = new Navigator();
  }
 }

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/MainActivity.java

@@ -19,7 +19,6 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.fernandocejas.android10.rx.sample.R;
-import com.fernandocejas.android10.rx.sample.navigation.Navigator;
 
 public class MainActivity extends BaseActivity {
 
@@ -28,22 +27,17 @@ protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_main);
  ButterKnife.bind(this);
- this.initialize();
- }
-
- private void initialize() {
- this.navigator = new Navigator();
  }
 
  @OnClick(R.id.btn_sampleObserver) void navigateToObserverSample() {
- this.navigator.navigateToSubscriberSample(this);
+ navigator.navigateToSubscriberSample(this);
  }
 
  @OnClick(R.id.btn_sampleBackpressure) void navigateToBackpressureSample() {
- this.navigator.navigateToBackpressureSamples(this);
+ navigator.navigateToBackpressureSamples(this);
  }
 
  @OnClick(R.id.btn_sampleObservableComposition) void navigateToObservableCompositionSamples() {
- this.navigator.navigateToObservableCompositionSamples(this);
+ navigator.navigateToObservableCompositionSamples(this);
  }
 }

app/src/main/java/com/fernandocejas/android10/rx/sample/adapter/ElementsAdapter.java

@@ -53,17 +53,17 @@ public ElementsAdapter(Context context, ElementAddedListener listener) {
  }
 
  @Override public ElementViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- final View view = this.layoutInflater.inflate(R.layout.row_element, parent, false);
+ final View view = layoutInflater.inflate(R.layout.row_element, parent, false);
  return new ElementViewHolder(view);
  }
 
  @Override public void onBindViewHolder(ElementViewHolder holder, int position) {
- final String element = this.elements.get(position);
+ final String element = elements.get(position);
  holder.textViewText.setText(element);
  }
 
  @Override public int getItemCount() {
- return (this.elements != null) ? this.elements.size() : 0;
+ return elements.size();
  }
 
  @Override public void onNext(String stringElement) {

app/src/main/java/com/fernandocejas/android10/rx/sample/data/LocalDataManager.java

@@ -47,7 +47,7 @@ public Observable<Integer> numbers() {
  }
 
  public Observable<Integer> squareOfAsync(int number) {
- return Observable.just(number * number).subscribeOn(Schedulers.from(this.jobExecutor));
+ return Observable.just(number * number).subscribeOn(Schedulers.from(jobExecutor));
  }
 
  public Observable<String> elements() {
@@ -61,12 +61,12 @@ public Observable<String> newElement() {
  }
 
  public List<Integer> getNumbersSynchronously() {
- return this.numbers;
+ return numbers;
  }
 
  private void populateElementsList() {
  for (int i = 0; i < 10; i++) {
- this.elements.add(randomStringGenerator.nextString());
+ elements.add(randomStringGenerator.nextString());
  }
  }
 }

app/src/main/java/com/fernandocejas/android10/rx/sample/data/RandomStringGenerator.java

@@ -43,7 +43,7 @@ public RandomStringGenerator() {
 
  public RandomStringGenerator(int stringLength) {
  this.stringLenght = stringLength;
- this.charArray = new char[this.stringLenght];
+ this.charArray = new char[stringLenght];
  this.random = new Random();
  }
 

app/src/main/java/com/fernandocejas/android10/rx/sample/executor/JobExecutor.java

@@ -47,13 +47,13 @@ public static JobExecutor getInstance() {
  private JobExecutor() {
  this.workQueue = new LinkedBlockingQueue<>();
  this.threadPoolExecutor = new ThreadPoolExecutor(INITIAL_POOL_SIZE, MAX_POOL_SIZE,
- KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, this.workQueue);
+ KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, workQueue);
  }
 
  @Override public void execute(Runnable runnable) {
  if (runnable == null) {
  throw new IllegalArgumentException("Runnable to execute cannot be null");
  }
- this.threadPoolExecutor.execute(runnable);
+ threadPoolExecutor.execute(runnable);
  }
 }