Skip to content

Commit

Permalink
code refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@Swati4star
Swati4star committed Aug 2, 2018
1 parent 85a4bbe commit 96457ed
Show file tree
Hide file tree
Showing 44 changed files with 915 additions and 1,222 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ android:
components:
- platform-tools
- tools
- build-tools-23.0.1
- android-23
- build-tools-27.0.3
- android-27
# Support library
- extra-android-support
- extra-android-m2repository
Expand Down
40 changes: 23 additions & 17 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ apply plugin: 'com.android.application'
buildscript {
repositories {
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:3.1.3'
}
}

Expand All @@ -14,14 +15,14 @@ repositories {
}

android {
compileSdkVersion 23
buildToolsVersion '23.0.1'
compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "nsit.app.com.nsitapp"
minSdkVersion 14
targetSdkVersion 23
versionCode 26
versionName "2.5"
minSdkVersion 19
targetSdkVersion 27
versionCode 27
versionName "2.6"
}

buildTypes {
Expand All @@ -30,17 +31,22 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
compile 'org.lucasr.twowayview:twowayview:0.1.4'
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.squareup.okhttp3:okhttp:3.4.1'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.squareup.picasso:picasso:2.5.2'
compile group: 'org.jsoup', name: 'jsoup', version: '1.8.3'
compile 'com.google.android.gms:play-services-maps:7.5.0'
compile 'com.google.android.gms:play-services-location:7.5.0'
compile 'com.nispok:snackbar:2.10.+'
compile files('libs/YouTubeAndroidPlayerApi.jar')
implementation 'org.lucasr.twowayview:twowayview:0.1.4'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.android.support:design:27.1.1'
implementation group: 'org.jsoup', name: 'jsoup', version: '1.8.3'
implementation 'com.google.android.gms:play-services-maps:15.0.1'
implementation 'com.google.android.gms:play-services-location:15.0.1'
implementation files('libs/YouTubeAndroidPlayerApi.jar')
}
61 changes: 27 additions & 34 deletions app/src/main/java/adapters/CustomList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@ public View getView(final int position, View view, ViewGroup parent) {
view = mInflater.inflate(R.layout.message_layout, parent,false);

holder = new ViewHolder();
holder.Des = (TextView) view.findViewById(R.id.des);
holder.likes = (TextView) view.findViewById(R.id.likes);
holder.dates = (TextView) view.findViewById(R.id.date);
holder.read = (TextView) view.findViewById(R.id.read);
holder.imageView = (ImageView) view.findViewById(R.id.image);
holder.frameLayout = (FrameLayout) view.findViewById(R.id.frame);
holder.button = (Button) view.findViewById(R.id.show);
holder.Des = view.findViewById(R.id.des);
holder.likes = view.findViewById(R.id.likes);
holder.dates = view.findViewById(R.id.date);
holder.read = view.findViewById(R.id.read);
holder.imageView = view.findViewById(R.id.image);
holder.frameLayout = view.findViewById(R.id.frame);
holder.button = view.findViewById(R.id.show);
view.setTag(holder);
} else
holder = (ViewHolder) view.getTag();

ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.progressBar1);
ProgressBar progressBar = view.findViewById(R.id.progressBar1);


if (des.get(position) == null)
Expand Down Expand Up @@ -113,38 +113,31 @@ public View getView(final int position, View view, ViewGroup parent) {
} else
holder.dates.setVisibility(View.INVISIBLE);

holder.read.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
Context c = getContext();
Intent i = new Intent(getContext(), Description.class);
i.putExtra("dec", des.get(position));
i.putExtra("like", lik.get(position));
i.putExtra("img", img.get(position));
i.putExtra("link", link.get(position));
i.putExtra("oid", obid.get(position));
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(view, c);
c.startActivity(i);
}
holder.read.setOnClickListener(view1 -> {
Context c = getContext();
Intent i = new Intent(getContext(), Description.class);
i.putExtra("dec", des.get(position));
i.putExtra("like", lik.get(position));
i.putExtra("img", img.get(position));
i.putExtra("link", link.get(position));
i.putExtra("oid", obid.get(position));
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(view1, c);
c.startActivity(i);
});

