Skip to content

Commit 3ffe381

Browse files
committed
Completelly removed legacy Butterknife dependency and usage
1 parent 7f85277 commit 3ffe381

File tree

2 files changed

+18
-27
lines changed

2 files changed

+18
-27
lines changed

omniNotes/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ dependencies {
173173
transitive = true
174174
exclude group: "com.android.support"
175175
}
176-
implementation 'com.jakewharton:butterknife:10.2.1'
177-
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
178176
implementation('org.mnode.ical4j:ical4j:3.0.11') {
179177
exclude group: 'commons.io'
180178
}

omniNotes/src/main/java/it/feio/android/omninotes/async/MainMenuTask.java

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,15 @@
2424
import android.content.res.TypedArray;
2525
import android.os.AsyncTask;
2626
import androidx.fragment.app.Fragment;
27-
import butterknife.BindView;
28-
import butterknife.ButterKnife;
2927
import com.pixplicity.easyprefs.library.Prefs;
3028
import de.greenrobot.event.EventBus;
3129
import it.feio.android.omninotes.MainActivity;
3230
import it.feio.android.omninotes.R;
3331
import it.feio.android.omninotes.async.bus.NavigationUpdatedEvent;
32+
import it.feio.android.omninotes.databinding.FragmentNavigationDrawerBinding;
3433
import it.feio.android.omninotes.models.NavigationItem;
3534
import it.feio.android.omninotes.models.adapters.NavDrawerAdapter;
3635
import it.feio.android.omninotes.models.misc.DynamicNavigationLookupTable;
37-
import it.feio.android.omninotes.models.views.NonScrollableListView;
3836
import it.feio.android.omninotes.utils.Navigation;
3937
import java.lang.ref.WeakReference;
4038
import java.util.ArrayList;
@@ -43,18 +41,15 @@
4341

4442
public class MainMenuTask extends AsyncTask<Void, Void, List<NavigationItem>> {
4543

46-
private final WeakReference<Fragment> mFragmentWeakReference;
44+
private final WeakReference<Fragment> fragmentWeakReference;
4745
private final MainActivity mainActivity;
48-
@BindView(R.id.drawer_nav_list)
49-
NonScrollableListView mDrawerList;
50-
@BindView(R.id.drawer_tag_list)
51-
NonScrollableListView mDrawerCategoriesList;
5246

47+
FragmentNavigationDrawerBinding navDrawer;
5348

54-
public MainMenuTask(Fragment mFragment) {
55-
mFragmentWeakReference = new WeakReference<>(mFragment);
56-
this.mainActivity = (MainActivity) mFragment.getActivity();
57-
ButterKnife.bind(this, mFragment.getView());
49+
public MainMenuTask(Fragment fragment) {
50+
fragmentWeakReference = new WeakReference<>(fragment);
51+
mainActivity = (MainActivity) fragment.getActivity();
52+
navDrawer = FragmentNavigationDrawerBinding.inflate(fragment.getLayoutInflater());
5853
}
5954

6055
@Override
@@ -65,33 +60,31 @@ protected List<NavigationItem> doInBackground(Void... params) {
6560
@Override
6661
protected void onPostExecute(final List<NavigationItem> items) {
6762
if (isAlive()) {
68-
mDrawerList.setAdapter(new NavDrawerAdapter(mainActivity, items));
69-
mDrawerList.setOnItemClickListener((arg0, arg1, position, arg3) -> {
70-
String navigation = mFragmentWeakReference.get().getResources().getStringArray(R.array
63+
navDrawer.drawerNavList.setAdapter(new NavDrawerAdapter(mainActivity, items));
64+
navDrawer.drawerNavList.setOnItemClickListener((arg0, arg1, position, arg3) -> {
65+
String navigation = fragmentWeakReference.get().getResources().getStringArray(R.array
7166
.navigation_list_codes)[items.get(position).getArrayIndex()];
7267
updateNavigation(position, navigation);
7368
});
74-
mDrawerList.justifyListViewHeightBasedOnChildren();
69+
navDrawer.drawerNavList.justifyListViewHeightBasedOnChildren();
7570
}
7671
}
7772

7873
private void updateNavigation(int position, String navigation) {
7974
if (mainActivity.updateNavigation(navigation)) {
80-
mDrawerList.setItemChecked(position, true);
81-
if (mDrawerCategoriesList != null) {
82-
mDrawerCategoriesList.setItemChecked(0, false); // Called to force redraw
83-
}
75+
navDrawer.drawerNavList.setItemChecked(position, true);
76+
navDrawer.drawerTagList.setItemChecked(0, false); // Called to force redraw
8477
mainActivity.getIntent().setAction(Intent.ACTION_MAIN);
8578
EventBus.getDefault()
86-
.post(new NavigationUpdatedEvent(mDrawerList.getItemAtPosition(position)));
79+
.post(new NavigationUpdatedEvent(navDrawer.drawerNavList.getItemAtPosition(position)));
8780
}
8881
}
8982

9083
private boolean isAlive() {
91-
return mFragmentWeakReference.get() != null
92-
&& mFragmentWeakReference.get().isAdded()
93-
&& mFragmentWeakReference.get().getActivity() != null
94-
&& !mFragmentWeakReference.get().getActivity().isFinishing();
84+
return fragmentWeakReference.get() != null
85+
&& fragmentWeakReference.get().isAdded()
86+
&& fragmentWeakReference.get().getActivity() != null
87+
&& !fragmentWeakReference.get().getActivity().isFinishing();
9588
}
9689

9790
private List<NavigationItem> buildMainMenu() {

0 commit comments

Comments
 (0)