Skip to content

Commit

Permalink
Merge pull request #1121 from dosiecki/master
Browse files Browse the repository at this point in the history 
Android: Features and Compatibility
  • Loading branch information
@samuelclay
samuelclay committed Aug 7, 2018
2 parents 8558bc6 + 10cecba commit 8a560be
Show file tree
Hide file tree
Showing 42 changed files with 1,205 additions and 1,002 deletions.
8 changes: 4 additions & 4 deletions clients/android/NewsBlur/AndroidManifest.xml
View file
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="24" />
android:targetSdkVersion="26" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down Expand Up @@ -137,16 +137,16 @@
<activity
android:name=".activity.SocialFeedReading"/>

<service android:name=".service.NBSyncService" />
<service
android:name=".service.NBSyncService"
android:permission="android.permission.BIND_JOB_SERVICE" />

<receiver android:name=".service.BootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>

<receiver android:name=".service.ServiceScheduleReceiver" />

<receiver android:name=".util.NotifyDismissReceiver" android:exported="false" />
<receiver android:name=".util.NotifySaveReceiver" android:exported="false" />
<receiver android:name=".util.NotifyMarkreadReceiver" android:exported="false" />
Expand Down
4 changes: 2 additions & 2 deletions clients/android/NewsBlur/res/layout/activity_reading.xml
View file
Expand Up @@ -14,8 +14,8 @@
style="?explainerText"
android:textSize="16sp" />

<android.support.v4.view.ViewPager
android:id="@+id/reading_pager"
<FrameLayout
android:id="@+id/activity_reading_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />

Expand Down
17 changes: 17 additions & 0 deletions clients/android/NewsBlur/res/layout/dialog_rename_feed.xml
View file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" >

<EditText
android:id="@+id/feed_name_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="5dp"
android:singleLine="true"
/>

</RelativeLayout>
116 changes: 113 additions & 3 deletions clients/android/NewsBlur/res/layout/fragment_readingitem.xml
View file
Expand Up @@ -10,17 +10,113 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
style="?readingBackground"
>
>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="true"
android:focusableInTouchMode="true"
>
>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
style="?rowItemHeaderBackground">

<RelativeLayout
android:id="@+id/row_item_feed_header"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="6dp"
android:paddingTop="4dp"
android:paddingBottom="4dp" >

<ImageView
android:id="@+id/reading_feed_icon"
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="5dp"
android:contentDescription="@string/description_row_folder_icon" />

<TextView
android:id="@+id/reading_feed_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_toRightOf="@id/reading_feed_icon"
android:layout_centerVertical="true"
android:ellipsize="end"
android:lines="1"
android:textSize="12sp"
android:textStyle="bold" />

</RelativeLayout>

<View
android:id="@+id/item_feed_border"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/row_item_feed_header"
android:background="@color/gray55"/>

<Button
android:id="@+id/story_context_menu_button"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_margin="5dp"
android:background="@drawable/ic_menu_moreoverflow"
android:contentDescription="@string/description_menu"
android:layout_below="@id/item_feed_border"
android:layout_alignParentRight="true" />

<TextView
android:id="@+id/reading_item_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginTop="10dp"
android:layout_marginLeft="16dp"
android:layout_below="@id/item_feed_border"
android:layout_toLeftOf="@id/story_context_menu_button"
android:textSize="17sp" />

<TextView
android:id="@+id/reading_item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/reading_item_title"
android:layout_alignLeft="@id/reading_item_title"
android:layout_marginRight="12dp"
android:layout_marginTop="8dp"
style="?readingItemMetadata"
android:textSize="12sp" />

<TextView
android:id="@+id/reading_item_authors"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/reading_item_date"
android:layout_toRightOf="@id/reading_item_date"
android:maxLines="1"
android:minWidth="80dp"
style="?readingItemMetadata"
android:textSize="12sp"
android:textStyle="bold"/>

