From b81938a88c5ac1ae91717a8ef8fb3963c15f882c Mon Sep 17 00:00:00 2001
From: Mark Anderson <manderson23@gmail.com>
Date: Tue, 1 Jul 2014 21:03:02 +0100
Subject: [PATCH] Remove AddFollow activity from register workflow (#499)

---
 clients/android/NewsBlur/AndroidManifest.xml  |   4 -
 .../res/layout/activity_addfollow.xml         |  33 -----
 .../res/layout/activity_addsocial.xml         |   2 +-
 .../res/layout/fragment_addfollow.xml         |  72 ----------
 .../src/com/newsblur/activity/AddFollow.java  |  44 -------
 .../src/com/newsblur/activity/AddSocial.java  |   5 +-
 .../newsblur/fragment/AddFollowFragment.java  | 123 ------------------
 7 files changed, 4 insertions(+), 279 deletions(-)
 delete mode 100644 clients/android/NewsBlur/res/layout/activity_addfollow.xml
 delete mode 100644 clients/android/NewsBlur/res/layout/fragment_addfollow.xml
 delete mode 100644 clients/android/NewsBlur/src/com/newsblur/activity/AddFollow.java
 delete mode 100644 clients/android/NewsBlur/src/com/newsblur/fragment/AddFollowFragment.java

diff --git a/clients/android/NewsBlur/AndroidManifest.xml b/clients/android/NewsBlur/AndroidManifest.xml
index 1624a4ff6..efaa636d3 100644
--- a/clients/android/NewsBlur/AndroidManifest.xml
+++ b/clients/android/NewsBlur/AndroidManifest.xml
@@ -39,10 +39,6 @@
             android:noHistory="true"
             android:label="@string/get_started" />
 		
-		<activity
-            android:name=".activity.AddFollow"
-            android:label="@string/add_follow" />
-		
 		<activity
             android:name=".activity.AddTwitter"
             android:label="@string/add_twitter" />
diff --git a/clients/android/NewsBlur/res/layout/activity_addfollow.xml b/clients/android/NewsBlur/res/layout/activity_addfollow.xml
deleted file mode 100644
index 9514dda44..000000000
--- a/clients/android/NewsBlur/res/layout/activity_addfollow.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:background="@color/item_background" >
-
-    <FrameLayout
-        android:id="@+id/addfollow_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"
-        android:padding="30dp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:id="@+id/addfollow_button_bar"
-        android:gravity="right" 
-        android:padding="10dp">
-
-        <Button
-            android:id="@+id/login_addfollow_startreading"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="10dp"
-            android:text="Start Reading"
-            android:textSize="14sp" />
-        
-    </LinearLayout>
-    
-</RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_addsocial.xml b/clients/android/NewsBlur/res/layout/activity_addsocial.xml
index 79845c1e1..582791a9d 100644
--- a/clients/android/NewsBlur/res/layout/activity_addsocial.xml
+++ b/clients/android/NewsBlur/res/layout/activity_addsocial.xml
@@ -25,7 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
-            android:text="Skip this step"
+            android:text="Start Reading"
             android:textSize="14sp" />
         
     </LinearLayout>
diff --git a/clients/android/NewsBlur/res/layout/fragment_addfollow.xml b/clients/android/NewsBlur/res/layout/fragment_addfollow.xml
deleted file mode 100644
index 28ad2b95a..000000000
--- a/clients/android/NewsBlur/res/layout/fragment_addfollow.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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:layout_margin="20dp" >
-
-    <TextView
-        android:id="@+id/addfollow_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="30dp"
-        android:text="@string/wonderful_things"
-        android:textColor="@color/darkgray"
-        android:textSize="16sp" />
-
-    <LinearLayout
-        android:id="@+id/addfollow_newsblur"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/addfollow_text"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="20dp"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="5dp" >
-
-        <TextView
-            android:id="@+id/addfollow_newsblur_text"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginRight="10dp"
-            android:gravity="center_vertical"
-            android:text="@string/addfollow_add_newsblur"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-
-        <CheckBox
-            android:id="@+id/addfollow_newsblur_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/addfollow_popular"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/addfollow_newsblur"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="20dp"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="5dp" >
-
-        <TextView
-            android:id="@+id/addfollow_popular_text"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginRight="10dp"
-            android:gravity="center_vertical"
-            android:text="@string/addfollow_add_popular"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-
-        <CheckBox
-            android:id="@+id/addfollow_popular_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right" />
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddFollow.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddFollow.java
deleted file mode 100644
index a3072232b..000000000
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddFollow.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.newsblur.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-import com.newsblur.R;
-import com.newsblur.fragment.AddFollowFragment;
-
-public class AddFollow extends NbActivity {
-
-	private FragmentManager fragmentManager;
-	private String currentTag = "addFollowFragment";
-	private AddFollowFragment addFollowFragment;
-
-	public void onCreate(Bundle bundle) {
-		super.onCreate(bundle);
-		setContentView(R.layout.activity_addfollow);
-
-		fragmentManager = getFragmentManager();
-		
-		if (fragmentManager.findFragmentByTag(currentTag ) == null) {
-			FragmentTransaction transaction = fragmentManager.beginTransaction();
-			addFollowFragment = new AddFollowFragment();
-			transaction.add(R.id.addfollow_container, addFollowFragment, currentTag);
-			transaction.commit();
-		}
-		
-		Button startReading = (Button) findViewById(R.id.login_addfollow_startreading);
-		startReading.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-			Intent i = new Intent(AddFollow.this, Main.class);
-			i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-			startActivity(i);
-			}
-		});
-	};
-	
-}
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
index 3c6c26770..f7d5cc2c6 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
@@ -35,8 +35,9 @@ public class AddSocial extends NbActivity {
 		nextStep.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				Intent i = new Intent(AddSocial.this, AddFollow.class);
-				startActivity(i);
+                Intent i = new Intent(AddSocial.this, Main.class);
+                i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(i);
 			}
 		});
 		
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/AddFollowFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/AddFollowFragment.java
deleted file mode 100644
index bac3ef1b9..000000000
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/AddFollowFragment.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.newsblur.fragment;
-
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.newsblur.R;
-import com.newsblur.network.APIManager;
-
-public class AddFollowFragment extends Fragment {
-
-	boolean followingNewsblur, followingPopular;
-	private View parentView;
-	private LinearLayout followingNewsblurLayout, followingPopularLayout;
-	private APIManager apiManager;
-	private TextView followingNewsblurText;
-	private CheckBox followingNewsblurCheckbox;
-	private TextView followingPopularText;
-	private CheckBox followingPopularCheckbox;
-	private String TAG = "addFollowFragment";
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		apiManager = new APIManager(getActivity());
-	}
-	
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		parentView = inflater.inflate(R.layout.fragment_addfollow, null);
-		followingNewsblurLayout = (LinearLayout) parentView.findViewById(R.id.addfollow_newsblur);
-		followingNewsblurText = (TextView) parentView.findViewById(R.id.addfollow_newsblur_text);
-		followingNewsblurCheckbox = (CheckBox) parentView.findViewById(R.id.addfollow_newsblur_checkbox);
-		
-		followingPopularLayout = (LinearLayout) parentView.findViewById(R.id.addfollow_popular);
-		followingPopularText = (TextView) parentView.findViewById(R.id.addfollow_popular_text);
-		followingPopularCheckbox = (CheckBox) parentView.findViewById(R.id.addfollow_popular_checkbox);
-		
-		followingPopularLayout.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				followingPopularCheckbox.toggle();
-			}
-		});
-		
-		followingNewsblurLayout.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				followingNewsblurCheckbox.toggle();
-			}
-		});
-		
-		setupUI();
-		
-		followingNewsblurCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				followingNewsblurCheckbox.setEnabled(false);
-				
-				new AsyncTask<Void, Void, Void>() {
-					@Override
-					protected Void doInBackground(Void... arg0) {
-						boolean addedOkay = apiManager.addFeed("http://blog.newsblur.com", null);
-						followingNewsblur = true;
-						return null;
-					}
-					
-					@Override
-					protected void onPostExecute(Void result) {
-						setupUI();
-					}
-				}.execute();
-			}
-		});
-		
-		followingPopularCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				followingPopularCheckbox.setEnabled(false);
-				
-				new AsyncTask<Void, Void, Void>() {
-
-					@Override
-					protected Void doInBackground(Void... arg0) {
-						boolean addedOkay = apiManager.followUser("popular");
-						followingPopular = true;
-						return null;
-					}
-					
-					@Override
-					protected void onPostExecute(Void result) {
-						setupUI();
-					}
-				}.execute();
-			}
-		});
-		
-		return parentView;
-	}
-
-	private void setupUI() {
-		if (followingNewsblur) {
-			followingNewsblurText.setText("Following Newsblur");
-			followingNewsblurCheckbox.setEnabled(false);
-		}
-		
-		if (followingPopular) {
-			followingPopularText.setText("Following Popular");
-			followingPopularCheckbox.setEnabled(false);
-		}
-	}
-	
-}