From 50056be4e97a80abb3218329646d4a33008916f5 Mon Sep 17 00:00:00 2001 From: Nathan Meade Date: Thu, 20 Jun 2019 13:34:07 -0400 Subject: [PATCH] Butterknife added and RecipeRepository deleted. --- .idea/misc.xml | 2 +- app/build.gradle | 6 ++ .../android/bakingapp/MainActivity.java | 15 ++- .../android/bakingapp/RecipeRepository.java | 96 ------------------- app/src/main/res/values/strings.xml | 1 + 5 files changed, 15 insertions(+), 105 deletions(-) delete mode 100644 app/src/main/java/com/example/android/bakingapp/RecipeRepository.java diff --git a/.idea/misc.xml b/.idea/misc.xml index af0bbdd..703e5d4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 06e8193..ff880b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,6 +16,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility = '1.8' + targetCompatibility = '1.8' + } } dependencies { @@ -28,4 +32,6 @@ dependencies { androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.jakewharton:butterknife:8.8.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' } diff --git a/app/src/main/java/com/example/android/bakingapp/MainActivity.java b/app/src/main/java/com/example/android/bakingapp/MainActivity.java index d565171..5332904 100644 --- a/app/src/main/java/com/example/android/bakingapp/MainActivity.java +++ b/app/src/main/java/com/example/android/bakingapp/MainActivity.java @@ -19,6 +19,9 @@ import java.util.ArrayList; import java.util.List; +import butterknife.BindString; +import butterknife.BindView; +import butterknife.ButterKnife; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -26,30 +29,26 @@ import retrofit2.converter.gson.GsonConverterFactory; public class MainActivity extends AppCompatActivity implements RecyclerViewAdapter.RecyclerViewAdapterOnClickHandler { - //private TextView textViewResult; private static final String LOG_TAG = "nathanTest"; - private RecyclerView recyclerView; + @BindView(R.id.recycler_view) RecyclerView recyclerView; private RecyclerViewAdapter recyclerViewAdapter; private RecyclerViewAdapter.RecyclerViewAdapterOnClickHandler clickHandler; - + @BindString(R.string.base_url) String baseUrl; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + ButterKnife.bind(this); clickHandler = this; - recyclerView = findViewById(R.id.recycler_view); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this); recyclerView.setLayoutManager(linearLayoutManager); - //recyclerView.setHasFixedSize(true); - //textViewResult = findViewById(R.id.text_view_result); - RecipeRepository recipeRepository = new RecipeRepository(); getJsonParsed(); } public void getJsonParsed(){ Retrofit retrofit = new Retrofit.Builder() - .baseUrl("https://d17h27t6h515a5.cloudfront.net/") + .baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create()) .build(); JsonPlaceHolderApi jsonPlaceHolderApi = retrofit.create(JsonPlaceHolderApi.class); diff --git a/app/src/main/java/com/example/android/bakingapp/RecipeRepository.java b/app/src/main/java/com/example/android/bakingapp/RecipeRepository.java deleted file mode 100644 index be22f71..0000000 --- a/app/src/main/java/com/example/android/bakingapp/RecipeRepository.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.example.android.bakingapp; - -import android.util.Log; -import android.widget.TextView; - -import java.util.ArrayList; -import java.util.List; - -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; - -public class RecipeRepository { - - private String content; - private String contentToReturn; - - private static final String LOG_TAG = "nathanTest"; - - public String getJsonParsed(){ - //contentToReturn = ""; - Log.d(LOG_TAG, "start of getJsonParsed"); - Retrofit retrofit = new Retrofit.Builder() - .baseUrl("https://d17h27t6h515a5.cloudfront.net/") - .addConverterFactory(GsonConverterFactory.create()) - .build(); - - JsonPlaceHolderApi jsonPlaceHolderApi = retrofit.create(JsonPlaceHolderApi.class); - - Call> call = jsonPlaceHolderApi.getRecipe(); - - Log.d(LOG_TAG, "before enqueue"); - call.enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - - if (!response.isSuccessful()){ - //textViewResult.setText("Code: " + response.code()); - return; - } - - List recipes = response.body(); - - for (Recipe recipe : recipes) { - content = ""; - content += "ID: " + recipe.getId() + "\n"; - //Log.d(LOG_TAG, recipe.getText()); - Log.d(LOG_TAG, content); - content += "Text: " + recipe.getText() + "\n"; - content += "Servings: " + recipe.getServings() + "\n"; - content += "Image: " + recipe.getImage() + "\n\n"; -/* JSONArray jsonArray = recipe.getIngredients(); - try { - JSONObject jsonObject = (JSONObject) jsonArray.get(0); - content += jsonObject.get("measure"); - } catch (JSONException e) { - e.printStackTrace(); - }*/ - content += "Ingredients:\n"; - ArrayList ingredients = recipe.getIngredients(); - for (Ingredient ingredient : ingredients ){ - content += "Quantity: " + ingredient.getQuantity() + "\n"; - content += "Measure: " + ingredient.getMeasure() + "\n"; - content += "Ingredient: " + ingredient.getIngredient() + "\n\n"; - } - - content += "Steps:\n"; - ArrayList steps = recipe.getSteps(); - for (Step step : steps ){ - content += "ID: " + step.getId() + "\n"; - content += "Short Description: " + step.getShortDescription() + "\n"; - content += "Description: " + step.getDescription() + "\n"; - content += "Video URL: " + step.getVideoURL() + "\n"; - content += "Thumbnail: " + step.getThumbnailURL() + "\n\n"; - } - contentToReturn += content; - //Log.d(LOG_TAG, "contentToReturn: " + contentToReturn); - //textViewResult.append(content); - } - - //Log.d(LOG_TAG, "contentToReturn: " + contentToReturn); - } - - @Override - public void onFailure(Call> call, Throwable t) { - //textViewResult.setText(t.getMessage()); - } - }); - Log.d(LOG_TAG, "contentToReturn: " + contentToReturn); - return contentToReturn; - } - -} - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 740cc98..c11178d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ Baking App + https://d17h27t6h515a5.cloudfront.net/