<include layout="@layout/include_reading_item_metadata" />
<com.newsblur.view.FlowLayout
android:id="@+id/reading_item_tags"
android:layout_width="match_parent"
android:layout_height="17dp"
android:layout_alignLeft="@id/reading_item_title"
android:layout_below="@id/reading_item_date"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" />

</RelativeLayout>

<View
android:layout_width="match_parent"
Expand Down Expand Up @@ -51,6 +147,20 @@
android:visibility="gone"
/>

<TextView
android:id="@+id/reading_textmodefailed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
style="?readingBackground"
android:gravity="center_horizontal"
android:text="@string/orig_text_failed"
android:textSize="16sp"
android:textStyle="italic"
android:visibility="gone"
/>

<com.newsblur.view.NewsblurWebview
android:id="@+id/reading_webview"
android:layout_width="match_parent"
Expand Down
13 changes: 13 additions & 0 deletions clients/android/NewsBlur/res/layout/fragment_readingpager.xml
View file
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
>

<android.support.v4.view.ViewPager
android:id="@+id/reading_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>

</FrameLayout>
96 changes: 0 additions & 96 deletions clients/android/NewsBlur/res/layout/include_reading_item_metadata.xml
View file

This file was deleted.

3 changes: 3 additions & 0 deletions clients/android/NewsBlur/res/menu/context_feed.xml
View file
Expand Up @@ -13,6 +13,9 @@
<item android:id="@+id/menu_choose_folders"
android:title="@string/menu_choose_folders" />

<item android:id="@+id/menu_rename_feed"
android:title="@string/menu_rename_feed" />

<item android:id="@+id/menu_notifications"
android:title="@string/menu_notifications_choose" >
<menu>
Expand Down
3 changes: 3 additions & 0 deletions clients/android/NewsBlur/res/menu/itemslist.xml
View file
Expand Up @@ -64,6 +64,9 @@
<item android:id="@+id/menu_delete_feed"
android:title="@string/menu_delete_feed"
android:showAsAction="never" />
<item android:id="@+id/menu_rename_feed"
android:title="@string/menu_rename_feed"
android:showAsAction="never" />
<item android:id="@+id/menu_instafetch_feed"
android:title="@string/menu_instafetch_feed" />
<item android:id="@+id/menu_infrequent_cutoff"
Expand Down
59 changes: 0 additions & 59 deletions clients/android/NewsBlur/res/menu/reading.xml
View file
Expand Up @@ -7,63 +7,4 @@
android:showAsAction="always"
android:title="@string/menu_fullscreen"/>

<item
android:id="@+id/menu_reading_sharenewsblur"
android:showAsAction="never"
android:title="@string/menu_sharenewsblur"/>

<item
android:id="@+id/menu_reading_original"
android:showAsAction="never"
android:title="@string/menu_original"/>

<item
android:id="@+id/menu_send_story"
android:showAsAction="never"
android:title="@string/menu_send_story"/>

<item
android:id="@+id/menu_send_story_full"
android:showAsAction="never"
android:title="@string/menu_send_story_full"/>

<item
android:id="@+id/menu_textsize"
android:showAsAction="never"
android:title="@string/menu_textsize"/>

<item
android:id="@+id/menu_font"
android:showAsAction="never"
android:title="@string/menu_font"/>

<item
android:id="@+id/menu_reading_save"
android:showAsAction="never"
android:title="@string/menu_save_story"/>

<item
android:id="@+id/menu_reading_markunread"
android:showAsAction="never"
android:title="@string/menu_mark_unread"/>

<item
android:id="@+id/menu_intel"
android:showAsAction="never"
android:title="@string/menu_intel"/>

<item android:id="@+id/menu_theme"
android:title="@string/menu_theme_choose" >
<menu>
<group android:checkableBehavior="single">
<item android:id="@+id/menu_theme_light"
android:title="@string/light" />
<item android:id="@+id/menu_theme_dark"
android:title="@string/dark" />
<item android:id="@+id/menu_theme_black"
android:title="@string/black" />
</group>
</menu>
</item>

</menu>

0 comments on commit 8a560be

Please sign in to comment.