Skip to content

Commit

Permalink
Merge pull request #592 from ooni/chore/running-activity-upgrade-to-v…
Browse files Browse the repository at this point in the history 
…iew-binding

Chore: Update `RunningActivity` to `ViewBinding`
  • Loading branch information
@aanorbel
aanorbel authored Sep 10, 2023
2 parents 05caf25 + f98d2e3 commit 41eb5f5
Showing 1 changed file with 31 additions and 55 deletions.
86 changes: 31 additions & 55 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,20 @@
import android.os.Bundle;
import android.view.View;
import android.view.animation.Animation;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import com.airbnb.lottie.LottieAnimationView;

import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.common.Application;
import org.openobservatory.ooniprobe.common.PreferenceManager;
import org.openobservatory.ooniprobe.common.ReachabilityManager;
import org.openobservatory.ooniprobe.common.TestProgressRepository;
import org.openobservatory.ooniprobe.common.service.RunTestService;
import org.openobservatory.ooniprobe.common.service.ServiceUtil;
import org.openobservatory.ooniprobe.databinding.ActivityRunningBinding;
import org.openobservatory.ooniprobe.receiver.TestRunBroadRequestReceiver;
import org.openobservatory.ooniprobe.test.suite.AbstractSuite;
import org.openobservatory.ooniprobe.test.suite.ExperimentalSuite;
Expand All @@ -42,36 +35,19 @@

import javax.inject.Inject;

import butterknife.BindView;
import butterknife.ButterKnife;
import localhost.toolkit.app.fragment.ConfirmDialogFragment;
import localhost.toolkit.app.fragment.MessageDialogFragment;

/**
* Serves to display progress of {@code RunTestService} running in in the background on a screen.
* Serves to display progress of {@code RunTestService} running in the background on a screen.
*
* Also contains {@link #runAsForegroundService(AbstractActivity, ArrayList<AbstractSuite>,OnTestServiceStartedListener) runAsForegroundService}
* used to start {@code RunTestService} in the background.
*/
public class RunningActivity extends AbstractActivity implements ConfirmDialogFragment.OnConfirmedListener {
@BindView(R.id.running)
TextView running;
@BindView(R.id.name)
TextView name;
@BindView(R.id.log)
TextView log;
@BindView(R.id.eta)
TextView eta;
@BindView(R.id.progress)
ProgressBar progress;
@BindView(R.id.close)
ImageButton close;
@BindView(R.id.stop)
Button stop;
@BindView(R.id.animation)
LottieAnimationView animation;
@BindView(R.id.proxy_icon)
RelativeLayout proxy_icon;

ActivityRunningBinding binding;

private TestRunBroadRequestReceiver receiver;

@Inject
Expand Down Expand Up @@ -136,29 +112,29 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getActivityComponent().inject(this);
setTheme(R.style.Theme_MaterialComponents_NoActionBar_App);
setContentView(R.layout.activity_running);
ButterKnife.bind(this);
binding = ActivityRunningBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());

testProgressRepository.getProgress().observe(this, progressValue -> {
if (progressValue!=null) {
progress.setProgress(progressValue);
binding.progress.setProgress(progressValue);
}
});
testProgressRepository.getEta().observe(this,etaValue -> {
if (etaValue!=null) {
eta.setText(readableTimeRemaining(etaValue));
binding.eta.setText(readableTimeRemaining(etaValue));
}
});

if (preferenceManager.getProxyURL().isEmpty())
proxy_icon.setVisibility(View.GONE);
close.setOnClickListener(new View.OnClickListener() {
binding.proxyIcon.setVisibility(View.GONE);
binding.close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
}
});
stop.setOnClickListener(new View.OnClickListener() {
binding.stop.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
new ConfirmDialogFragment.Builder()
Expand All @@ -176,33 +152,33 @@ private void applyUIChanges(RunTestService service) {
service.task.currentSuite == null || service.task.currentTest == null) {
return;
}
animation.setImageAssetsFolder("anim/");
animation.setRepeatCount(Animation.INFINITE);
animation.playAnimation();
binding.animation.setImageAssetsFolder("anim/");
binding.animation.setRepeatCount(Animation.INFINITE);
binding.animation.playAnimation();
Integer progressLevel = testProgressRepository.getProgress().getValue();
if (progressLevel != null) {
progress.setProgress(progressLevel);
binding.progress.setProgress(progressLevel);
} else {
progress.setIndeterminate(true);
binding.progress.setIndeterminate(true);
}

Double etaValue = testProgressRepository.getEta().getValue();
if (etaValue!=null){
eta.setText(readableTimeRemaining(etaValue));
binding.eta.setText(readableTimeRemaining(etaValue));
}else {
eta.setText(R.string.Dashboard_Running_CalculatingETA);
binding.eta.setText(R.string.Dashboard_Running_CalculatingETA);
}

if (service.task.currentSuite.getName().equals(ExperimentalSuite.NAME))
name.setText(service.task.currentTest.getName());
binding.name.setText(service.task.currentTest.getName());
else
name.setText(getString(service.task.currentTest.getLabelResId()));
binding.name.setText(getString(service.task.currentTest.getLabelResId()));
getWindow().setBackgroundDrawableResource(service.task.currentSuite.getColor());
if (Build.VERSION.SDK_INT >= 21) {
getWindow().setStatusBarColor(service.task.currentSuite.getColor());
}
animation.setAnimation(service.task.currentSuite.getAnim());
progress.setMax(service.task.getMax(preferenceManager));
binding.animation.setAnimation(service.task.currentSuite.getAnim());
binding.progress.setMax(service.task.getMax(preferenceManager));
}

@Override
Expand Down Expand Up @@ -264,20 +240,20 @@ public void onStart(RunTestService service) {

@Override
public void onRun(String value) {
name.setText(value);
binding.name.setText(value);
}

@Override
public void onProgress(int state, double timeLeft) {
progress.setIndeterminate(false);
progress.setProgress(state);
binding.progress.setIndeterminate(false);
binding.progress.setProgress(state);

eta.setText(readableTimeRemaining(timeLeft));
binding.eta.setText(readableTimeRemaining(timeLeft));
}

@Override
public void onLog(String value) {
log.setText(value);
binding.log.setText(value);
}

@Override
Expand All @@ -287,13 +263,13 @@ public void onError(String value) {

@Override
public void onUrl() {
progress.setIndeterminate(false);
binding.progress.setIndeterminate(false);
}

@Override
public void onInterrupt() {
running.setText(getString(R.string.Dashboard_Running_Stopping_Title));
log.setText(getString(R.string.Dashboard_Running_Stopping_Notice));
binding.running.setText(getString(R.string.Dashboard_Running_Stopping_Title));
binding.log.setText(getString(R.string.Dashboard_Running_Stopping_Notice));
}

@Override
Expand Down

0 comments on commit 41eb5f5

Please sign in to comment.