From bd97bb0bdc2432407d1bf95d79c1d28552612068 Mon Sep 17 00:00:00 2001
From: Amit Davidi <amitd@wix.com>
Date: Sun, 20 Nov 2016 11:27:18 +0200
Subject: [PATCH] Remove child activity

---
 .../app/ChildActivity.java                    | 20 ----------------
 .../app/MainActivity.java                     | 24 ++++---------------
 .../src/main/res/layout/activity_child.xml    | 21 ----------------
 example/android/send_notif.py                 | 17 ++++++-------
 4 files changed, 14 insertions(+), 68 deletions(-)
 delete mode 100644 example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/ChildActivity.java
 delete mode 100644 example/android/myapplication/src/main/res/layout/activity_child.xml

diff --git a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/ChildActivity.java b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/ChildActivity.java
deleted file mode 100644
index 645bb3b..0000000
--- a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/ChildActivity.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wix.reactnativenotifications.app;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
-public class ChildActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_child);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        finish();
-    }
-}
diff --git a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java
index ace7301..35edad8 100644
--- a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java
+++ b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java
@@ -6,8 +6,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.ViewGroup;
 import android.widget.Toolbar;
 
@@ -26,10 +24,11 @@ public class MainActivity extends ReactActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ViewGroup layout = (ViewGroup) getLayoutInflater().inflate(R.layout.activity_main, null);
-        Toolbar toolbar = (Toolbar) layout.findViewById(R.id.toolbar);
-        setActionBar(toolbar);
-
+        final ViewGroup layout = (ViewGroup) getLayoutInflater().inflate(R.layout.activity_main, null);
+        if (SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Toolbar toolbar = (Toolbar) layout.findViewById(R.id.toolbar);
+            setActionBar(toolbar);
+        }
         mReactRootView = new ReactRootView(this);
         layout.addView(mReactRootView);
 
@@ -43,19 +42,6 @@ public class MainActivity extends ReactActivity {
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add("Child Activity").setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                Intent intent = new Intent(MainActivity.this, ChildActivity.class);
-                MainActivity.this.startActivity(intent);
-                return true;
-            }
-        });
-        return super.onCreateOptionsMenu(menu);
-    }
-
     @TargetApi(Build.VERSION_CODES.M)
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
diff --git a/example/android/myapplication/src/main/res/layout/activity_child.xml b/example/android/myapplication/src/main/res/layout/activity_child.xml
deleted file mode 100644
index a95e8a2..0000000
--- a/example/android/myapplication/src/main/res/layout/activity_child.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_child"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.wix.reactnativenotifications.app.ChildActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="By default, when opening a notification, the entire activity back-stack will be restored as-is!\n(instead of launching or relaunching the main activity)"
-        android:layout_centerInParent="true"
-        />
-
-</RelativeLayout>
diff --git a/example/android/send_notif.py b/example/android/send_notif.py
index 11e1ead..ff362e6 100644
--- a/example/android/send_notif.py
+++ b/example/android/send_notif.py
@@ -1,27 +1,28 @@
 from urllib2 import *
-import urllib
 import json
 import sys
 
-API_KEY = "AIzaSyBVtqdO_SgPVhhXnyNGC_VXSbIX-fxk1YY"
-TOKEN = "c70LL7cNR-0:APA91bFja9qHDqLFtKYGCKNZRBcgHAQrmcPE-XNIIctnFnsEKJml9tgbuQql15ORoJc4drw6fAA38_JFx1X3s3wF9FlArPO_laPTXmaCC4_ZFm1QzfgmoJ5hXUhDFsArJpTVFIonEOHR"
+if len(sys.argv) < 2:
+    print 'Error: missing token argument'
+    sys.exit(1)
 
-data={
+API_KEY = 'AIzaSyBVtqdO_SgPVhhXnyNGC_VXSbIX-fxk1YY'
+TOKEN = sys.argv[1]
+data = {
     "to": TOKEN,
     "data" : {
-        "body": "A very tiny one",
-        "title": "A tiny notification"
+        "body": "SUCCESS! Sent from script :)",
+        "title": "Wix Example Project"
     }
 }
 dataAsJSON = json.dumps(data)
 
 request = Request(
-    "https://gcm-http.googleapis.com/gcm/send",
+    'https://gcm-http.googleapis.com/gcm/send',
     dataAsJSON,
     {
       "Authorization" : "key="+API_KEY,
       "Content-type" : "application/json"
     }
 )
-
 print urlopen(request).read()
-- 
2.26.2