diff --git a/readme.md b/readme.md index 895391c..239eb35 100644 --- a/readme.md +++ b/readme.md @@ -5,67 +5,69 @@ # ![](https://ga-dash.s3.amazonaws.com/production/assets/logo-9f88ae6c9c3871690e33280fcf557f33.png) Usability Testing Lab -## Exercise +## USER Testing -You'll be running your own usability test and use the results of this test to give you guidance as you iterate on an application. + Can you click the items on the list? -This lab is to be done in pairs. Using the starter code provided, pairs should run the app on a handset and on a tablet. One of the students will facilitate the test and write down the questions about UX/UI aspects of the app. The other student will be the "tester" and test the app. + What happens when you click the items -The person who is interviewing should create a list of features he/she will ask the other person to test, step by step. When the list is ready and all the comments are put down, the team will work to improve the app using the comments and feedback from the interview. + Is the list scrollable? -#### Requirements + How does the app show in landscape? -This lab is broken down into two parts: one part for preparing and testing the application and one part to act on the feedback from the test. Take note of the suggested timing breakdowns and try note to look at part two until part one is complete. + The list is saved and the list still works (no change) -##### Part One: Testing + What happens when you press back ? -*Before testing:* -Steps for the person who will interview: -- create a list of all the necessary features to test (5 mins) -- create a list of all the steps to ask the other person to perform (5 mins) -Steps for the person who will test: -- while the other person is writing down the questions, create a list of potential use cases of the app (5 mins) -- create a list of additional features to be added (5 mins). +###JACKIE + 1. Did you find it easy to open the app? -*While testing:* -- the person who tests the app should test every button, view and corner of the app, the other one should write down the comments -- the person who tests the app should suggest ways to improve the app, the other one should put the suggestions down + App crashed when clicked on item in emulator -##### Part Two: Coding to improve the app + 2. Did you find it easy to view and read? + would've expected information to be within the app and not take you to google chrome. -(You should have come up with these improvements during the test!) + Also when you hit the back button from Chrome the app is blank -- the app should support tablets and handsets -- when the item in the listVew is clicked, the app should open the weblink with information about the clicked sign + There's no point to download the app if it takes you to the webview + also there's the dates pertaining to what zodiac sign you match with. -#### Starter code + Add a calendar or edit text field to check your zodiac by your birthday -Grab [starter code](starter-code/UsabilityTestingStarterCode) and import it into Android Studio. + Add things to the app like images or action bar. -Included in this lab are the following: -* Two activities: **Main Activity** and **Deatils Activity**. - * Main Activity is an empty activity. It does not require any code added. Your task is to add a new layout for tablet devices. - * Details Activity should send an implicit intent to bring up a webView and open a link with the information about the corresponding - horoscope sign. -* Two fragments: **List Fragment** and **Details Fragment**. -These are the classes that require most of the work done. In the imported project you will find TODO: to finish. + 3. How does the app make you feel? -* Three layout file: **activity_main.xml**, **fragment_layout**, **details_activity_layout.xml**. -You have to add **details_fragment_layout.xml** and **activity_main.xml(large)**. -#### Deliverable + 4. Would you download this app? -An Android app that follows the requirements above. There are no design requirements; feel free to play around with color, font, backgrounds, etc. -Post the project on GitHub. Ensure that the project builds and runs successfully. + 5. Would you recommend this app to a friend? + +6. What would you change ? +###Rob +1. Did you find it easy to open the app? + + +2. Did you find it easy to view and read? + wouldve expected information to be within the app and not take you to google chrome. + + Also when you hit the back button from Chrome the app is blank + + + +3. How does the app make you feel? + + +4. Would you download this app? + + +5. Would you recommend this app to a friend? -

- -

