Remove Butterknife from EditNoteActivity

This commit is contained in:
Christoph Loy 2020-02-25 18:25:12 +01:00 committed by Niedermann IT-Dienstleistungen
parent 01fa17cae1
commit 500753cc08

View file

@ -9,7 +9,6 @@ import android.view.Menu;
import android.view.MenuItem;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import java.io.BufferedReader;
@ -19,14 +18,13 @@ import java.io.InputStreamReader;
import java.util.Calendar;
import java.util.Objects;
import butterknife.BindView;
import butterknife.ButterKnife;
import it.niedermann.nextcloud.exception.ExceptionHandler;
import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.android.fragment.BaseNoteFragment;
import it.niedermann.owncloud.notes.android.fragment.NoteEditFragment;
import it.niedermann.owncloud.notes.android.fragment.NotePreviewFragment;
import it.niedermann.owncloud.notes.android.fragment.NoteReadonlyFragment;
import it.niedermann.owncloud.notes.databinding.ActivityEditBinding;
import it.niedermann.owncloud.notes.model.Category;
import it.niedermann.owncloud.notes.model.CloudNote;
import it.niedermann.owncloud.notes.model.DBNote;
@ -47,8 +45,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
public static final String PARAM_CATEGORY = "category";
public static final String PARAM_CONTENT = "content";
@BindView(R.id.toolbar)
Toolbar toolbar;
private ActivityEditBinding binding;
private BaseNoteFragment fragment;
@ -57,9 +54,8 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
super.onCreate(savedInstanceState);
Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
setContentView(R.layout.activity_edit);
ButterKnife.bind(this);
binding = ActivityEditBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
if (savedInstanceState == null) {
launchNoteFragment();
@ -67,7 +63,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
fragment = (BaseNoteFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_container_view);
}
setSupportActionBar(toolbar);
setSupportActionBar(binding.toolbar);
}
@Override
@ -257,11 +253,11 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
@Override
public void onNoteUpdated(DBNote note) {
if (note != null) {
toolbar.setTitle(note.getTitle());
binding.toolbar.setTitle(note.getTitle());
if (note.getCategory().isEmpty()) {
toolbar.setSubtitle(null);
binding.toolbar.setSubtitle(null);
} else {
toolbar.setSubtitle(NoteUtil.extendCategory(note.getCategory()));
binding.toolbar.setSubtitle(NoteUtil.extendCategory(note.getCategory()));
}
} else {
// Maybe account is not authenticated -> note == null