public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1352 AndroidX cleanup dependencies and update deprecated code

Browse source
This commit is contained in:
sictiru 2020-08-03 11:13:58 -07:00
parent e8619bd95e
commit 6f8eccb4f2
7 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clients/android/NewsBlur/build.gradle
View file

@ -25,12 +25,11 @@ apply plugin: 'com.android.application'
apply plugin: 'checkstyle'
dependencies {
implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
implementation 'androidx.fragment:fragment:1.0.0'
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
implementation 'androidx.fragment:fragment:1.2.5'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'com.squareup.okhttp3:okhttp:3.12.12'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
}
android {

2
clients/android/NewsBlur/src/com/newsblur/activity/ActivityDetailsPagerAdapter.java
View file

@ -21,7 +21,7 @@ public class ActivityDetailsPagerAdapter extends FragmentPagerAdapter {
private final Profile profile;
public ActivityDetailsPagerAdapter(FragmentManager fragmentManager, Profile profile) {
super(fragmentManager);
super(fragmentManager, FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.profile = profile;

3
clients/android/NewsBlur/src/com/newsblur/database/ReadingAdapter.java
View file

@ -178,7 +178,6 @@ public class ReadingAdapter extends PagerAdapter {
}
}
fragment.setMenuVisibility(false);
fragment.setUserVisibleHint(false);
if (curTransaction == null) {
curTransaction = fm.beginTransaction();
}
@ -208,11 +207,9 @@ public class ReadingAdapter extends PagerAdapter {
if (fragment != lastActiveFragment) {
if (lastActiveFragment != null) {
lastActiveFragment.setMenuVisibility(false);
lastActiveFragment.setUserVisibleHint(false);
}
if (fragment != null) {
fragment.setMenuVisibility(true);
fragment.setUserVisibleHint(true);
}
lastActiveFragment = fragment;
}

14
clients/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java
View file

@ -364,7 +364,7 @@ public class FolderListFragment extends NbFragment implements OnCreateContextMen
String folderName = adapter.getGroupFolderName(groupPosition);
deleteFeedFragment = DeleteFeedFragment.newInstance(adapter.getFeed(groupPosition, childPosition), folderName);
}
deleteFeedFragment.show(getFragmentManager(), "dialog");
deleteFeedFragment.show(getParentFragmentManager(), "dialog");
return true;
} else if (item.getItemId() == R.id.menu_mark_feed_as_read) {
FeedSet fs = adapter.getChild(groupPosition, childPosition);
@ -378,13 +378,13 @@ public class FolderListFragment extends NbFragment implements OnCreateContextMen
Feed feed = adapter.getFeed(groupPosition, childPosition);
if (feed != null) {
DialogFragment chooseFoldersFragment = ChooseFoldersFragment.newInstance(feed);
chooseFoldersFragment.show(getFragmentManager(), "dialog");
chooseFoldersFragment.show(getParentFragmentManager(), "dialog");
}
} else if (item.getItemId() == R.id.menu_rename_feed) {
Feed feed = adapter.getFeed(groupPosition, childPosition);
if (feed != null) {
DialogFragment renameFeedFragment = RenameDialogFragment.newInstance(feed);
renameFeedFragment.show(getFragmentManager(), "dialog");
renameFeedFragment.show(getParentFragmentManager(), "dialog");
}
} else if (item.getItemId() == R.id.menu_mute_feed) {
Set<String> feedIds = new HashSet<String>();
@ -402,23 +402,23 @@ public class FolderListFragment extends NbFragment implements OnCreateContextMen
FeedUtils.instaFetchFeed(getActivity(), adapter.getFeed(groupPosition, childPosition).feedId);
} else if (item.getItemId() == R.id.menu_intel) {
FeedIntelTrainerFragment intelFrag = FeedIntelTrainerFragment.newInstance(adapter.getFeed(groupPosition, childPosition), adapter.getChild(groupPosition, childPosition));
intelFrag.show(getFragmentManager(), FeedIntelTrainerFragment.class.getName());
intelFrag.show(getParentFragmentManager(), FeedIntelTrainerFragment.class.getName());
} else if (item.getItemId() == R.id.menu_delete_saved_search) {
SavedSearch savedSearch = adapter.getSavedSearch(childPosition);
if (savedSearch != null) {
DialogFragment deleteFeedFragment = DeleteFeedFragment.newInstance(savedSearch);
deleteFeedFragment.show(getFragmentManager(), "dialog");
deleteFeedFragment.show(getParentFragmentManager(), "dialog");
}
} else if (item.getItemId() == R.id.menu_delete_folder) {
Folder folder = adapter.getGroupFolder(groupPosition);
String folderParentName = folder.getFirstParentName();
DeleteFolderFragment deleteFolderFragment = DeleteFolderFragment.newInstance(folder.name, folderParentName);
deleteFolderFragment.show(getFragmentManager(), deleteFolderFragment.getTag());
deleteFolderFragment.show(getParentFragmentManager(), deleteFolderFragment.getTag());
} else if (item.getItemId() == R.id.menu_rename_folder) {
Folder folder = adapter.getGroupFolder(groupPosition);
String folderParentName = folder.getFirstParentName();
RenameDialogFragment renameDialogFragment = RenameDialogFragment.newInstance(folder.name, folderParentName);
renameDialogFragment.show(getFragmentManager(), renameDialogFragment.getTag());
renameDialogFragment.show(getParentFragmentManager(), renameDialogFragment.getTag());
}
return super.onContextItemSelected(item);

4
clients/android/NewsBlur/src/com/newsblur/fragment/ProfileDetailsFragment.java
View file

@ -138,7 +138,7 @@ public class ProfileDetailsFragment extends Fragment implements OnClickListener
followButton.setVisibility(View.GONE);
unfollowButton.setVisibility(View.VISIBLE);
} else {
FragmentManager fm = ProfileDetailsFragment.this.getFragmentManager();
FragmentManager fm = ProfileDetailsFragment.this.getParentFragmentManager();
AlertDialogFragment alertDialog = AlertDialogFragment.newAlertDialogFragment(getResources().getString(R.string.follow_error));
alertDialog.show(fm, "fragment_edit_name");
}
@ -164,7 +164,7 @@ public class ProfileDetailsFragment extends Fragment implements OnClickListener
unfollowButton.setVisibility(View.GONE);
followButton.setVisibility(View.VISIBLE);
} else {
FragmentManager fm = ProfileDetailsFragment.this.getFragmentManager();
FragmentManager fm = ProfileDetailsFragment.this.getParentFragmentManager();
AlertDialogFragment alertDialog = AlertDialogFragment.newAlertDialogFragment(getResources().getString(R.string.unfollow_error));
alertDialog.show(fm, "fragment_edit_name");
}