holder.frameLayout.setVisibility(View.VISIBLE);
if (img.get(position) != null) {

imageLoader.DisplayImage(img.get(position), holder.imageView, progressBar);
holder.button.setOnClickListener(new OnClickListener() {

@Override
public void onClick(View v) {
Context c = getContext();
Intent i = new Intent(getContext(), Description_FullImage.class);
i.putExtra("img", img.get(position));
i.putExtra("oid", obid.get(position));
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, c);
c.startActivity(i);
}
holder.button.setOnClickListener(v -> {
Context c = getContext();
Intent i = new Intent(getContext(), Description_FullImage.class);
i.putExtra("img", img.get(position));
i.putExtra("oid", obid.get(position));
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, c);
c.startActivity(i);
});

} else {
Expand Down
79 changes: 37 additions & 42 deletions app/src/main/java/adapters/Locations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,51 +29,46 @@ public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_locations);
listView = (ExpandableListView) findViewById(R.id.locations_list);
listView = findViewById(R.id.locations_list);
populateList(LocationsGroupsList);

this.listView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {

@Override
public boolean onChildClick(ExpandableListView parent, View v,
int groupPosition, int childPosition, long id) {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, Locations.this);
String groupType = LocationsGroupsList.get(groupPosition).GroupType;
Integer IconId = null;
switch (groupType) {
case "College":
IconId = R.drawable.ic_school_black_24dp;
break;
case "Campus":
IconId = R.drawable.ic_business_black_24dp;
break;
case "Hostel":
IconId = R.drawable.ic_hotel_black_24dp;
break;
case "Canteen":
IconId = R.drawable.ic_local_cafe_black_24dp;
break;
case "Stationery":
IconId = R.drawable.ic_brush_black_24dp;
break;
case "ATM":
IconId = R.drawable.ic_credit_card_black_24dp;
break;
case "WiFi":
IconId = R.drawable.ic_network_wifi_black_24dp;
break;
case "Sports":
IconId = R.drawable.ic_directions_bike_black_24dp;
break;
case "Miscellaneous":
IconId = R.drawable.ic_public_black_24dp;
break;
}
v.setTag(groupPosition);
ShowOnMap(v, LocationsGroupsList.get(groupPosition).Locations.get(childPosition), IconId);
return false;
this.listView.setOnChildClickListener((parent, v, groupPosition, childPosition, id) -> {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, Locations.this);
String groupType = LocationsGroupsList.get(groupPosition).GroupType;
Integer IconId = null;
switch (groupType) {
case "College":
IconId = R.drawable.ic_school_black_24dp;
break;
case "Campus":
IconId = R.drawable.ic_business_black_24dp;
break;
case "Hostel":
IconId = R.drawable.ic_hotel_black_24dp;
break;
case "Canteen":
IconId = R.drawable.ic_local_cafe_black_24dp;
break;
case "Stationery":
IconId = R.drawable.ic_brush_black_24dp;
break;
case "ATM":
IconId = R.drawable.ic_credit_card_black_24dp;
break;
case "WiFi":
IconId = R.drawable.ic_network_wifi_black_24dp;
break;
case "Sports":
IconId = R.drawable.ic_directions_bike_black_24dp;
break;
case "Miscellaneous":
IconId = R.drawable.ic_public_black_24dp;
break;
}
v.setTag(groupPosition);
ShowOnMap(v, LocationsGroupsList.get(groupPosition).Locations.get(childPosition), IconId);
return false;
});

setTitle("College Hangout_collegeLocations");
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/adapters/LocationsList_Adapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView
convertView = infalInflater.inflate(R.layout.location_listitem, parent, false);
}

TextView GroupHeader = (TextView) convertView
TextView GroupHeader = convertView
.findViewById(R.id.LocationsGroupHeader);
GroupHeader.setText(headerTitle);
ImageView GroupIcon = (ImageView) convertView.findViewById(R.id.GroupTypeImage);
ImageView GroupIcon = convertView.findViewById(R.id.GroupTypeImage);

