From cd6ea5e447639e0e56da8a64b8746749dba3cede Mon Sep 17 00:00:00 2001 From: alank Date: Fri, 14 Apr 2017 15:49:47 -0500 Subject: [PATCH 1/6] Initial commit --- app/.gitignore | 1 + app/build.gradle | 38 ++++ app/proguard-rules.pro | 25 +++ .../ExampleInstrumentedTest.java | 26 +++ app/src/main/AndroidManifest.xml | 24 +++ .../activity/DetailActivity.java | 204 ++++++++++++++++++ .../activity/MainActivity.java | 118 ++++++++++ .../adapter/FriendAdapter.java | 96 +++++++++ .../t2modus_android_test/api/RetrofitAPI.java | 23 ++ .../t2modus_android_test/misc/AppConst.java | 15 ++ .../t2modus_android_test/model/Friend.java | 139 ++++++++++++ .../views/CircleTransform.java | 49 +++++ .../views/SimpleDividerItemDecoration.java | 40 ++++ app/src/main/res/drawable/line_divider.xml | 11 + app/src/main/res/drawable/offline.xml | 12 ++ app/src/main/res/drawable/online.xml | 12 ++ app/src/main/res/drawable/placeholder.png | Bin 0 -> 31065 bytes app/src/main/res/layout/activity_detail.xml | 90 ++++++++ app/src/main/res/layout/activity_main.xml | 14 ++ app/src/main/res/layout/list_item.xml | 77 +++++++ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes app/src/main/res/values/colors.xml | 9 + app/src/main/res/values/strings.xml | 8 + app/src/main/res/values/styles.xml | 11 + .../t2modus_android_test/ExampleUnitTest.java | 17 ++ 29 files changed, 1059 insertions(+) create mode 100644 app/.gitignore create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/akilloren/t2modus_android_test/ExampleInstrumentedTest.java create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/adapter/FriendAdapter.java create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/api/RetrofitAPI.java create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/misc/AppConst.java create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/model/Friend.java create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/views/CircleTransform.java create mode 100644 app/src/main/java/com/akilloren/t2modus_android_test/views/SimpleDividerItemDecoration.java create mode 100644 app/src/main/res/drawable/line_divider.xml create mode 100644 app/src/main/res/drawable/offline.xml create mode 100644 app/src/main/res/drawable/online.xml create mode 100644 app/src/main/res/drawable/placeholder.png create mode 100644 app/src/main/res/layout/activity_detail.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/list_item.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 app/src/test/java/com/akilloren/t2modus_android_test/ExampleUnitTest.java diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..490af61 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,38 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 24 + buildToolsVersion "25.0.0" + defaultConfig { + applicationId "com.akilloren.t2modus_android_test" + minSdkVersion 16 + targetSdkVersion 24 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + compile 'com.android.support:design:24.2.1' + compile 'com.android.support:recyclerview-v7:24.0.0' + compile 'com.squareup.picasso:picasso:2.5.2' + compile 'com.google.code.gson:gson:2.6.1' + compile 'com.squareup.retrofit:retrofit:2.0.0-beta2' + compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2' + compile 'com.squareup.okhttp:okhttp:2.4.0' + compile 'com.android.support:cardview-v7:24.0.0' + testCompile 'junit:junit:4.12' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..8094279 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/alank/Android/Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/com/akilloren/t2modus_android_test/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/akilloren/t2modus_android_test/ExampleInstrumentedTest.java new file mode 100644 index 0000000..093d7c1 --- /dev/null +++ b/app/src/androidTest/java/com/akilloren/t2modus_android_test/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.akilloren.t2modus_android_test; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.akilloren.t2modus_android_test", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..886bf81 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java b/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java new file mode 100644 index 0000000..d5b0db2 --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java @@ -0,0 +1,204 @@ +package com.akilloren.t2modus_android_test.activity; + +import android.app.ProgressDialog; +import android.os.AsyncTask; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; +import android.widget.ImageView; +import android.widget.TextView; + +import com.akilloren.t2modus_android_test.R; +import com.akilloren.t2modus_android_test.misc.AppConst; +import com.akilloren.t2modus_android_test.model.Friend; +import com.akilloren.t2modus_android_test.views.CircleTransform; +import com.squareup.okhttp.Callback; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Response; +import com.squareup.picasso.Picasso; + +import org.json.JSONObject; + +import java.io.IOException; + +public class DetailActivity extends AppCompatActivity { + + ImageView personPhoto; + TextView personName; + TextView personStatus; + TextView personContactInfo; + TextView personBioInfo; + ProgressDialog progressDialog; + ImageView statusIndicator; + + @SuppressWarnings("ConstantConditions") + @Override + protected void onCreate(Bundle savedInstanceState) { + + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_detail); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + initViews(); + + // get id from intent and call server to get details + if (getIntent().hasExtra("id")) { + int id = getIntent().getIntExtra("id", -1); + if (id > -1) { + getFriendDetails(id); + } + } + + if (getIntent().hasExtra("status")) { + personStatus.setText(getIntent().getStringExtra("status")); + } + } + + /** + * Initialize the views used in this activity + */ + private void initViews() { + + progressDialog = new ProgressDialog(this); + personPhoto = (ImageView) findViewById(R.id.personPhoto); + personName = (TextView) findViewById(R.id.personName); + personStatus = (TextView) findViewById(R.id.personStatus); + personContactInfo = (TextView) findViewById(R.id.personContactInfo); + personBioInfo = (TextView) findViewById(R.id.personBioInfo); + statusIndicator = (ImageView) findViewById(R.id.status_indicator); + } + + /** + * Calls server API and returns details for a person - Uses OKHttpClient to save TONS of repetitive HTTP coding + * + * @param id Integer value representing the id of the person + */ + private void getFriendDetails(final int id) { + + new AsyncTask() { + + @Override + protected void onPreExecute() { + super.onPreExecute(); + showProgress(getString(R.string.text_loading)); + } + + @Override + protected Response doInBackground(String... strings) { + OkHttpClient client = new OkHttpClient(); + Response response; + Request request = new Request.Builder().url(AppConst.BASE_FRIENDS_API_URL + "/" + id).build(); + + try { + response = client.newCall(request).execute(); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + return response; + } + + @Override + protected void onPostExecute(Response response) { + super.onPostExecute(response); + hideProgress(); + + if (response != null) { + String sResponse; + try { + sResponse = response.body().string(); + + //parse JSON + parseJSON(sResponse); + + } catch (Exception e) { + e.printStackTrace(); + } + } + } + }.execute(); + } + + /** + * Helper method to parse thru returned JSON and populate Friend object + * + * @param json JSON String to parse + */ + private void parseJSON(String json) { + + try { + JSONObject jObj = new JSONObject(json); + Friend friend = new Friend(); + friend.setFirst_name(jObj.getString("first_name")); + friend.setLast_name(jObj.getString("last_name")); + friend.setImg(jObj.getString("img")); + friend.setPhone(jObj.getString("phone")); + friend.setAddress_1(jObj.getString("address_1")); + friend.setCity(jObj.getString("city")); + friend.setState(jObj.getString("state")); + friend.setZipcode(jObj.getString("zipcode")); + friend.setBio(jObj.getString("bio")); + + //update UI + updateUI(friend); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Helper method to update views with data from Friend object + * + * @param friend Friend object + */ + private void updateUI(Friend friend) { + + Picasso.with(this).load(friend.getImg()) + .transform(new CircleTransform()) + .error(R.drawable.placeholder) + .placeholder(R.drawable.placeholder) + .into(personPhoto); + personName.setText(friend.getFirst_name() + " " + friend.getLast_name()); + personContactInfo.setText(friend.getAddress_1() + + "\n" + friend.getCity() + + ", " + friend.getState().toUpperCase() + + " " + friend.getZipcode() + + "\n" + friend.getPhone()); + personBioInfo.setText(friend.getBio()); + if (friend.isAvailable()) { + statusIndicator.setImageResource(R.drawable.online); + } else { + statusIndicator.setImageResource(R.drawable.offline); + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + + if (item.getItemId() == android.R.id.home) { + finish(); + } + return super.onOptionsItemSelected(item); + } + + /** + * Show a progress dialog + * + * @param msg String message to display + */ + private void showProgress(String msg) { + + progressDialog.setMessage(msg); + progressDialog.show(); + } + + /** + * Hide progress dialog + */ + private void hideProgress() { + progressDialog.dismiss(); + } +} diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java b/app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java new file mode 100644 index 0000000..085cee3 --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java @@ -0,0 +1,118 @@ +package com.akilloren.t2modus_android_test.activity; + +import android.app.ProgressDialog; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.util.Log; +import android.widget.Toast; + +import com.akilloren.t2modus_android_test.R; +import com.akilloren.t2modus_android_test.adapter.FriendAdapter; +import com.akilloren.t2modus_android_test.api.RetrofitAPI; +import com.akilloren.t2modus_android_test.misc.AppConst; +import com.akilloren.t2modus_android_test.model.Friend; + +import java.util.List; + +import retrofit.Call; +import retrofit.Callback; +import retrofit.GsonConverterFactory; +import retrofit.Response; +import retrofit.Retrofit; + +public class MainActivity extends AppCompatActivity { + + private Call> call; + RecyclerView recyclerView; + FriendAdapter adapter; + List friends; + ProgressDialog progressDialog; + + @Override + protected void onCreate(Bundle savedInstanceState) { + + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + initViews(); + getData(); + } + + /** + * Initialize all the views that will be used in this activity + */ + private void initViews() { + + progressDialog = new ProgressDialog(this); + LinearLayoutManager llm = new LinearLayoutManager(this); + recyclerView = (RecyclerView) findViewById(R.id.recyclerView); + recyclerView.setLayoutManager(llm); + recyclerView.setHasFixedSize(true); + + //The following line can be uncommented if you are not using a CardView in the layout and just want a regular "listview" + //recyclerView.addItemDecoration(new SimpleDividerItemDecoration(getApplicationContext())); + } + + /** + * Calls server API and returns populated list from JSON - Uses Retrofit/GSON in one call + */ + private void getData() { + + Log.i(AppConst.TAG, "Getting data using Retrofit..."); + showProgress(getString(R.string.text_loading)); + + Retrofit retrofit = new Retrofit.Builder() + .baseUrl(AppConst.BASE_API_URL) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + RetrofitAPI service = retrofit.create(RetrofitAPI.class); + + call = service.getFriendList(); + call.enqueue(new Callback>() { + + @Override + public void onResponse(Response> response, Retrofit retrofit) { + hideProgress(); + friends = response.body(); + if (friends != null && friends.size() > 0) { + getAdapter(); + Log.i(AppConst.TAG, "Data received and list populated."); + } + } + + @Override + public void onFailure(Throwable t) { + hideProgress(); + Toast.makeText(MainActivity.this, "Problem occurred while retrieving data", Toast.LENGTH_SHORT).show(); + Log.e(AppConst.TAG, "Failed to receive data using Retrofit"); + } + }); + } + + /** + * Initializes the data adapter + */ + private void getAdapter() { + + adapter = new FriendAdapter(this, friends); + recyclerView.setAdapter(adapter); + } + + @Override + protected void onDestroy() { + + super.onDestroy(); + call.cancel();//cancel any calls to the server if we exit + } + + private void showProgress(String msg) { + + progressDialog.setMessage(msg); + progressDialog.show(); + } + + private void hideProgress() { + progressDialog.dismiss(); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/adapter/FriendAdapter.java b/app/src/main/java/com/akilloren/t2modus_android_test/adapter/FriendAdapter.java new file mode 100644 index 0000000..ee15c40 --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/adapter/FriendAdapter.java @@ -0,0 +1,96 @@ +package com.akilloren.t2modus_android_test.adapter; + +import android.content.Context; +import android.content.Intent; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.akilloren.t2modus_android_test.R; +import com.akilloren.t2modus_android_test.activity.DetailActivity; +import com.akilloren.t2modus_android_test.model.Friend; +import com.akilloren.t2modus_android_test.views.CircleTransform; +import com.squareup.picasso.Picasso; + +import java.util.List; + +/** + * RecyclerView adapter - holds the data for the Friends list + * + * @author alank + */ + +public class FriendAdapter extends RecyclerView.Adapter { + + private List friends; + private Context context; + + public FriendAdapter(Context context, List friends) { + this.friends = friends; + this.context = context; + } + + class FriendViewHolder extends RecyclerView.ViewHolder { + + TextView friendName; + TextView friendStatus; + ImageView friendPhoto; + ImageView statusIndicator; + View mRootView; + + FriendViewHolder(View itemView) { + super(itemView); + friendName = (TextView) itemView.findViewById(R.id.full_name); + friendStatus = (TextView) itemView.findViewById(R.id.status); + friendPhoto = (ImageView) itemView.findViewById(R.id.personimage); + statusIndicator = (ImageView) itemView.findViewById(R.id.status_indicator); + mRootView = itemView; + } + } + + @Override + public void onAttachedToRecyclerView(RecyclerView recyclerView) { + super.onAttachedToRecyclerView(recyclerView); + } + + @Override + public FriendViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { + View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.list_item, viewGroup, false); + return new FriendViewHolder(v); + } + + @Override + public void onBindViewHolder(FriendViewHolder friendViewHolder, int i) { + final Friend friend = friends.get(i); + friendViewHolder.friendName.setText(friend.getFirst_name() + " " + friend.getLast_name()); + friendViewHolder.friendStatus.setText(friend.getStatus()); + if (friend.isAvailable()) { + friendViewHolder.statusIndicator.setImageResource(R.drawable.online); + } else { + friendViewHolder.statusIndicator.setImageResource(R.drawable.offline); + } + Picasso.with(context).load(friend.getImg()) + .transform(new CircleTransform()) + .error(R.drawable.placeholder) + .placeholder(R.drawable.placeholder) + .into(friendViewHolder.friendPhoto); + + friendViewHolder.mRootView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(context, DetailActivity.class); + intent.putExtra("id", friend.getId()); + intent.putExtra("status",friend.getStatus()); + context.startActivity(intent); + } + }); + } + + @Override + public int getItemCount() { + return friends.size(); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/api/RetrofitAPI.java b/app/src/main/java/com/akilloren/t2modus_android_test/api/RetrofitAPI.java new file mode 100644 index 0000000..337d880 --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/api/RetrofitAPI.java @@ -0,0 +1,23 @@ +package com.akilloren.t2modus_android_test.api; + + +import com.akilloren.t2modus_android_test.model.Friend; + +import java.util.List; + +import retrofit.Call; +import retrofit.http.GET; + +/** + * The Retrofit interface and endpoint definintions + * @author alank + */ + +public interface RetrofitAPI { + + @GET("friends") + Call> getFriendList(); + + //add more endpoints/calls here + +} \ No newline at end of file diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/misc/AppConst.java b/app/src/main/java/com/akilloren/t2modus_android_test/misc/AppConst.java new file mode 100644 index 0000000..4896f84 --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/misc/AppConst.java @@ -0,0 +1,15 @@ +package com.akilloren.t2modus_android_test.misc; + +/** + * Miscellaneous constants + * + * @author alank + */ + +public class AppConst { + + public static String TAG = "T2ModusTest"; + public static String BASE_API_URL = "https://private-c1b9f-t2mobile.apiary-mock.com"; + public static String BASE_FRIENDS_API_URL = BASE_API_URL+ "/friends"; + +} diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/model/Friend.java b/app/src/main/java/com/akilloren/t2modus_android_test/model/Friend.java new file mode 100644 index 0000000..38b40a6 --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/model/Friend.java @@ -0,0 +1,139 @@ +package com.akilloren.t2modus_android_test.model; + +import java.util.List; + +/** + * Friend data object + * + * @author alank + */ + +public class Friend { + + private int id; + private String img; + private String first_name; + private String last_name; + private String status; + private boolean available; + private String phone; + private String address_1; + private String city; + private String state; + private String zipcode; + private String bio; + private List photos; + private List statuses; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public String getFirst_name() { + return first_name; + } + + public void setFirst_name(String first_name) { + this.first_name = first_name; + } + + public String getLast_name() { + return last_name; + } + + public void setLast_name(String last_name) { + this.last_name = last_name; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public boolean isAvailable() { + return available; + } + + public void setAvailable(boolean available) { + this.available = available; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getAddress_1() { + return address_1; + } + + public void setAddress_1(String address_1) { + this.address_1 = address_1; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getZipcode() { + return zipcode; + } + + public void setZipcode(String zipcode) { + this.zipcode = zipcode; + } + + public String getBio() { + return bio; + } + + public void setBio(String bio) { + this.bio = bio; + } + + public List getPhotos() { + return photos; + } + + public void setPhotos(List photos) { + this.photos = photos; + } + + public List getStatuses() { + return statuses; + } + + public void setStatuses(List statuses) { + this.statuses = statuses; + } +} diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/views/CircleTransform.java b/app/src/main/java/com/akilloren/t2modus_android_test/views/CircleTransform.java new file mode 100644 index 0000000..e1ac28b --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/views/CircleTransform.java @@ -0,0 +1,49 @@ +package com.akilloren.t2modus_android_test.views; + +import android.graphics.Bitmap; +import android.graphics.BitmapShader; +import android.graphics.Canvas; +import android.graphics.Paint; + +import com.squareup.picasso.Transformation; + +/** + * Creates a round image from a bitmap (for Picasso) + * + * @author alank + */ + +public class CircleTransform implements Transformation { + @Override + public Bitmap transform(Bitmap source) { + int size = Math.min(source.getWidth(), source.getHeight()); + + int x = (source.getWidth() - size) / 2; + int y = (source.getHeight() - size) / 2; + + Bitmap squaredBitmap = Bitmap.createBitmap(source, x, y, size, size); + if (squaredBitmap != source) { + source.recycle(); + } + + Bitmap bitmap = Bitmap.createBitmap(size, size, source.getConfig()); + + Canvas canvas = new Canvas(bitmap); + Paint paint = new Paint(); + BitmapShader shader = new BitmapShader(squaredBitmap, + BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP); + paint.setShader(shader); + paint.setAntiAlias(true); + + float r = size / 2f; + canvas.drawCircle(r, r, r, paint); + + squaredBitmap.recycle(); + return bitmap; + } + + @Override + public String key() { + return "circle"; + } +} diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/views/SimpleDividerItemDecoration.java b/app/src/main/java/com/akilloren/t2modus_android_test/views/SimpleDividerItemDecoration.java new file mode 100644 index 0000000..8bab6f8 --- /dev/null +++ b/app/src/main/java/com/akilloren/t2modus_android_test/views/SimpleDividerItemDecoration.java @@ -0,0 +1,40 @@ +package com.akilloren.t2modus_android_test.views; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.drawable.Drawable; +import android.support.v7.widget.RecyclerView; +import android.view.View; + +import com.akilloren.t2modus_android_test.R; + +/** + * Created by alank on 4/14/17. + */ + +public class SimpleDividerItemDecoration extends RecyclerView.ItemDecoration { + private Drawable mDivider; + + public SimpleDividerItemDecoration(Context context) { + mDivider = context.getResources().getDrawable(R.drawable.line_divider); + } + + @Override + public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) { + int left = parent.getPaddingLeft(); + int right = parent.getWidth() - parent.getPaddingRight(); + + int childCount = parent.getChildCount(); + for (int i = 0; i < childCount; i++) { + View child = parent.getChildAt(i); + + RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); + + int top = child.getBottom() + params.bottomMargin; + int bottom = top + mDivider.getIntrinsicHeight(); + + mDivider.setBounds(left, top, right, bottom); + mDivider.draw(c); + } + } +} diff --git a/app/src/main/res/drawable/line_divider.xml b/app/src/main/res/drawable/line_divider.xml new file mode 100644 index 0000000..fc4aca7 --- /dev/null +++ b/app/src/main/res/drawable/line_divider.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/offline.xml b/app/src/main/res/drawable/offline.xml new file mode 100644 index 0000000..32635da --- /dev/null +++ b/app/src/main/res/drawable/offline.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/online.xml b/app/src/main/res/drawable/online.xml new file mode 100644 index 0000000..acbf92b --- /dev/null +++ b/app/src/main/res/drawable/online.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/placeholder.png b/app/src/main/res/drawable/placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..b51fd2a6cd272baa9df6adbe78c20488295a2432 GIT binary patch literal 31065 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml new file mode 100644 index 0000000..57789af --- /dev/null +++ b/app/src/main/res/layout/activity_detail.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..5574ab6 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml new file mode 100644 index 0000000..e52ac28 --- /dev/null +++ b/app/src/main/res/layout/list_item.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c GIT binary patch literal 3418 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d GIT binary patch literal 4842 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7 GIT binary patch literal 7718 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..aee44e138434630332d88b1680f33c4b24c70ab3 GIT binary patch literal 10486 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 + + #3F51B5 + #303F9F + #FF4081 + #cccccc + #1f9b06 + #cc1010 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..1f54bff --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + T2 Modus Android Test + + Loading... + Contact Info + Bio + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/com/akilloren/t2modus_android_test/ExampleUnitTest.java b/app/src/test/java/com/akilloren/t2modus_android_test/ExampleUnitTest.java new file mode 100644 index 0000000..5fe0e2e --- /dev/null +++ b/app/src/test/java/com/akilloren/t2modus_android_test/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.akilloren.t2modus_android_test; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file From fa85cf086c6aaa091afe57c4d1865958f63bf036 Mon Sep 17 00:00:00 2001 From: alank Date: Fri, 14 Apr 2017 16:00:41 -0500 Subject: [PATCH 2/6] Fixed version # issue with appcompat library --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 490af61..19b6dda 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,12 +27,12 @@ dependencies { compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' compile 'com.android.support:design:24.2.1' - compile 'com.android.support:recyclerview-v7:24.0.0' + compile 'com.android.support:recyclerview-v7:24.2.1' compile 'com.squareup.picasso:picasso:2.5.2' compile 'com.google.code.gson:gson:2.6.1' compile 'com.squareup.retrofit:retrofit:2.0.0-beta2' compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2' compile 'com.squareup.okhttp:okhttp:2.4.0' - compile 'com.android.support:cardview-v7:24.0.0' + compile 'com.android.support:cardview-v7:24.2.1' testCompile 'junit:junit:4.12' } From 8811f1d029444c494527273a4643887cc31b0e92 Mon Sep 17 00:00:00 2001 From: alank Date: Fri, 14 Apr 2017 16:05:12 -0500 Subject: [PATCH 3/6] Added available status to friend object --- .../akilloren/t2modus_android_test/activity/DetailActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java b/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java index d5b0db2..9e41e15 100644 --- a/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java +++ b/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java @@ -140,6 +140,7 @@ private void parseJSON(String json) { friend.setState(jObj.getString("state")); friend.setZipcode(jObj.getString("zipcode")); friend.setBio(jObj.getString("bio")); + friend.setAvailable(jObj.getBoolean("available")); //update UI updateUI(friend); From d3a988ab6bc430f050ed7a334ec07be999cf05ab Mon Sep 17 00:00:00 2001 From: alank Date: Fri, 14 Apr 2017 16:23:07 -0500 Subject: [PATCH 4/6] Account for screen orientation changes --- app/src/main/AndroidManifest.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 886bf81..069b508 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,14 +10,18 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - + - + From 7a7dd65baa69edf94f4bceb9cfbdad98e4269022 Mon Sep 17 00:00:00 2001 From: alank Date: Fri, 14 Apr 2017 16:28:02 -0500 Subject: [PATCH 5/6] Some minor code cleanup --- .../activity/DetailActivity.java | 15 ++++++++------- .../activity/MainActivity.java | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java b/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java index 9e41e15..a86b65d 100644 --- a/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java +++ b/app/src/main/java/com/akilloren/t2modus_android_test/activity/DetailActivity.java @@ -24,13 +24,13 @@ public class DetailActivity extends AppCompatActivity { - ImageView personPhoto; - TextView personName; - TextView personStatus; - TextView personContactInfo; - TextView personBioInfo; - ProgressDialog progressDialog; - ImageView statusIndicator; + private ImageView personPhoto; + private TextView personName; + private TextView personStatus; + private TextView personContactInfo; + private TextView personBioInfo; + private ProgressDialog progressDialog; + private ImageView statusIndicator; @SuppressWarnings("ConstantConditions") @Override @@ -51,6 +51,7 @@ protected void onCreate(Bundle savedInstanceState) { } } + //get passed in status text for display since we don't get it from the details if (getIntent().hasExtra("status")) { personStatus.setText(getIntent().getStringExtra("status")); } diff --git a/app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java b/app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java index 085cee3..0c8fefd 100644 --- a/app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java +++ b/app/src/main/java/com/akilloren/t2modus_android_test/activity/MainActivity.java @@ -25,10 +25,10 @@ public class MainActivity extends AppCompatActivity { private Call> call; - RecyclerView recyclerView; - FriendAdapter adapter; - List friends; - ProgressDialog progressDialog; + private RecyclerView recyclerView; + private FriendAdapter adapter; + private List friends; + private ProgressDialog progressDialog; @Override protected void onCreate(Bundle savedInstanceState) { From 46c21aec8af52642c098ecf3daafd5191d515418 Mon Sep 17 00:00:00 2001 From: alank Date: Fri, 14 Apr 2017 21:30:26 -0500 Subject: [PATCH 6/6] Minor spacing adjustments --- app/src/main/res/layout/activity_detail.xml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml index 57789af..cfbfd7f 100644 --- a/app/src/main/res/layout/activity_detail.xml +++ b/app/src/main/res/layout/activity_detail.xml @@ -10,10 +10,10 @@ + android:layout_marginLeft="15dp" + android:orientation="vertical"> + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp"/> + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp"/>