8
clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
View file

@ -415,7 +415,7 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
private void clickShare() {
DialogFragment newFragment = ShareDialogFragment.newInstance(story, sourceUserId);
newFragment.show(getFragmentManager(), "dialog");
newFragment.show(getParentFragmentManager(), "dialog");
}
private void updateShareButton() {
@ -483,7 +483,7 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
public void onClick(View v) {
if (story.feedId.equals("0")) return; // cannot train on feedless stories
StoryIntelTrainerFragment intelFrag = StoryIntelTrainerFragment.newInstance(story, fs);
intelFrag.show(getFragmentManager(), StoryIntelTrainerFragment.class.getName());
intelFrag.show(getParentFragmentManager(), StoryIntelTrainerFragment.class.getName());
}
});
@ -492,7 +492,7 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
public void onClick(View v) {
if (story.feedId.equals("0")) return; // cannot train on feedless stories
StoryIntelTrainerFragment intelFrag = StoryIntelTrainerFragment.newInstance(story, fs);
intelFrag.show(getFragmentManager(), StoryIntelTrainerFragment.class.getName());
intelFrag.show(getParentFragmentManager(), StoryIntelTrainerFragment.class.getName());
}
});
@ -558,7 +558,7 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
public void onClick(View view) {
if (story.feedId.equals("0")) return; // cannot train on feedless stories
StoryIntelTrainerFragment intelFrag = StoryIntelTrainerFragment.newInstance(story, fs);
intelFrag.show(getFragmentManager(), StoryIntelTrainerFragment.class.getName());
intelFrag.show(getParentFragmentManager(), StoryIntelTrainerFragment.class.getName());
}
});
}

2
clients/android/NewsBlur/src/com/newsblur/fragment/SetupCommentSectionTask.java
View file

@ -55,7 +55,7 @@ public class SetupCommentSectionTask extends AsyncTask<Void, Void, Void> {
public SetupCommentSectionTask(ReadingItemFragment fragment, View view, LayoutInflater inflater, Story story) {
this.fragment = fragment;
this.context = fragment.getActivity();
this.manager = fragment.getFragmentManager();
this.manager = fragment.getParentFragmentManager();
this.inflater = inflater;
this.story = story;
viewHolder = new WeakReference<View>(view);