wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into redesign-login

Browse source
This commit is contained in:
David Luhmer 2019-04-09 20:23:36 -03:00 committed by GitHub
commit d93c5cf66d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
News-Android-App/src/main/res/layout/activity_new_feed.xml
View file

@ -78,6 +78,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:text="Import OPML" android:text="Import OPML"
android:text="@string/import_opml"
android:textStyle="bold" /> android:textStyle="bold" />
<Button <Button
@ -89,6 +90,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:text="Export OPML" android:text="Export OPML"
android:text="@string/export_opml"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>

2
News-Android-App/src/main/res/menu/news_reader.xml
View file

@ -12,7 +12,7 @@
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_search_white_24dp" android:icon="@drawable/ic_search_white_24dp"
android:iconifiedByDefault="false" android:iconifiedByDefault="false"
android:title="Search" android:title="@string/action_search"
android:visible="true" android:visible="true"
app:actionViewClass="android.widget.SearchView" app:actionViewClass="android.widget.SearchView"
app:showAsAction="always|collapseActionView" /> app:showAsAction="always|collapseActionView" />

7
News-Android-App/src/main/res/values/strings.xml
View file

@ -40,6 +40,7 @@
<string name="action_sync_settings">Sync Settings</string> <string name="action_sync_settings">Sync Settings</string>
<string name="action_add_new_feed">Add new feed</string> <string name="action_add_new_feed">Add new feed</string>
<string name="action_textToSpeech">Read out</string> <string name="action_textToSpeech">Read out</string>
<string name="action_search">Search</string>
<string name="action_download_articles_offline">Download articles offline</string> <string name="action_download_articles_offline">Download articles offline</string>
<plurals name="notification_new_items_ticker"> <plurals name="notification_new_items_ticker">
<item quantity="one">You have %d new unread item</item> <item quantity="one">You have %d new unread item</item>
@ -54,6 +55,8 @@
<!-- Add new feed --> <!-- Add new feed -->
<string name="hint_feed_url">Feed URL</string> <string name="hint_feed_url">Feed URL</string>
<string name="action_add_feed">Add feed</string> <string name="action_add_feed">Add feed</string>
<string name="import_opml">Import OPML</string>
<string name="export_opml">Export OPML</string>
<!-- String related to NewsDetail-ContextMenu Items --> <!-- String related to NewsDetail-ContextMenu Items -->
@ -97,10 +100,6 @@
<string name="error_invalid_url">Incorrect URL</string> <string name="error_invalid_url">Incorrect URL</string>
<!-- Import Accounts -->
<string name="import_account">Import Account</string>
<!-- Toast Messages --> <!-- Toast Messages -->
<plurals name="toast_downloaded_x_items"> <plurals name="toast_downloaded_x_items">
<item quantity="one">Downloaded %d old item</item> <item quantity="one">Downloaded %d old item</item>