Merge pull request #47 from ayltai/feature/45-aggregate-sources

Feature/45 aggregate sources

Author: ayltai

README.md

@@ -3,20 +3,32 @@ Newspaper
 
 [![Release](https://img.shields.io/github/release/ayltai/Newspaper.svg?label=release&maxAge=1800)](https://171-77390316-gh.circle-artifacts.com/2/tmp/circle-artifacts.2FZq5Se/app-release.apk) [![Build Status](https://circleci.com/gh/ayltai/Newspaper.svg?style=shield)](https://circleci.com/gh/ayltai/Newspaper) [![Code Quality](https://api.codacy.com/project/badge/Grade/89d745ac9331474e9cf9f3203782a72f)](https://www.codacy.com/app/ayltai/Newspaper?utm_source=github.com&utm_medium=referral&utm_content=ayltai/Newspaper&utm_campaign=Badge_Grade) [![Code Coverage](https://api.codacy.com/project/badge/Coverage/89d745ac9331474e9cf9f3203782a72f)](https://www.codacy.com/app/ayltai/Newspaper?utm_source=github.com&utm_medium=referral&utm_content=ayltai/Newspaper&utm_campaign=Badge_Coverage) [![Code Coverage](https://codecov.io/gh/ayltai/Newspaper/branch/master/graph/badge.svg)](https://codecov.io/gh/ayltai/Newspaper) [![Dependency Status](https://www.versioneye.com/user/projects/586396dc7c01f00031549c16/badge.svg?style=shield)](https://www.versioneye.com/user/projects/586396dc7c01f00031549c16) [![Android API](https://img.shields.io/badge/API-16%2B-blue.svg?style=flat&label=API&maxAge=300)](https://www.android.com/history/) [![License](https://img.shields.io/badge/License-apache%202.0-blue.svg?label=license&maxAge=1800)](https://github.com/ayltai/Newspaper/blob/master/LICENSE)
 
-A Yahoo news app clone that is better than the original. Made with ❤
+An aggreated news app containing news from 10+ local news publishers in Hong Kong. Made with ❤
 
 ![Screenshot (Compact)](screenshots/screenshot_compact_framed.resized.png "Screenshot (Compact)")  ![Screenshot (Dark)](screenshots/screenshot_dark_framed.resized.png "Screenshot (Dark)")
 
 ## Features
-* Run much faster than the [original app](https://play.google.com/store/apps/details?id=com.yahoo.infohub)
+* Fast. Just fast.
 * [Auto face centering](https://developers.google.com/vision/face-detection-concepts) for image previews. No more weird cropping
 * Fancy showcases - [Ken Burns effect](https://en.wikipedia.org/wiki/Ken_Burns_effect) and [Panoramic effect](https://en.wikipedia.org/wiki/Panoramic_photography)
-* Read news from all available [categories](https://hk.news.yahoo.com/sitemap/)
-* Bookmark any news without the need of a [Yahoo account](https://techcrunch.com/2016/12/14/yahoo-discloses-hack-of-1-billion-accounts/)
+* Read news from 10+ news publishers
+* Bookmark any news
 * No ads. We hate ads as much as you do
 * Remember where you were reading
 * Exactly the features we need. No bloat
 
+## Aggregated news publishers
+* [Apple Daily (蘋果日報)](http://hk.apple.nextmedia.com)
+* [Oriental Daily (東方日報)](http://orientaldaily.on.cc)
+* [Sing Tao (星島日報)](http://std.stheadline.com)
+* [Hong Kong Economic Times (經濟日報)](http://www.hket.com)
+* [Sing Pao (成報)](https://www.singpao.com.hk)
+* [Ming Pao (明報)](http://www.mingpao.com)
+* [Headline (頭條日報)](http://hd.stheadline.com)
+* [Sky Post (晴報)](skypost.ulifestyle.com.hk)
+* [Hong Kong Economic Journal (信報)](http://www.hkej.com)
+* [RTHK (香港電台)](http://news.rthk.hk)
+
 ## Requirements
 This app supports Android 4.1 Jelly Bean (API 16) or later.
 
@@ -49,7 +61,6 @@ This app is made with the support of open source software:
 * [Robolectric](http://robolectric.org)
 * [Facebook Stetho](http://facebook.github.io/stetho)
 * [LeakCanary](https://github.com/square/leakcanary)
-* [BlockCanaryEx](https://github.com/seiginonakama/BlockCanaryEx)
 * [Takt](https://github.com/wasabeef/Takt)
 
 … and closed source software:

app/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'com.google.firebase.firebase-crash'
 apply plugin: 'io.fabric'
 apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'realm-android'
-apply plugin: 'blockcanaryex'
 apply plugin: 'checkstyle'
 apply plugin: 'findbugs'
 apply plugin: 'jacoco'
@@ -18,14 +17,13 @@ String VERSION_HASH     = 'git rev-parse --short HEAD'.execute().text.trim()
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
-
+    buildToolsVersion '25.0.3'
     defaultConfig {
-        applicationId    'com.github.ayltai.newspaper'
-        minSdkVersion    16
+        applicationId 'com.github.ayltai.newspaper'
+        minSdkVersion 16
         targetSdkVersion 25
-        versionCode      12
-        versionName      '1.2.7r' + VERSION_REVISION + '-' + VERSION_HASH
+        versionCode 13
+        versionName '2.0.0r' + VERSION_REVISION + '-' + VERSION_HASH
 
         testInstrumentationRunner          'android.support.test.runner.AndroidJUnitRunner'
         testInstrumentationRunnerArguments disableAnalytics: 'true'
@@ -67,6 +65,7 @@ android {
 
     lintOptions {
         abortOnError false
+        disable     'RestrictedApi'
     }
 
     dexOptions {
@@ -92,52 +91,72 @@ configurations {
     codacy
 }
 
+ext {
+    supportLibraryVersion = '25.3.1'
+    firebaseSdkVersion    = '10.2.4'
+    daggerVersion         = '2.10'
+    frescoVersion         = '1.3.0'
+    bigImageViewerVersion = '1.2.9'
+    debugDrawerVersion    = '0.7.0'
+    stethoVersion         = '1.5.0'
+    leakCanaryVersion     = '1.5.1'
+    espressoVersion       = '2.2.2'
+}
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    // Android
-    compile 'com.android.support:support-annotations:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-compat:25.3.1'
-    compile 'com.android.support:support-v13:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:support-core-utils:25.3.1'
-    compile 'com.android.support:preference-v7:25.3.1'
-    compile 'com.android.support:preference-v14:25.3.1'
+    // Android Support libraries
+    compile "com.android.support:support-annotations:${supportLibraryVersion}"
+    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
+    compile "com.android.support:support-compat:${supportLibraryVersion}"
+    compile "com.android.support:support-v13:${supportLibraryVersion}"
+    compile "com.android.support:support-v4:${supportLibraryVersion}"
+    compile "com.android.support:design:${supportLibraryVersion}"
+    compile "com.android.support:recyclerview-v7:${supportLibraryVersion}"
+    compile "com.android.support:cardview-v7:${supportLibraryVersion}"
+    compile "com.android.support:support-core-utils:${supportLibraryVersion}"
+    compile "com.android.support:preference-v7:${supportLibraryVersion}"
+    compile "com.android.support:preference-v14:${supportLibraryVersion}"
     compile ('com.takisoft.fix:preference-v7:25.3.1.0') {
         exclude group: 'com.android.support', module: 'preference-v7'
         exclude group: 'com.android.support', module: 'preference-v14'
     }
 
     // Firebase
-    compile ('com.google.firebase:firebase-core:10.2.1') {
+    compile ("com.google.firebase:firebase-core:${firebaseSdkVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
     }
-    compile ('com.google.firebase:firebase-crash:10.2.1') {
+    compile ("com.google.firebase:firebase-crash:${firebaseSdkVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
     }
-    compile ('com.google.firebase:firebase-config:10.2.1') {
+    compile ("com.google.firebase:firebase-config:${firebaseSdkVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
     }
-    compile ('com.google.firebase:firebase-invites:10.2.1') {
+    compile ("com.google.firebase:firebase-invites:${firebaseSdkVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
     }
 
     // Fabric
-    releaseCompile('io.fabric.sdk.android:fabric:1.3.16@aar')           { transitive = true; }
-    releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') { transitive = true; }
-    releaseCompile('com.crashlytics.sdk.android:answers:1.3.12@aar')    { transitive = true; }
-    testCompile('com.crashlytics.sdk.android:answers:1.3.12@aar') { transitive = true; }
+    releaseCompile('io.fabric.sdk.android:fabric:1.3.16@aar') {
+        transitive = true;
+    }
+    releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
+        transitive = true;
+    }
+    releaseCompile('com.crashlytics.sdk.android:answers:1.3.12@aar') {
+        transitive = true;
+    }
+    testCompile('com.crashlytics.sdk.android:answers:1.3.12@aar') {
+        transitive = true;
+    }
 
     // ReactiveX
-    compile 'io.reactivex:rxjava:1.2.10'
+    compile 'io.reactivex:rxjava:1.3.0'
     compile ('io.reactivex:rxandroid:1.2.1') {
         exclude group: 'io.reactivex', module: 'rxjava'
     }
@@ -148,8 +167,8 @@ dependencies {
     }
 
     // Dagger 2
-    compile 'com.google.dagger:dagger:2.10'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.10'
+    compile "com.google.dagger:dagger:${daggerVersion}"
+    annotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
 
     // Flow by Square
     compile ('com.squareup.flow:flow:1.0.0-alpha3') {
@@ -163,26 +182,26 @@ dependencies {
     compile 'io.realm:android-adapters:2.0.0'
 
     // Image processing
-    compile 'com.facebook.fresco:fresco:1.3.0'
-    compile 'com.facebook.fresco:imagepipeline-okhttp3:1.3.0'
+    compile "com.facebook.fresco:fresco:${frescoVersion}"
+    compile "com.facebook.fresco:imagepipeline-okhttp3:${frescoVersion}"
     compile ('com.github.stfalcon:frescoimageviewer:0.5.0') {
         exclude group: 'com.facebook.fresco', module: 'fresco'
     }
-    compile ('com.google.android.gms:play-services-vision:10.2.1') {
+    compile ("com.google.android.gms:play-services-vision:${firebaseSdkVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
     }
     compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    compile ('com.github.piasy:BigImageViewer:1.2.8') {
+    compile ("com.github.piasy:BigImageViewer:${bigImageViewerVersion}") {
         exclude group: 'com.android.support',    module: 'support-annotations'
         exclude group: 'com.davemorrissey.labs', module: 'subsampling-scale-image-view'
     }
-    compile ('com.github.piasy:FrescoImageLoader:1.2.8') {
+    compile ("com.github.piasy:FrescoImageLoader:${bigImageViewerVersion}") {
         exclude group: 'com.facebook.fresco', module: 'fresco'
     }
-    compile 'com.github.piasy:ProgressPieIndicator:1.2.8'
+    compile "com.github.piasy:ProgressPieIndicator:${bigImageViewerVersion}"
 
     // Eye candies
     compile ('hanks.xyz:smallbang-library:0.1.2') {
@@ -212,45 +231,43 @@ dependencies {
 
     // Debugging
     debugCompile 'jp.wasabeef:takt:1.0.4'
-    debugCompile ('io.palaima.debugdrawer:debugdrawer:0.7.0') {
+    debugCompile ("io.palaima.debugdrawer:debugdrawer:${debugDrawerVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
-    debugCompile ('io.palaima.debugdrawer:debugdrawer-commons:0.7.0') {
+    debugCompile ("io.palaima.debugdrawer:debugdrawer-commons:${debugDrawerVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    debugCompile ('io.palaima.debugdrawer:debugdrawer-actions:0.7.0') {
+    debugCompile ("io.palaima.debugdrawer:debugdrawer-actions:${debugDrawerVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    debugCompile ('io.palaima.debugdrawer:debugdrawer-fps:0.7.0') {
+    debugCompile ("io.palaima.debugdrawer:debugdrawer-fps:${debugDrawerVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    debugCompile 'com.facebook.stetho:stetho:1.5.0'
-    debugCompile 'com.facebook.stetho:stetho-okhttp3:1.5.0'
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    testCompile  'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    debugCompile 'com.letv.sarrsdesktop:BlockCanaryExJRT:0.9.5.2'
-    testCompile  'com.letv.sarrsdesktop:BlockCanaryExJRTNoOp:0.9.5.2'
+    debugCompile "com.facebook.stetho:stetho:${stethoVersion}"
+    debugCompile "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
+    debugCompile "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}"
+    testCompile  "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
 
     // Tests
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.7.22'
     testCompile 'org.robolectric:robolectric:3.3.2'
     androidTestCompile ('com.android.support.test:runner:0.5') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.2') {
+    androidTestCompile ("com.android.support.test.espresso:espresso-core:${espressoVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.2.2') {
+    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${espressoVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'design'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
-    androidTestCompile ('com.android.support.test.espresso:espresso-intents:2.2.2') {
+    androidTestCompile ("com.android.support.test.espresso:espresso-intents:${espressoVersion}") {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
 
@@ -370,7 +387,7 @@ task (codacyDepsize) << {
 
 task (codacyLocs) << {
     configurations.codacy.each {
-        String jarName = it
+        String  jarName = it
         println jarName
     }
 }

app/src/androidTest/java/com/github/ayltai/newspaper/MainActivityTest.java

@@ -58,16 +58,13 @@ public void openFirstItemThenSwipeThroughAllTabs() {
             .perform(ViewActions.click());
 
         // Swipes through all tabs
-        final String[] shortCategories = InstrumentationRegistry.getTargetContext().getResources().getStringArray(R.array.pref_category_short_entries);
-        final String[] longCategories  = InstrumentationRegistry.getTargetContext().getResources().getStringArray(R.array.pref_category_entries);
-
-        for (int i = 0; i < shortCategories.length; i++) {
-            final String longCategory = longCategories[i];
+        final String[] categories = InstrumentationRegistry.getTargetContext().getResources().getStringArray(R.array.categories);
 
+        for (int i = 0; i < categories.length; i++) {
             Espresso.onView(ViewMatchers.withId(R.id.collapsingToolbarLayout))
-                .check(ViewAssertions.matches(MoreViewMatchers.withTitle(longCategory)));
+                .check(ViewAssertions.matches(MoreViewMatchers.withTitle(categories[i])));
 
-            Espresso.onView(Matchers.allOf(ViewMatchers.withText(shortCategories[i]), ViewMatchers.isDescendantOfA(ViewMatchers.withId(R.id.tabLayout))))
+            Espresso.onView(Matchers.allOf(ViewMatchers.withText(categories[i]), ViewMatchers.isDescendantOfA(ViewMatchers.withId(R.id.tabLayout))))
                 .check(ViewAssertions.matches(ViewMatchers.isDisplayed()));
 
             Espresso.onView(ViewMatchers.withId(R.id.navigate_next))

app/src/debug/java/com/github/ayltai/newspaper/BaseApplication.java

@@ -6,10 +6,6 @@
 import com.facebook.common.logging.FLog;
 import com.facebook.stetho.Stetho;
 import com.github.ayltai.newspaper.util.TestUtils;
-import com.letv.sarrsdesktop.blockcanaryex.jrt.BlockCanaryEx;
-import com.letv.sarrsdesktop.blockcanaryex.jrt.Config;
-import com.letv.sarrsdesktop.blockcanaryex.jrt.FrequentMethodInfo;
-import com.letv.sarrsdesktop.blockcanaryex.jrt.MethodInfo;
 import com.squareup.leakcanary.LeakCanary;
 
 public abstract class BaseApplication extends Application {
@@ -34,27 +30,6 @@ public void onCreate() {
 
             if (!LeakCanary.isInAnalyzerProcess(this)) LeakCanary.install(this);
 
-            if (!BlockCanaryEx.isInSamplerProcess(this)) BlockCanaryEx.install(new Config(this) {
-                private static final double FRAME_DURATION     = (long)(1000.0 / 60.0);
-                private static final double BLOCK_THRESHOLD    = 3 * 2 * FRAME_DURATION;
-                private static final int    FREQUENT_THRESHOLD = 5;
-
-                @Override
-                public boolean isBlock(final long startTime, final long endTime, final long startThreadTime, final long endThreadTime) {
-                    return endTime - startTime > BLOCK_THRESHOLD;
-                }
-
-                @Override
-                public boolean isHeavyMethod(final MethodInfo methodInfo) {
-                    return methodInfo.getCostRealTimeMs() > FRAME_DURATION;
-                }
-
-                @Override
-                public boolean isFrequentMethod(final FrequentMethodInfo frequentMethodInfo) {
-                    return frequentMethodInfo.getTotalCostRealTimeMs() > FRAME_DURATION && frequentMethodInfo.getCalledTimes() >= FREQUENT_THRESHOLD;
-                }
-            });
-
             FLog.setMinimumLoggingLevel(FLog.WARN);
             Stetho.initializeWithDefaults(this);
         }