Skip to content

Commit 8f55032

Browse files
moezbhattimoezbhatti
committed
Mentors card will display available contact options
1 parent 2936266 commit 8f55032

File tree

10 files changed

+73
-34
lines changed

10 files changed

+73
-34
lines changed

‎android/src/main/java/com/hackthenorth/android/model/Mentor.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ public class Mentor extends Model implements FuzzySearchIndexer.Tokened, Compara
1818
public String organization;
1919
public ArrayList<ArrayList<String>> availability;
2020
public ArrayList<String> skills;
21+
public String email;
22+
public String twitter;
23+
public String github;
24+
public String phone;
2125

2226
public Mentor() {
2327
}

‎android/src/main/java/com/hackthenorth/android/ui/MainActivity.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,25 @@
1212
import android.support.v4.view.ViewPager;
1313
import android.text.Editable;
1414
import android.text.TextWatcher;
15-
import android.util.Log;
1615
import android.view.KeyEvent;
1716
import android.view.LayoutInflater;
1817
import android.view.Menu;
1918
import android.view.MenuInflater;
2019
import android.view.MenuItem;
2120
import android.view.MotionEvent;
2221
import android.view.View;
23-
import android.view.ViewGroup;
2422
import android.view.ViewTreeObserver;
25-
import android.view.WindowManager;
2623
import android.view.animation.AccelerateDecelerateInterpolator;
2724
import android.view.animation.AccelerateInterpolator;
2825
import android.view.animation.AlphaAnimation;
2926
import android.view.animation.Animation;
3027
import android.view.animation.Animation.AnimationListener;
3128
import android.view.animation.AnimationSet;
3229
import android.view.animation.DecelerateInterpolator;
33-
import android.view.animation.Interpolator;
34-
import android.view.animation.LinearInterpolator;
3530
import android.view.animation.TranslateAnimation;
3631
import android.view.inputmethod.EditorInfo;
3732
import android.view.inputmethod.InputMethodManager;
38-
import android.widget.AbsListView;
3933
import android.widget.EditText;
40-
import android.widget.ImageView;
4134
import android.widget.RelativeLayout;
4235
import android.widget.Toast;
4336

@@ -47,14 +40,10 @@
4740
import com.hackthenorth.android.R;
4841
import com.hackthenorth.android.base.BaseActivity;
4942
import com.hackthenorth.android.framework.GCMRegistrationManager;
50-
import com.hackthenorth.android.model.Mentor;
5143
import com.hackthenorth.android.ui.component.ExplodingImageView;
5244
import com.hackthenorth.android.ui.component.PagerTitleStrip;
5345
import com.hackthenorth.android.ui.component.TextView;
54-
import com.hackthenorth.android.ui.mentor.MentorListAdapter;
55-
import com.hackthenorth.android.ui.mentor.MentorsFragment;
5646
import com.hackthenorth.android.ui.settings.SettingsActivity;
57-
import com.hackthenorth.android.util.Units;
5847
import com.readystatesoftware.systembartint.SystemBarTintManager;
5948

6049
public class MainActivity extends BaseActivity implements View.OnTouchListener {

android/src/main/java/com/hackthenorth/android/ui/mentor/MentorListAdapter.java renamed to android/src/main/java/com/hackthenorth/android/ui/MentorListAdapter.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.hackthenorth.android.ui.mentor;
1+
package com.hackthenorth.android.ui;
22

33
import android.content.Context;
44
import android.text.TextUtils;
@@ -82,6 +82,20 @@ public View getView(int position, View convertView, ViewGroup parent) {
8282
((TextView) convertView.findViewById(R.id.mentor_skills)).setText(getSkillsString(mentor.skills));
8383
}
8484

85+
// Show methods of contacting them
86+
if (convertView.findViewById(R.id.mentor_email) != null && !TextUtils.isEmpty(mentor.email)) {
87+
convertView.findViewById(R.id.mentor_email).setVisibility(View.VISIBLE);
88+
}
89+
if (convertView.findViewById(R.id.mentor_twitter) != null && !TextUtils.isEmpty(mentor.twitter)) {
90+
convertView.findViewById(R.id.mentor_twitter).setVisibility(View.VISIBLE);
91+
}
92+
if (convertView.findViewById(R.id.mentor_github) != null && !TextUtils.isEmpty(mentor.github)) {
93+
convertView.findViewById(R.id.mentor_github).setVisibility(View.VISIBLE);
94+
}
95+
if (convertView.findViewById(R.id.mentor_phone) != null && !TextUtils.isEmpty(mentor.phone)) {
96+
convertView.findViewById(R.id.mentor_phone).setVisibility(View.VISIBLE);
97+
}
98+
8599
return convertView;
86100
}
87101

android/src/main/java/com/hackthenorth/android/ui/mentor/MentorsFragment.java renamed to android/src/main/java/com/hackthenorth/android/ui/MentorsFragment.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
1-
package com.hackthenorth.android.ui.mentor;
1+
package com.hackthenorth.android.ui;
22

