Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Update CustomWebsiteActivity to ViewBinding #604

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Chore: Update CustomWebsiteActivity to ViewBinding #604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 13 additions & 26 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/CustomWebsiteActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,42 @@
package org.openobservatory.ooniprobe.activity;

import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.util.Patterns;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout;

import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityCompat;

import localhost.toolkit.app.fragment.ConfirmDialogFragment;
import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.common.PreferenceManager;
import org.openobservatory.ooniprobe.databinding.ActivityCustomwebsiteBinding;
import org.openobservatory.ooniprobe.model.database.Url;
import org.openobservatory.ooniprobe.test.suite.WebsitesSuite;

import javax.inject.Inject;
import java.io.Serializable;
import java.util.ArrayList;

import javax.inject.Inject;

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

public class CustomWebsiteActivity extends AbstractActivity implements ConfirmDialogFragment.OnConfirmedListener {
@BindView(R.id.urlContainer)
LinearLayout urlContainer;
@BindView(R.id.bottomBar)
Toolbar bottomBar;
private ArrayList<EditText> editTexts;
private ArrayList<ImageButton> deletes;

@Inject
PreferenceManager preferenceManager;
private ActivityCustomwebsiteBinding binding;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getActivityComponent().inject(this);
setContentView(R.layout.activity_customwebsite);
ButterKnife.bind(this);
binding = ActivityCustomwebsiteBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
editTexts = new ArrayList<>();
deletes = new ArrayList<>();
bottomBar.inflateMenu(R.menu.run);
bottomBar.setOnMenuItemClickListener(item -> {
binding.bottomBar.inflateMenu(R.menu.run);
binding.bottomBar.setOnMenuItemClickListener(item -> {
if (!checkPrefix())
return false;
ArrayList<String> urls = new ArrayList<>(editTexts.size());
Expand All @@ -66,6 +53,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
RunningActivity.runAsForegroundService(CustomWebsiteActivity.this, suite.asArray(), this::finish, preferenceManager);
return true;
});
binding.add.setOnClickListener(v -> add());
add();
}

Expand Down Expand Up @@ -103,12 +91,11 @@ public boolean onSupportNavigateUp() {
return true;
}

@OnClick(R.id.add)
void add() {
ViewGroup urlBox = (ViewGroup) getLayoutInflater().inflate(R.layout.edittext_url, urlContainer, false);
ViewGroup urlBox = (ViewGroup) getLayoutInflater().inflate(R.layout.edittext_url, binding.urlContainer, false);
EditText editText = urlBox.findViewById(R.id.editText);
editTexts.add(editText);
urlContainer.addView(urlBox);
binding.urlContainer.addView(urlBox);
ImageButton delete = urlBox.findViewById(R.id.delete);
deletes.add(delete);
delete.setTag(editText);
Expand All @@ -117,11 +104,11 @@ void add() {
((View) v.getParent()).setVisibility(View.GONE);
editTexts.remove(tag);
deletes.remove(v);
bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
binding.bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
setVisibilityDelete();
});
setVisibilityDelete();
bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
binding.bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
}

private void setVisibilityDelete() {
Expand Down
Loading