1) Restructure all code

2) Reduced sdk initialize code
3) UI design changed
4) And more feature implemented

Author: yogesh-wittyfeed

Diff for: .gitignore

@@ -1,8 +1,9 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
 /.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
 .DS_Store
 /build
 /captures

Diff for: .idea/caches/build_file_checksums.ser

@@ -1,73 +1,42 @@
-buildscript {
-    repositories {
-        maven { url 'https://plugins.gradle.org/m2/'}
-    }
-    dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.11.0, 0.99.99]'
-    }
-}
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
-
-repositories {
-    maven { url 'https://maven.google.com' }
-}
 apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
     defaultConfig {
+       // applicationId "com.onefeed.sdk.sample"
         applicationId "com.sdk.wittyfeed.demo"
         minSdkVersion 16
         targetSdkVersion 27
-        buildToolsVersion '27.0.3'
         versionCode 1
-        versionName "1.2"
-        testInstrumentationRunner "android.support.custom_divider.runner.AndroidJUnitRunner"
-        manifestPlaceholders = [
-                onesignal_app_id: '521fdc24-e473-4b3d-a62a-ddbdd3c5f637',
-                // Project number pulled from dashboard, local value is ignored.
-                onesignal_google_project_number: 'REMOTE'
-        ]
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        debug {
-            minifyEnabled false
-        }
     }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    // general
-    compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'com.android.support:support-v4:27.1.1'
-    compile 'com.android.support:design:27.1.1'
-    compile 'com.android.support:cardview-v7:27.1.1'
-    compile 'com.android.support:recyclerview-v7:27.1.1'
-
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation project(':onefeedsdk')
+
+    //recycler-View
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    //Card-View
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    //CustomTabs
+    implementation 'com.android.support:customtabs:27.1.1'
     // firebase
-    compile 'com.google.firebase:firebase-core:12.0.1'
-    compile 'com.google.firebase:firebase-messaging:12.0.1'
-
-    // SDK
-    compile 'com.google.code.gson:gson:2.8.2'
-    compile 'com.github.bumptech.glide:glide:4.3.1'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
-    compile 'com.android.volley:volley:1.0.0'
-    compile 'com.android.support:customtabs:27.1.1'
-    // other auto generated
-
-    testCompile 'junit:junit:4.12'
-
-    // to add our SDK module in main app
-    compile project(':onefeedsdk')
-    implementation 'com.onesignal:OneSignal:[3.9.1, 3.99.99]'
-
+    implementation 'com.google.firebase:firebase-core:16.0.4'
+    implementation 'com.google.firebase:firebase-messaging:17.3.3'
 }
-
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'

Diff for: .idea/misc.xml

@@ -1,14 +1,10 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/aishwarydhare/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:

Diff for: app/build.gradle

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.sdk.wittyfeed.debug","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

Diff for: app/keystore/demo.jks