33
import android.app.Activity;
4-
import android.content.Context;
54
import android.os.AsyncTask;
65
import android.os.Bundle;
7-
import android.text.TextUtils;
8-
import android.util.Log;
96
import android.view.LayoutInflater;
107
import android.view.View;
118
import android.view.ViewGroup;
12-
import android.view.ViewTreeObserver;
13-
import android.view.ViewTreeObserver.OnScrollChangedListener;
14-
import android.widget.AbsListView;
15-
import android.widget.ArrayAdapter;
169
import android.widget.ListView;
17-
import android.widget.SectionIndexer;
18-
import android.widget.TextView;
19-
import com.android.volley.toolbox.ImageLoader;
20-
import com.android.volley.toolbox.NetworkImageView;
2110
import com.hackthenorth.android.HackTheNorthApplication;
2211
import com.hackthenorth.android.R;
2312
import com.hackthenorth.android.base.BaseListFragment;
2413
import com.hackthenorth.android.framework.HTTPFirebase;
25-
import com.hackthenorth.android.framework.NetworkManager;
2614
import com.hackthenorth.android.model.Mentor;
27-
import com.hackthenorth.android.ui.ViewPagerAdapter;
28-
import com.hackthenorth.android.util.DateFormatter;
2915

3016
import java.util.ArrayList;
3117

‎android/src/main/java/com/hackthenorth/android/ui/ViewPagerAdapter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import android.content.res.Resources;
77
import android.support.v13.app.FragmentStatePagerAdapter;
88
import com.hackthenorth.android.R;
9-
import com.hackthenorth.android.ui.mentor.MentorsFragment;
109

1110
public class ViewPagerAdapter extends FragmentStatePagerAdapter {
1211
private final String TAG = "FragmentStatePagerAdapter";

‎android/src/main/res/drawable-xxhdpi/email.png‎

1.19 KB
Loading

‎android/src/main/res/drawable-xxhdpi/github.png‎

1.67 KB
Loading

‎android/src/main/res/drawable-xxhdpi/phone.png‎

1.17 KB
Loading

‎android/src/main/res/drawable-xxhdpi/twitter.png‎

1 KB
Loading

‎android/src/main/res/layout/mentor_list_item.xml‎

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<com.hackthenorth.android.ui.component.HexagonRippleView
4-
xmlns:android="http://schemas.android.com/apk/res/android"
3+
<com.hackthenorth.android.ui.component.HexagonRippleView xmlns:android="http://schemas.android.com/apk/res/android"
54
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
xmlns:tools="http://schemas.android.com/tools"
66
android:layout_width="match_parent"
77
android:layout_height="wrap_content"
88
android:background="@drawable/card_background">
@@ -19,7 +19,8 @@
1919
android:layout_margin="16dp"
2020
android:textColor="@color/theme_secondary"
2121
android:textSize="32sp"
22-
app:typeface="roboto_thin" />
22+
app:typeface="roboto_thin"
23+
tools:text="Barack Obama" />
2324

2425
<com.android.volley.toolbox.NetworkImageView
2526
android:id="@+id/mentor_image"
@@ -52,7 +53,8 @@
5253
android:singleLine="true"
5354
android:textColor="@color/text_color_secondary"
5455
android:textSize="14sp"
55-
app:typeface="roboto_regular" />
56+
app:typeface="roboto_regular"
57+
tools:text="USA" />
5658
</LinearLayout>
5759

5860
<LinearLayout
@@ -78,7 +80,8 @@
7880
android:layout_height="wrap_content"
7981
android:textColor="@color/text_color_secondary"
8082
android:textSize="14sp"
81-
app:typeface="roboto_regular" />
83+
app:typeface="roboto_regular"
84+
tools:text="Never" />
8285
</LinearLayout>
8386

8487
<LinearLayout
@@ -104,7 +107,51 @@
104107
android:layout_height="wrap_content"
105108
android:textColor="@color/text_color_secondary"
106109
android:textSize="14sp"
107-
app:typeface="roboto_regular" />
110+
app:typeface="roboto_regular"
111+
tools:text="Baking" />
112+
</LinearLayout>
113+
114+
<LinearLayout
115+
android:layout_width="wrap_content"
116+
android:layout_height="24dp"
117+
android:layout_marginBottom="16dp"
118+
android:orientation="horizontal">
119+
120+
<ImageView
121+
android:id="@+id/mentor_email"
122+
android:layout_width="24dp"
123+
android:layout_height="24dp"
124+
android:layout_marginLeft="16dp"
125+
android:alpha="0.54"
126+
android:src="@drawable/email"
127+
android:visibility="gone" />
128+
129+
<ImageView
130+
android:id="@+id/mentor_twitter"
131+
android:layout_width="24dp"
132+
android:layout_height="24dp"
133+
android:layout_marginLeft="16dp"
134+
android:alpha="0.54"
135+
android:src="@drawable/twitter"
136+
android:visibility="gone" />
137+
138+
<ImageView
139+
android:id="@+id/mentor_github"
140+
android:layout_width="24dp"
141+
android:layout_height="24dp"
142+
android:layout_marginLeft="16dp"
143+
android:alpha="0.54"
144+
android:src="@drawable/github"
145+
android:visibility="gone" />
146+
147+
<ImageView
148+
android:id="@+id/mentor_phone"
149+
android:layout_width="24dp"
150+
android:layout_height="24dp"
151+
android:layout_marginLeft="16dp"
152+
android:alpha="0.54"
153+
android:src="@drawable/phone"
154+
android:visibility="gone" />
108155
</LinearLayout>
109156

110157
</LinearLayout>

0 commit comments

Comments
 (0)