If you're having a lot of trouble, feel free to peek at the [solution](solution-code). diff --git a/starter-code/UsabilityTestingStarterCode/.idea/.name b/starter-code/UsabilityTestingStarterCode/.idea/.name new file mode 100644 index 0000000..b73298b --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/.name @@ -0,0 +1 @@ +UsabilityTestingStarterCode \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/.idea/compiler.xml b/starter-code/UsabilityTestingStarterCode/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/.idea/copyright/profiles_settings.xml b/starter-code/UsabilityTestingStarterCode/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/.idea/gradle.xml b/starter-code/UsabilityTestingStarterCode/.idea/gradle.xml new file mode 100644 index 0000000..8d2df47 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/.idea/misc.xml b/starter-code/UsabilityTestingStarterCode/.idea/misc.xml new file mode 100644 index 0000000..7158618 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/misc.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/.idea/modules.xml b/starter-code/UsabilityTestingStarterCode/.idea/modules.xml new file mode 100644 index 0000000..dcdc2a6 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/.idea/runConfigurations.xml b/starter-code/UsabilityTestingStarterCode/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/.idea/vcs.xml b/starter-code/UsabilityTestingStarterCode/.idea/vcs.xml new file mode 100644 index 0000000..6564d52 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsActivity.java b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsActivity.java index 1ef7c89..0f8ab60 100644 --- a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsActivity.java +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsActivity.java @@ -1,13 +1,19 @@ package generalassembly.yuliyakaleda.usabilitytestingstartercode; import android.content.Intent; +import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.view.KeyEvent; +import android.webkit.WebView; +import android.webkit.WebViewClient; public class DetailsActivity extends AppCompatActivity { - private static final String SIGN = "sign"; + public static final String SIGN = "sign"; + + WebView mWebView; @Override public void onCreate(Bundle savedInstanceState) { @@ -18,9 +24,21 @@ public void onCreate(Bundle savedInstanceState) { String sign = " "; if (extras != null) { - sign = extras.getString(SIGN); - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.horoscopedates.com/zodiac-signs/" + sign + "/")); - startActivity(browserIntent); + sign = extras.getString(SIGN).toLowerCase(); + mWebView=(WebView)findViewById(R.id.webView); + mWebView.setWebViewClient(new MyWebClient()); + mWebView.getSettings().setJavaScriptEnabled(true); + mWebView.loadUrl(String.valueOf(Uri.parse("http://www.horoscopedates.com/zodiac-signs/" + sign + "/"))); + } + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if((keyCode==KeyEvent.KEYCODE_BACK) && mWebView.canGoBack()) { + mWebView.goBack(); + return true; + } + return super.onKeyDown(keyCode,event); } } diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsFragment.java b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsFragment.java index d497002..f0332f5 100644 --- a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsFragment.java +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/DetailsFragment.java @@ -1,26 +1,67 @@ package generalassembly.yuliyakaleda.usabilitytestingstartercode; import android.content.Intent; +import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.webkit.WebView; +import android.webkit.WebViewClient; + +import static generalassembly.yuliyakaleda.usabilitytestingstartercode.DetailsActivity.*; public class DetailsFragment extends Fragment{ + WebView webView; @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View view= inflater.inflate(R.layout.details_fragment,container,false); + WebView webView= (WebView)view.findViewById(R.id.webViewFragment); + Bundle bundle1= this.getArguments(); + if(bundle1!=null && bundle1.getString("sign")!=null) { + String myString= bundle1.getString("sign").toLowerCase(); + webView.getSettings().setJavaScriptEnabled(true); + webView.setWebViewClient(new MyWebClient()); + webView.loadUrl(String.valueOf(Uri.parse("http://www.horoscopedates.com/zodiac-signs/" + myString + "/"))); + } +// webView.setWebViewClient(new WebViewClient() { +// @Override +// public boolean shouldOverrideUrlLoading(WebView view, String url) { +// view.loadUrl(url); +// return true; +// } +// }); +// webView.setWebViewClient(new WebViewClient()); + //TODO: Inflate the view and change the return type; - return null; + return view; } public void updateContent(String sign) { + // TODO: Finish the method which will open a webview and redirect the user to the website // TODO: to read about the sign that was clicked in the ListView } -} +// public class myWebClient extends WebViewClient { +// @Override +// public void onPageStarted(WebView view, String url, Bitmap favicon) { +// super.onPageStarted(view, url, favicon); +// } +// +// @Override +// public boolean shouldOverrideUrlLoading(WebView view, String url) { +// view.loadUrl(url); +// return true; +// +// } +// } + + } + diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/ListFragment.java b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/ListFragment.java index 9644f16..81b57c5 100644 --- a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/ListFragment.java +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/ListFragment.java @@ -1,36 +1,68 @@ package generalassembly.yuliyakaleda.usabilitytestingstartercode; +import android.app.Activity; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import android.widget.TextView; + +import java.util.ArrayList; public class ListFragment extends Fragment { private static final String SIGN = "sign"; private ListView listView; + OnSymbolSelectedListener mCallback; + @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_layout, container, false); listView = (ListView) view.findViewById(R.id.list_view); + return view; } + public interface OnSymbolSelectedListener{ + public void onSymbolSelected(String symbol); + } - @Override + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try{ + mCallback= (OnSymbolSelectedListener)activity; + }catch (ClassCastException e){ + throw new ClassCastException(activity.toString()+ "must implement OnSymbolSelected"); + } + } + + @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); String[] values = getResources().getStringArray(R.array.signs); - ArrayAdapter adapter = new ArrayAdapter<>(getActivity(), - android.R.layout.simple_list_item_1, android.R.id.text1, values); - listView.setAdapter(adapter); + String[] birthdays = {"1/11-2/19","2/20-3/20","3/21-4/20","4/21-5/21","5/22-6/21", "6/22-7/22","7/23-8/23","8/24-9/23","9/24-10/23","10/24-11/22","11/23-12/21","12/22-1/20"}; + +// ArrayAdapter adapter = new ArrayAdapter<>(getActivity(), +// R.layout.zodiac_list_layout, R.id.zodiac_name, values); + ArrayList zodiacArrayList = new ArrayList<>(); + for (int i = 0; i parent, View view, int position, long id) { - String itemValue = (String) listView.getItemAtPosition(position); - Intent intent = new Intent(getActivity(), DetailsActivity.class); - intent.putExtra(SIGN, itemValue); - startActivity(intent); - } - }); - } -} + // String itemValue = (String) listView.getItemAtPosition(position); + TextView zodiacText = (TextView) view.findViewById(R.id.zodiac_name); + String itemValue = zodiacText.getText().toString(); + mCallback.onSymbolSelected(itemValue); +// if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { +// Intent intent = new Intent(getActivity(), DetailsActivity.class); +// intent.putExtra(SIGN, itemValue); +// startActivity(intent); +// }else { +// FragmentManager fragmentManager = getFragmentManager(); +// DetailsFragment detailsFragment = new DetailsFragment(); +// Bundle bundle = new Bundle(); +// bundle.putString("sign", itemValue); +// detailsFragment.setArguments(bundle); +// FragmentTransaction fragmentTransaction1 = fragmentManager.beginTransaction(); +// fragmentTransaction1.add(R.id.fragment_container1, detailsFragment); +// fragmentTransaction1.commit(); +// } + } + }); +}} diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/MainActivity.java b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/MainActivity.java index 15a8821..3425308 100644 --- a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/MainActivity.java +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/MainActivity.java @@ -1,10 +1,14 @@ package generalassembly.yuliyakaleda.usabilitytestingstartercode; +import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity implements ListFragment.OnSymbolSelectedListener { + @Override protected void onCreate(Bundle savedInstanceState) { @@ -12,5 +16,36 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); //TODO: Create a separate layout xml file for tablet devices. + + final FragmentManager fragmentManager = getSupportFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + + ListFragment listFragment = new ListFragment(); + fragmentTransaction.add(R.id.fragment_list, listFragment); + + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { + DetailsFragment detailsFragment = new DetailsFragment(); + fragmentTransaction.add(R.id.fragment_details_webview, detailsFragment); + } + fragmentTransaction.commit(); + + } + + @Override + public void onSymbolSelected(String symbol) { + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + Intent intent = new Intent(this, DetailsActivity.class); + intent.putExtra(DetailsActivity.SIGN, symbol); + startActivity(intent); + }else { + FragmentManager fragmentManager = getSupportFragmentManager(); + DetailsFragment detailsFragment = new DetailsFragment(); + Bundle bundle = new Bundle(); + bundle.putString("sign", symbol); + detailsFragment.setArguments(bundle); + FragmentTransaction fragmentTransaction1 = fragmentManager.beginTransaction(); + fragmentTransaction1.add(R.id.fragment_details_webview, detailsFragment); + fragmentTransaction1.commit(); + } } } diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/MyWebClient.java b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/MyWebClient.java new file mode 100644 index 0000000..8a4f897 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/MyWebClient.java @@ -0,0 +1,22 @@ +package generalassembly.yuliyakaleda.usabilitytestingstartercode; + +import android.graphics.Bitmap; +import android.webkit.WebView; +import android.webkit.WebViewClient; + +/** + * Created by Ra on 2/18/16. + */ +public class MyWebClient extends WebViewClient { + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + } + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return true; + + } +} diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/Zodiac.java b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/Zodiac.java new file mode 100644 index 0000000..064158c --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/Zodiac.java @@ -0,0 +1,22 @@ +package generalassembly.yuliyakaleda.usabilitytestingstartercode; + +/** + * Created by Ra on 2/19/16. + */ +public class Zodiac { + private String mName; + private String mBirthdayRange; + + public Zodiac(String zodiacName, String birthday){ + mName = zodiacName; + mBirthdayRange = birthday; + } + + public String getmName() { + return mName; + } + + public String getmBirthdayRange() { + return mBirthdayRange; + } +} diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/ZodiacArrayAdapter.java b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/ZodiacArrayAdapter.java new file mode 100644 index 0000000..a65da4b --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/java/generalassembly/yuliyakaleda/usabilitytestingstartercode/ZodiacArrayAdapter.java @@ -0,0 +1,91 @@ +package generalassembly.yuliyakaleda.usabilitytestingstartercode; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import java.util.ArrayList; + +/** + * Created by Ra on 2/19/16. + */ +public class ZodiacArrayAdapter extends ArrayAdapter { + private ArrayList zodiacList; + private Context context; + + public ZodiacArrayAdapter(Context context, ArrayList zodiacArrayList) { + super(context, -1); + zodiacList = zodiacArrayList; + this.context = context; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + + LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View zodiacLayout = layoutInflater.inflate(R.layout.zodiac_list_layout, parent, false); + + ImageView zodiacImage = (ImageView) zodiacLayout.findViewById(R.id.zodiac_image); + TextView zodiacName = (TextView) zodiacLayout.findViewById(R.id.zodiac_name); + TextView zodiacBirthday = (TextView) zodiacLayout.findViewById(R.id.birthday_range); + + String name = zodiacList.get(position).getmName(); + String birthday = zodiacList.get(position).getmBirthdayRange(); + + + + switch (name) { + case "aries": + zodiacImage.setImageResource(R.drawable.aries); + break; + case "taurus": + zodiacImage.setImageResource(R.drawable.taurus); + break; + case "gemini": + zodiacImage.setImageResource(R.drawable.gemini); + break; + case "cancer": + zodiacImage.setImageResource(R.drawable.cancer); + break; + case "leo": + zodiacImage.setImageResource(R.drawable.leo); + break; + case "virgo": + zodiacImage.setImageResource(R.drawable.virgo); + break; + case "libra": + zodiacImage.setImageResource(R.drawable.libra); + break; + case "scorpio": + zodiacImage.setImageResource(R.drawable.scorpio); + break; + case "sagittarius": + zodiacImage.setImageResource(R.drawable.sagittarius); + break; + case "capricorn": + zodiacImage.setImageResource(R.drawable.capricorn); + break; + case "aquarius": + zodiacImage.setImageResource(R.drawable.aquarius); + break; + case "pisces": + zodiacImage.setImageResource(R.drawable.pisces); + break; + } + + name = name.substring(0,1).toUpperCase() + name.substring(1); + + zodiacName.setText(name); + zodiacBirthday.setText(birthday); + return zodiacLayout; + } + + @Override + public int getCount() { + return zodiacList.size(); + } +} \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/aquarius.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/aquarius.png new file mode 100644 index 0000000..600a438 Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/aquarius.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/aries.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/aries.png new file mode 100644 index 0000000..660c2d7 Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/aries.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/cancer.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/cancer.png new file mode 100644 index 0000000..eadab29 Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/cancer.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/capricorn.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/capricorn.png new file mode 100644 index 0000000..5321e46 Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/capricorn.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/gemini.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/gemini.png new file mode 100644 index 0000000..795e79f Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/gemini.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/leo.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/leo.png new file mode 100644 index 0000000..a5b178d Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/leo.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/libra.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/libra.png new file mode 100644 index 0000000..684b42e Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/libra.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/pisces.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/pisces.png new file mode 100644 index 0000000..9e71098 Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/pisces.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/sagittarius.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/sagittarius.png new file mode 100644 index 0000000..3b234c7 Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/sagittarius.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/scorpio.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/scorpio.png new file mode 100644 index 0000000..8f405d5 Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/scorpio.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/taurus.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/taurus.png new file mode 100644 index 0000000..e8e4ced Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/taurus.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/virgo.png b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/virgo.png new file mode 100644 index 0000000..fd6f20d Binary files /dev/null and b/starter-code/UsabilityTestingStarterCode/app/src/main/res/drawable/virgo.png differ diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout-land/activity_main.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 0000000..366cfc9 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,25 @@ + + + ​ + + + + + + + + ​ + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout-land/fragment_layout.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout-land/fragment_layout.xml new file mode 100644 index 0000000..aee57a9 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout-land/fragment_layout.xml @@ -0,0 +1,19 @@ + + + ​ + + + ​ + + ​ + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/activity_main.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/activity_main.xml index 473c8d9..dd4391e 100644 --- a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/activity_main.xml +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/activity_main.xml @@ -3,9 +3,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="match_parent"> + + + + ​ \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/details_activity_layout.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/details_activity_layout.xml index d829e29..69d085b 100644 --- a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/details_activity_layout.xml +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/details_activity_layout.xml @@ -4,4 +4,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/details_fragment.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/details_fragment.xml new file mode 100644 index 0000000..854fe34 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/details_fragment.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/fragment_layout.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/fragment_layout.xml index 7514570..aee57a9 100644 --- a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/fragment_layout.xml +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/fragment_layout.xml @@ -1,13 +1,19 @@ - - + ​ + android:layout_width="250dp" + android:layout_height="match_parent" + android:layout_alignParentStart="true"> - - \ No newline at end of file + ​ + + ​ + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/zodiac_list_custom_layout.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/zodiac_list_custom_layout.xml new file mode 100644 index 0000000..3516823 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/zodiac_list_custom_layout.xml @@ -0,0 +1,38 @@ + + + ​ + + ​ + + + + ​ + ​ + \ No newline at end of file diff --git a/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/zodiac_list_layout.xml b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/zodiac_list_layout.xml new file mode 100644 index 0000000..3516823 --- /dev/null +++ b/starter-code/UsabilityTestingStarterCode/app/src/main/res/layout/zodiac_list_layout.xml @@ -0,0 +1,38 @@ + + + ​ + + ​ + + + + ​ + ​ + \ No newline at end of file