diff options
3 files changed, 13 insertions, 11 deletions
diff --git a/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java b/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java index f1e87a8b..7fe48628 100644 --- a/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java +++ b/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java @@ -42,7 +42,7 @@ import de.luhmer.owncloudnewsreader.NewsReaderListActivity; import de.luhmer.owncloudnewsreader.R; import de.luhmer.owncloudnewsreader.TestApplication; import de.luhmer.owncloudnewsreader.adapter.NewsListRecyclerAdapter; -import de.luhmer.owncloudnewsreader.adapter.ViewHolder; +import de.luhmer.owncloudnewsreader.adapter.RssItemViewHolder; import de.luhmer.owncloudnewsreader.di.ApiProvider; import de.luhmer.owncloudnewsreader.di.TestApiProvider; import de.luhmer.owncloudnewsreader.di.TestComponent; @@ -150,7 +150,7 @@ public class NewsReaderListActivityUiTests { assertNotNull(ndf); final NewsListRecyclerAdapter na = (NewsListRecyclerAdapter) ndf.getRecyclerView().getAdapter(); assertNotNull(na); - final ViewHolder vh = (ViewHolder) ndf.getRecyclerView().getChildViewHolder(ndf.getRecyclerView().getLayoutManager().findViewByPosition(scrollPosition)); + final RssItemViewHolder vh = (RssItemViewHolder) ndf.getRecyclerView().getChildViewHolder(ndf.getRecyclerView().getLayoutManager().findViewByPosition(scrollPosition)); assertNotNull(vh); LinearLayoutManager llm = (LinearLayoutManager) ndf.getRecyclerView().getLayoutManager(); diff --git a/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java b/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java index 9066e80c..69eb77ba 100644 --- a/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java +++ b/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java @@ -16,7 +16,7 @@ import de.luhmer.owncloudnewsreader.NewsReaderDetailFragment; import de.luhmer.owncloudnewsreader.NewsReaderListActivity; import de.luhmer.owncloudnewsreader.NewsReaderListFragment; import de.luhmer.owncloudnewsreader.adapter.NewsListRecyclerAdapter; -import de.luhmer.owncloudnewsreader.adapter.ViewHolder; +import de.luhmer.owncloudnewsreader.adapter.RssItemViewHolder; import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm; import de.luhmer.owncloudnewsreader.model.PodcastItem; import tools.fastlane.screengrab.Screengrab; @@ -106,7 +106,7 @@ public class ScreenshotTest { mActivity.runOnUiThread(() -> { NewsListRecyclerAdapter na = (NewsListRecyclerAdapter) nrdf.getRecyclerView().getAdapter(); - ViewHolder vh = (ViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(itemPos)); + RssItemViewHolder vh = (RssItemViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(itemPos)); na.changeReadStateOfItem(vh, false); }); } @@ -132,7 +132,7 @@ public class ScreenshotTest { //Screengrab.screenshot("podcast_list"); mActivity.runOnUiThread(() -> { - ViewHolder vh = (ViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(0)); + RssItemViewHolder vh = (RssItemViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(0)); PodcastItem podcastItem = DatabaseConnectionOrm.ParsePodcastItemFromRssItem(mActivity, vh.getRssItem()); mActivity.openMediaItem(podcastItem); }); @@ -177,7 +177,7 @@ public class ScreenshotTest { } mActivity.runOnUiThread(() -> { - ViewHolder vh = (ViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(1)); + RssItemViewHolder vh = (RssItemViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(1)); PodcastItem podcastItem = DatabaseConnectionOrm.ParsePodcastItemFromRssItem(mActivity, vh.getRssItem()); mActivity.openMediaItem(podcastItem); }); @@ -207,14 +207,14 @@ public class ScreenshotTest { } private void openDrawer() { - if(mActivity.drawerLayout != null) { - mActivity.drawerLayout.openDrawer(GravityCompat.START, true); + if(mActivity.binding.drawerLayout != null) { + mActivity.binding.drawerLayout.openDrawer(GravityCompat.START, true); } } private void closeDrawer() { - if(mActivity.drawerLayout != null) { - mActivity.drawerLayout.closeDrawer(GravityCompat.START, true); + if(mActivity.binding.drawerLayout != null) { + mActivity.binding.drawerLayout.closeDrawer(GravityCompat.START, true); } } } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java index eabe0075..aaed7292 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java @@ -119,6 +119,7 @@ import uk.co.deanwild.materialshowcaseview.MaterialShowcaseSequence; import uk.co.deanwild.materialshowcaseview.ShowcaseConfig; import static android.Manifest.permission.ACCESS_FINE_LOCATION; +import static androidx.annotation.VisibleForTesting.PROTECTED; import static de.luhmer.owncloudnewsreader.LoginDialogActivity.RESULT_LOGIN; import static de.luhmer.owncloudnewsreader.LoginDialogActivity.ShowAlertDialog; @@ -145,7 +146,8 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements private static MenuItem menuItemDownloadMoreItems; - protected ActivityNewsreaderBinding binding; + @VisibleForTesting(otherwise = PROTECTED) + public ActivityNewsreaderBinding binding; //private ServiceConnection mConnection = null; |