Refactoring and add a callback for EndpointsAsyncTask

FredericLetellier · Sep 1, 2016 · c266103 · c266103
1 parent 0482541
commit c266103
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 22 deletions.
diff --git a/app/src/free/java/com/udacity/gradle/builditbigger/MainActivityFragment.java b/app/src/free/java/com/udacity/gradle/builditbigger/MainActivityFragment.java
@@ -1,19 +1,23 @@
 package com.udacity.gradle.builditbigger;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdView;
+import com.joke.JokeActivity;
 
 
 /**
  * A placeholder fragment containing a simple view.
  */
-public class MainActivityFragment extends Fragment {
+public class MainActivityFragment extends Fragment implements OnTaskCompleted{
+    Button mJokeButton;
 
     public MainActivityFragment() {
     }
@@ -23,6 +27,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_main, container, false);
 
+        mJokeButton = (Button) root.findViewById(R.id.btn_joke);
+
         AdView mAdView = (AdView) root.findViewById(R.id.adView);
         // Create an ad request. Check logcat output for the hashed device ID to
         // get test ads on a physical device. e.g.
@@ -31,6 +37,27 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 .addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
                 .build();
         mAdView.loadAd(adRequest);
+
+        mJokeButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                loadData();
+            }
+        });
+
         return root;
     }
+
+    public void loadData() {
+        EndpointsAsyncTask endpointsAsyncTask = new EndpointsAsyncTask(this);
+        endpointsAsyncTask.execute();
+    }
+
+    @Override
+    public void onTaskCompleted(String result) {
+        Intent intent = new Intent(getActivity(), JokeActivity.class);
+
+        intent.putExtra(JokeActivity.JOKE_KEY, result);
+        startActivity(intent);
+    }
 }
diff --git a/app/src/free/res/layout/fragment_main.xml b/app/src/free/res/layout/fragment_main.xml
@@ -20,10 +20,10 @@
             android:text="@string/instructions" />
 
         <Button
+            android:id="@+id/btn_joke"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/instructions_text_view"
-            android:onClick="launchJokeActivity"
             android:text="@string/button_text"
 
             />

diff --git a/app/src/main/java/com/udacity/gradle/builditbigger/EndpointsAsyncTask.java b/app/src/main/java/com/udacity/gradle/builditbigger/EndpointsAsyncTask.java
@@ -1,12 +1,9 @@
 package com.udacity.gradle.builditbigger;
 
-import android.content.Context;
-import android.content.Intent;
 import android.os.AsyncTask;
 
 import com.google.api.client.extensions.android.http.AndroidHttp;
 import com.google.api.client.extensions.android.json.AndroidJsonFactory;
-import com.joke.JokeActivity;
 import com.joke.endpoint.backend.myApi.MyApi;
 
 import java.io.IOException;
@@ -17,10 +14,10 @@
  */
 public class EndpointsAsyncTask extends AsyncTask<Void, Void, String> {
     private static MyApi myApiService = null;
-    private final Context mContext;
+    private OnTaskCompleted mListener;
 
-    public EndpointsAsyncTask (Context context){
+    public EndpointsAsyncTask (OnTaskCompleted listener) {
-        mContext = context;
+        this.mListener = listener;
     }
 
     @Override
@@ -42,9 +39,6 @@ protected String doInBackground(Void... params){
     @Override
     protected void onPostExecute(String result) {
 
-        Intent intent = new Intent(mContext, JokeActivity.class);
+        mListener.onTaskCompleted(result);
-
-        intent.putExtra(JokeActivity.JOKE_KEY, result);
-        mContext.startActivity(intent);
     }
 }
diff --git a/app/src/main/java/com/udacity/gradle/builditbigger/MainActivity.java b/app/src/main/java/com/udacity/gradle/builditbigger/MainActivity.java
@@ -4,7 +4,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 
 
 public class MainActivity extends AppCompatActivity {
@@ -38,10 +37,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    public void launchJokeActivity(View view) {
-        EndpointsAsyncTask endpointsAsyncTask = new EndpointsAsyncTask(this);
-        endpointsAsyncTask.execute();
-    }
-
-
 }
diff --git a/app/src/main/java/com/udacity/gradle/builditbigger/OnTaskCompleted.java b/app/src/main/java/com/udacity/gradle/builditbigger/OnTaskCompleted.java
@@ -0,0 +1,9 @@
+package com.udacity.gradle.builditbigger;
+
+/**
+ * udacity-builditbigger
+ * Created on 01/09/2016 by Espace de travail.
+ */
+public interface OnTaskCompleted {
+    void onTaskCompleted(String result);
+}
diff --git a/app/src/paid/java/com/udacity/gradle/builditbigger/MainActivityFragment.java b/app/src/paid/java/com/udacity/gradle/builditbigger/MainActivityFragment.java
@@ -1,17 +1,21 @@
 package com.udacity.gradle.builditbigger;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 
+import com.joke.JokeActivity;
 
 
 /**
  * A placeholder fragment containing a simple view.
  */
-public class MainActivityFragment extends Fragment {
+public class MainActivityFragment extends Fragment implements OnTaskCompleted{
+    Button mJokeButton;
 
     public MainActivityFragment() {
     }
@@ -20,6 +24,30 @@ public MainActivityFragment() {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        return inflater.inflate(R.layout.fragment_main, container, false);
+        View root = inflater.inflate(R.layout.fragment_main, container, false);
+
+        mJokeButton = (Button) root.findViewById(R.id.btn_joke);
+
+        mJokeButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                loadData();
+            }
+        });
+
+        return root;
+    }
+
+    public void loadData() {
+        EndpointsAsyncTask endpointsAsyncTask = new EndpointsAsyncTask(this);
+        endpointsAsyncTask.execute();
+    }
+
+    @Override
+    public void onTaskCompleted(String result) {
+        Intent intent = new Intent(getActivity(), JokeActivity.class);
+
+        intent.putExtra(JokeActivity.JOKE_KEY, result);
+        startActivity(intent);
     }
 }
diff --git a/app/src/paid/res/layout/fragment_main.xml b/app/src/paid/res/layout/fragment_main.xml
@@ -15,10 +15,10 @@
         android:text="@string/instructions" />
 
     <Button
+        android:id="@+id/btn_joke"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/instructions_text_view"
-        android:onClick="launchJokeActivity"
         android:text="@string/button_text"
 
         />