Browse Source

- forgot RssItemsFragment

- renamed RssItemsActivity
pull/526/head
Twig N 5 years ago
parent
commit
cc0c29f7f7
  1. 2
      app/src/main/AndroidManifest.xml
  2. 4
      app/src/main/java/org/transdroid/core/gui/rss/RssFeedsActivity.java
  3. 2
      app/src/main/java/org/transdroid/core/gui/rss/RssItemsActivity.java
  4. 4
      app/src/main/res/layout/activity_rssitems.xml

2
app/src/main/AndroidManifest.xml

@ -253,7 +253,7 @@
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/TransdroidTheme" /> android:theme="@style/TransdroidTheme" />
<activity <activity
android:name="org.transdroid.core.gui.rss.RssitemsActivity_" android:name="org.transdroid.core.gui.rss.RssItemsActivity_"
android:label="@string/rss_feeds" android:label="@string/rss_feeds"
android:theme="@style/TransdroidTheme" /> android:theme="@style/TransdroidTheme" />

4
app/src/main/java/org/transdroid/core/gui/rss/RssFeedsActivity.java

@ -250,7 +250,7 @@ public class RssFeedsActivity extends AppCompatActivity {
} }
/** /**
* Opens an RSS feed in the dedicated fragment (if there was space in the UI) or a new {@link RssitemsActivity}. Optionally this also registers in * Opens an RSS feed in the dedicated fragment (if there was space in the UI) or a new {@link RssItemsActivity}. Optionally this also registers in
* the user preferences that the feed was now viewed, so that in the future the new items can be properly marked. * the user preferences that the feed was now viewed, so that in the future the new items can be properly marked.
* @param loader The RSS feed loader (with settings and the loaded content channel) to show * @param loader The RSS feed loader (with settings and the loaded content channel) to show
* @param markAsViewedNow True if the user settings should be updated to reflect this feed's last viewed date; false otherwise * @param markAsViewedNow True if the user settings should be updated to reflect this feed's last viewed date; false otherwise
@ -300,7 +300,7 @@ public class RssFeedsActivity extends AppCompatActivity {
if (TextUtils.isEmpty(name) && !TextUtils.isEmpty(loader.getSetting().getUrl())) { if (TextUtils.isEmpty(name) && !TextUtils.isEmpty(loader.getSetting().getUrl())) {
name = Uri.parse(loader.getSetting().getUrl()).getHost(); name = Uri.parse(loader.getSetting().getUrl()).getHost();
} }
RssitemsActivity_.intent(this).rssfeed(loader.getChannel()).rssfeedName(name) RssItemsActivity_.intent(this).rssfeed(loader.getChannel()).rssfeedName(name)
.requiresExternalAuthentication(loader.getSetting().requiresExternalAuthentication()).start(); .requiresExternalAuthentication(loader.getSetting().requiresExternalAuthentication()).start();
} }

2
app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java → app/src/main/java/org/transdroid/core/gui/rss/RssItemsActivity.java

@ -36,7 +36,7 @@ import org.transdroid.core.gui.navigation.NavigationHelper;
import org.transdroid.core.rssparser.Channel; import org.transdroid.core.rssparser.Channel;
@EActivity(R.layout.activity_rssitems) @EActivity(R.layout.activity_rssitems)
public class RssitemsActivity extends AppCompatActivity { public class RssItemsActivity extends AppCompatActivity {
@Extra @Extra
protected Channel rssfeed = null; protected Channel rssfeed = null;

4
app/src/main/res/layout/activity_rssitems.xml

@ -19,7 +19,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".core.gui.rss.RssitemsActivity_"> tools:context=".core.gui.rss.RssItemsActivity_">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/rssfeeds_toolbar" android:id="@+id/rssfeeds_toolbar"
@ -34,7 +34,7 @@
<fragment <fragment
android:id="@+id/rssitems_fragment" android:id="@+id/rssitems_fragment"
class="org.transdroid.core.gui.rss.RssitemsFragment_" class="org.transdroid.core.gui.rss.RssItemsFragment_"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/rssfeeds_toolbar" android:layout_below="@id/rssfeeds_toolbar"

Loading…
Cancel
Save