switch (groupType) {
case "College":
Expand Down Expand Up @@ -128,7 +128,7 @@ public View getChildView(int groupPosition, int childPosition, boolean isLastChi
convertView = infalInflater.inflate(R.layout.locationgroup_listitem, parent, false);
}

TextView txtHeader = (TextView) convertView.findViewById(R.id.LocationItem);
TextView txtHeader = convertView.findViewById(R.id.LocationItem);
txtHeader.setText(childText);

if (lastExpandedGroupPosition == groupPosition) {
Expand Down
78 changes: 33 additions & 45 deletions app/src/main/java/adapters/MemberAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,74 +36,62 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
}
final AboutUsMember currentMember = getItem(position);

TextView name = (TextView) listIteamView.findViewById(R.id.memberName);
TextView name = listIteamView.findViewById(R.id.memberName);
name.setText(currentMember.getName().toString());
TextView batch = (TextView) listIteamView.findViewById(R.id.batch);
TextView batch = listIteamView.findViewById(R.id.batch);
batch.setText(currentMember.getBatch().toString());
TextView role1 = (TextView) listIteamView.findViewById(R.id.role1);
TextView role1 = listIteamView.findViewById(R.id.role1);
role1.setText(currentMember.getRole1());
ImageView memberImage = (ImageView) listIteamView.findViewById(R.id.memberImage);
ImageView memberImage = listIteamView.findViewById(R.id.memberImage);
memberImage.setImageResource(currentMember.getImageResID());
if (currentMember.getName().toString().equals("Prabhakar Gupta")) {
memberImage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri uri = Uri.parse("http://prabhakargupta.com/");
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
getContext().startActivity(intent);
}
memberImage.setOnClickListener(v -> {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri uri = Uri.parse("http://prabhakargupta.com/");
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
getContext().startActivity(intent);
});
}
ImageView fbID = (ImageView) listIteamView.findViewById(R.id.facebook_image);
ImageView fbID = listIteamView.findViewById(R.id.facebook_image);
String gitId = currentMember.getGitID();
String linkedId = currentMember.getLinkedID();
String role2 = currentMember.getRole2();
fbID.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri fbUri = Uri.parse(currentMember.getFbID());
Intent intent = new Intent(Intent.ACTION_VIEW, fbUri);
getContext().startActivity(intent);
}
fbID.setOnClickListener(v -> {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri fbUri = Uri.parse(currentMember.getFbID());
Intent intent = new Intent(Intent.ACTION_VIEW, fbUri);
getContext().startActivity(intent);
});
ImageView gitimage = (ImageView) listIteamView.findViewById(R.id.github_image);
ImageView gitimage = listIteamView.findViewById(R.id.github_image);
gitimage.setVisibility(View.GONE);
if (gitId != null && !gitId.isEmpty()) {

gitimage.setVisibility(View.VISIBLE);
gitimage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri gitUri = Uri.parse(currentMember.getGitID());
Intent intent = new Intent(Intent.ACTION_VIEW, gitUri);
getContext().startActivity(intent);
}
gitimage.setOnClickListener(v -> {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri gitUri = Uri.parse(currentMember.getGitID());
Intent intent = new Intent(Intent.ACTION_VIEW, gitUri);
getContext().startActivity(intent);
});
}
ImageView linkedImage = (ImageView) listIteamView.findViewById(R.id.linkedIn_image);
ImageView linkedImage = listIteamView.findViewById(R.id.linkedIn_image);
linkedImage.setVisibility(View.GONE);
if (linkedId != null && !linkedId.isEmpty()) {
linkedImage.setVisibility(View.VISIBLE);
linkedImage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri linkedUri = Uri.parse(currentMember.getLinkedID());
Intent intent = new Intent(Intent.ACTION_VIEW, linkedUri);
getContext().startActivity(intent);
}
linkedImage.setOnClickListener(v -> {
ButtonAnimation btnAnimation = new ButtonAnimation();
btnAnimation.animateButton(v, getContext());
Uri linkedUri = Uri.parse(currentMember.getLinkedID());
Intent intent = new Intent(Intent.ACTION_VIEW, linkedUri);
getContext().startActivity(intent);
});
}
TextView role2text = (TextView) listIteamView.findViewById(R.id.role2);
TextView role2text = listIteamView.findViewById(R.id.role2);
role2text.setText("");
ImageView role2Image = (ImageView) listIteamView.findViewById(R.id.role2image);
ImageView role2Image = listIteamView.findViewById(R.id.role2image);
role2Image.setVisibility(View.GONE);
if (role2 != null && !role2.isEmpty()) {
role2text.setText(role2);
Expand Down

0 comments on commit 96457ed

Please sign in to comment.