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

Show path to upgrade to premium on feed chooser for free users

Browse source
This commit is contained in:
Andrei 2022-06-26 14:32:58 -07:00
parent d5c54df51b
commit 0bb8b0c129
4 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clients/android/NewsBlur/res/layout/activity_mute_config.xml
View file

@ -17,9 +17,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingTop="16dp" android:paddingTop="12dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:paddingBottom="16dp" android:paddingBottom="12dp"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
@ -37,12 +37,24 @@
android:id="@+id/text_sites" android:id="@+id/text_sites"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical" android:layout_gravity="end"
android:layout_marginTop="4dp"
android:text="@string/mute_config_sites" android:text="@string/mute_config_sites"
android:textColor="@color/positive" android:textColor="@color/positive"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView
android:id="@+id/text_upgrade"
style="?linkText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:padding="4dp"
android:text="@string/mute_config_upgrade_to_premium"
android:textSize="12sp"
android:textStyle="bold" />
</FrameLayout> </FrameLayout>
<ExpandableListView <ExpandableListView

2
clients/android/NewsBlur/res/menu/main.xml
View file

@ -7,7 +7,7 @@
app:showAsAction="never" /> app:showAsAction="never" />
<item android:id="@+id/menu_mute_sites" <item android:id="@+id/menu_mute_sites"
android:title="@string/mute_sites" android:title="@string/menu_mute_sites"
app:showAsAction="never" /> app:showAsAction="never" />
<item android:id="@+id/menu_widget" <item android:id="@+id/menu_widget"

4
clients/android/NewsBlur/res/values/strings.xml
View file

@ -278,7 +278,8 @@
<string name="import_export">Import/Export…</string> <string name="import_export">Import/Export…</string>
<string name="settings">Preferences…</string> <string name="settings">Preferences…</string>
<string name="mute_sites">Mute Sites…</string> <string name="menu_mute_sites">Mute Sites…</string>
<string name="mute_sites">Mute Sites</string>
<string name="widget">Widget…</string> <string name="widget">Widget…</string>
<string name="title_widget_setup">Tap to setup in NewsBlur</string> <string name="title_widget_setup">Tap to setup in NewsBlur</string>
<string name="title_no_subscriptions">No active subscriptions detected</string> <string name="title_no_subscriptions">No active subscriptions detected</string>
@ -322,6 +323,7 @@
<string name="mute_config_title">You can follow up to 64 sites with a free standard account</string> <string name="mute_config_title">You can follow up to 64 sites with a free standard account</string>
<string name="mute_config_message">Please mute %d sites or reset to most popular sites.</string> <string name="mute_config_message">Please mute %d sites or reset to most popular sites.</string>
<string name="mute_config_reset_button">RESET TO POPULAR SITES</string> <string name="mute_config_reset_button">RESET TO POPULAR SITES</string>
<string name="mute_config_upgrade_to_premium">UPGRADE TO NEWSBLUR PREMIUM</string>
<string name="mute_config_upgrade">UPGRADE</string> <string name="mute_config_upgrade">UPGRADE</string>
<string name="mute_config_sites">%1$s/%2$s</string> <string name="mute_config_sites">%1$s/%2$s</string>

3
clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java
View file

@ -192,10 +192,11 @@ public class MuteConfig extends FeedChooser implements MuteConfigAdapter.FeedSta
private void showSitesCount() { private void showSitesCount() {
ViewGroup.LayoutParams oldLayout = binding.listView.getLayoutParams(); ViewGroup.LayoutParams oldLayout = binding.listView.getLayoutParams();
FrameLayout.LayoutParams newLayout = new FrameLayout.LayoutParams(oldLayout); FrameLayout.LayoutParams newLayout = new FrameLayout.LayoutParams(oldLayout);
newLayout.topMargin = UIUtils.dp2px(this, 56); newLayout.topMargin = UIUtils.dp2px(this, 85);
binding.listView.setLayoutParams(newLayout); binding.listView.setLayoutParams(newLayout);
binding.containerSitesCount.setVisibility(View.VISIBLE); binding.containerSitesCount.setVisibility(View.VISIBLE);
binding.textResetSites.setOnClickListener(view -> resetToPopularFeeds()); binding.textResetSites.setOnClickListener(view -> resetToPopularFeeds());
binding.textUpgrade.setOnClickListener(view -> openUpgradeToPremium());
} }
private void hideSitesCount() { private void hideSitesCount() {