@@ -1,4 +1,4 @@
-package com.wittyfeed.sdk.demo;
+package com.onefeed.sdk.sample;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -10,17 +10,17 @@
 import static org.junit.Assert.*;
 
 /**
- * Instrumentation custom_divider, which will execute on an Android device.
+ * Instrumented test, which will execute on an Android device.
  *
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
 @RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
     @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under custom_divider.
+    public void useAppContext() {
+        // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.sdk.wittyfeed.sdkv2", appContext.getPackageName());
+        assertEquals("com.onefeed.sdk.sample", appContext.getPackageName());
     }
 }

Diff for: app/keystore/onefeed.jks

@@ -1,82 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.wittyfeed.sdk.demo">
+    package="com.onefeed.sdk.sample">
 
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name=".Root"
-        android:allowBackup="false"
+        android:name=".app.Root"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/WFSDKTheme">
-
-
-        <activity
-            android:name="com.wittyfeed.sdk.demo.MainActivity"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTop"
-            android:theme="@style/Theme.AppCompat.NoActionBar">
+        android:theme="@style/AppTheme">
+        <activity android:name=".DemoActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
-                <!--<action android:name="OPEN_MYACTIVITY" />-->
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".NativeCardsActivity"></activity>
-
-        <activity android:name=".NonRepeatingDemoActivity"></activity>
+        <activity android:name=".FeedActivity"
+            android:screenOrientation="portrait"/>
 
+        <activity android:name=".RepeatingCardActivity"
+            android:screenOrientation="portrait"/>
 
-        <!-- Set custom default icon. This is used when no icon is set for incoming notification messages. -->
-        <!-- See README(https://goo.gl/l4GJaQ) for more. -->
-
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@mipmap/ic_launcher" />
-
-        <!--&lt;!&ndash; Set color used with incoming notification messages. This is used when no color is set for the incoming-->
-        <!--notification message. See README(https://goo.gl/6BKBk7) for more. &ndash;&gt;-->
-
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_color"
-            android:resource="@color/colorAccent" />
 
         <service
-            android:name="com.wittyfeed.sdk.demo.MyFirebaseInstanceIDService"
-            android:stopWithTask="false">
+            android:name="com.onefeed.sdk.sample.service.OnefeedFirebaseMessagingService">
             <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
 
-        <service
-            android:name="com.wittyfeed.sdk.demo.MyFirebaseMessagingService"
-            android:stopWithTask="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
+        <meta-data android:name="com.onefeed.sdk.ApiKey"
+            android:value="@string/onefeed_api_key"/>
 
-        <!-- Disable opening of launcher Activity -->
-        <meta-data android:name="com.onesignal.NotificationOpened.DEFAULT" android:value="DISABLE" />
-
-        <!--<service
-            android:name=".NotificationExtenderExample"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.onesignal.NotificationExtender" />
-            </intent-filter>
-        </service>-->
+        <meta-data android:name="com.onefeed.sdk.AppId"
+            android:value="@string/onefeed_app_id"/>
 
+        <meta-data android:name="com.onefeed.sdk.CardId"
+            android:value="@string/onefeed_card_id"/>
     </application>
 
-
 </manifest>

Diff for: app/proguard-rules.pro

@@ -0,0 +1,105 @@
+package com.onefeed.sdk.sample;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.InstanceIdResult;
+import com.google.firebase.messaging.FirebaseMessaging;
+import com.onefeedsdk.app.OneFeedSdk;
+import com.onefeedsdk.notification.NotificationHelper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Yogesh Soni.
+ * Company: WittyFeed
+ * Date: 26-September-2018
+ * Time: 14:34
+ */
+public class DemoActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_demo);
+
+        // Get token
+        FirebaseInstanceId.getInstance().getInstanceId()
+                .addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
+                    @Override
+                    public void onComplete(@NonNull Task<InstanceIdResult> task) {
+                        if (!task.isSuccessful()) {
+                            Log.w("Token", "getInstanceId failed", task.getException());
+                            return;
+                        }
+                        try {
+                            // Get new Instance ID token
+                            String token = task.getResult().getToken();
+                            // Log and toast
+                            String msg = getString(R.string.msg_token_fmt, token);
+                            Log.d("Token", msg);
+
+                            //set Token
+                            OneFeedSdk.getInstance().setToken(token);
+                        }catch (NullPointerException e){
+                            Log.e("Exception", e.getMessage());
+                        }
+                    }
+                });
+
+        topicSubscription();
+    }
+
+    //FCM Topic Subscription and Unsubscription
+    private void topicSubscription() {
+
+        //Topic Subscribe
+        FirebaseMessaging.getInstance().subscribeToTopic(OneFeedSdk.getInstance().getSubscribeTopic());
+
+        if (TextUtils.isEmpty(OneFeedSdk.getInstance().getOldTopicSubscribe())) {
+            OneFeedSdk.getInstance().setTopicSubscription();
+        } else if (OneFeedSdk.getInstance().getSubscribeTopic() != OneFeedSdk.getInstance().getOldTopicSubscribe()) {
+            FirebaseMessaging.getInstance().unsubscribeFromTopic(OneFeedSdk.getInstance().getOldTopicSubscribe());
+            OneFeedSdk.getInstance().setTopicSubscription();
+        }
+    }
+
+    public void onClick(View view){
+        switch (view.getId()){
+            case R.id.btn_feed:
+                startActivity(new Intent(this, FeedActivity.class));
+                break;
+            case R.id.btn_native_card:
+                startActivity(new Intent(this, RepeatingCardActivity.class));
+                break;
+            case R.id.button:
+                Map<String, String> demoNotification = new HashMap<>();
+                demoNotification.put("story_id", "60496");
+                demoNotification.put("noid", "10001");
+                demoNotification.put("story_title", "10 Things Every Girl Should Put On Her List");
+                demoNotification.put("cover_image", "https://cdn.wittyfeed.com/41441/ilik0kqmr2hpv1i4l8ya.jpeg?imwidth=960");
+                demoNotification.put("story_url","https://www.wittyfeed.me/story/41441/things-every-girl-should-put-in-her-list?utm_hash=ArD51&nohead=1");
+
+                demoNotification.put("id", "400");
+                demoNotification.put("body", "Hey, Here's a new amazing story for you!");
+                demoNotification.put("title", "10 Things Every Girl Should Put On Her List");
+                demoNotification.put("notiff_agent", "wittyfeed_sdk");
+                demoNotification.put("app_id" , "108");
+
+                demoNotification.put("action", "" + "WittyFeedSDKContentViewActivity");
+
+                NotificationHelper.sendNotification(getApplicationContext(), FeedActivity.class, demoNotification);
+
+        }
+    }
+}