Skip to content

Commit c751a07

Browse files
MSP-AndroidMSP-Android
committed
MSP Android App
1 parent 0350aa0 commit c751a07

26 files changed

+437
-93
lines changed

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/example/msp_app/ui/about_us/AboutUs.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
import android.widget.ImageView;
1010

1111
import com.example.msp_app.R;
12+
import com.example.msp_app.ui.home.HomeAcivity;
1213

1314
public class AboutUs extends AppCompatActivity {
1415

1516
final String faceBookUri="https://www.facebook.com/ASUTC"
1617
,youtubeUri="https://www.youtube.com/channel/UCx4RR5PPCwfU_Om_9pAwaCA/featured",
1718
linedInUri="https://www.linkedin.com/company/msp-tech-club-asu/";
1819

19-
ImageView facebookImage,youtubeImage,linkedInImage,instigramImage;
20+
ImageView facebookImage,youtubeImage,linkedInImage,instigramImage,back;
2021

2122

2223
@Override
@@ -54,5 +55,14 @@ public void onClick(View view) {
5455
}
5556
});
5657

58+
back=findViewById(R.id.back_about);
59+
back.setOnClickListener(new View.OnClickListener() {
60+
@Override
61+
public void onClick(View view) {
62+
Intent i=new Intent(getApplicationContext(), HomeAcivity.class);
63+
startActivity(i);
64+
}
65+
});
66+
5767
}
5868
}

‎app/src/main/java/com/example/msp_app/ui/crew/CrewAcivity.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77
import androidx.recyclerview.widget.RecyclerView;
88

99
import android.content.Context;
10+
import android.content.Intent;
1011
import android.os.Bundle;
12+
import android.view.View;
1113
import android.view.animation.AnimationUtils;
1214
import android.view.animation.LayoutAnimationController;
15+
import android.widget.ImageView;
1316

1417
import com.example.msp_app.R;
1518
import com.example.msp_app.model.CrewModel;
19+
import com.example.msp_app.ui.home.HomeAcivity;
1620
import com.example.msp_app.ui.main.DataViewModel;
1721

1822
import java.util.ArrayList;
@@ -22,6 +26,7 @@ public class CrewAcivity extends AppCompatActivity {
2226
private CrewAdapter crewAdapter;
2327
private LayoutAnimationController controller;
2428
private Context context;
29+
ImageView back;
2530
DataViewModel dataViewModel;
2631

2732
@Override
@@ -53,5 +58,16 @@ public void onChanged(ArrayList<CrewModel> crewModels) {
5358
controller= AnimationUtils.loadLayoutAnimation(context,R.anim.layout_animation_fail_down);
5459
recyclerView.setLayoutAnimation(controller);
5560
recyclerView.scheduleLayoutAnimation();
61+
62+
63+
back=findViewById(R.id.back_crew);
64+
back.setOnClickListener(new View.OnClickListener() {
65+
@Override
66+
public void onClick(View view) {
67+
Intent i=new Intent(getApplicationContext(),HomeAcivity.class);
68+
startActivity(i);
69+
}
70+
});
71+
5672
}
5773
}

‎app/src/main/java/com/example/msp_app/ui/event/EventActivity.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88

99
import android.content.Intent;
1010
import android.os.Bundle;
11+
import android.view.View;
12+
import android.widget.ImageView;
1113

1214
import com.example.msp_app.R;
1315
import com.example.msp_app.model.EventsModel;
1416
import com.example.msp_app.model.ProjectsModel;
17+
import com.example.msp_app.ui.home.HomeAcivity;
1518
import com.example.msp_app.ui.main.DataViewModel;
1619
import com.example.msp_app.ui.project.ProjectAdapter;
1720

@@ -22,6 +25,7 @@ public class EventActivity extends AppCompatActivity {
2225
EventAdapter eventAdapter;
2326
DataViewModel dataViewModel;
2427
Intent transferEventDataIntent;
28+
ImageView back;
2529
@Override
2630
protected void onCreate(Bundle savedInstanceState) {
2731
super.onCreate(savedInstanceState);
@@ -31,10 +35,11 @@ protected void onCreate(Bundle savedInstanceState) {
3135
transferEventDataIntent=new Intent();
3236

3337
eventRecyclerView=findViewById(R.id.recycle_view_events);
34-
3538
eventRecyclerView.setLayoutManager(new LinearLayoutManager(this));
39+
3640
dataViewModel = ViewModelProviders.of(this).get(DataViewModel.class);
3741
dataViewModel.getEvents();
42+
3843
eventAdapter=new EventAdapter();
3944
eventRecyclerView.setAdapter(eventAdapter);
4045
dataViewModel.eventMutableLiveData.observe(this, new Observer<ArrayList<EventsModel>>() {
@@ -45,7 +50,14 @@ public void onChanged(ArrayList<EventsModel> eventsModels) {
4550
}
4651
});
4752

48-
53+
back=findViewById(R.id.back_event);
54+
back.setOnClickListener(new View.OnClickListener() {
55+
@Override
56+
public void onClick(View view) {
57+
Intent i=new Intent(getApplicationContext(), HomeAcivity.class);
58+
startActivity(i);
59+
}
60+
});
4961

5062
}
5163
}

‎app/src/main/java/com/example/msp_app/ui/event/EventAdapter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ public EventAdapter.EventViewHolder onCreateViewHolder(@NonNull ViewGroup parent
4141
public void onBindViewHolder(@NonNull EventAdapter.EventViewHolder holder, int position) {
4242
holder.title.setText(getEvents().get(position).getName());
4343
holder.discription.setText(getEvents().get(position).getDescription());
44-
Picasso.get().load(getEvents().get(position).getImg()).into(holder.eventImage);
44+
Picasso.get().load(getEvents().get(position).getImg()).error(R.drawable.event_home).into(holder.eventImage);
45+
46+
4547

46-
if(holder.eventImage.getDrawable()==null){
47-
holder.eventImage.setImageResource(R.drawable.recyshape2);
48-
}
4948

5049

5150
}

‎app/src/main/java/com/example/msp_app/ui/event/EventDescription.java

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,46 @@
44

55
import android.content.Intent;
66
import android.os.Bundle;
7+
import android.view.View;
8+
import android.widget.ImageView;
9+
import android.widget.TextView;
710

811
import com.example.msp_app.R;
12+
import com.example.msp_app.model.EventsModel;
13+
import com.example.msp_app.ui.home.HomeAcivity;
14+
15+
import java.util.ArrayList;
916

1017
public class EventDescription extends AppCompatActivity {
1118
Intent eventData;
19+
TextView tobic,time,disc,fees;
20+
ImageView eventImage,back;
21+
ArrayList<EventsModel>events=new ArrayList<>();
22+
1223

1324
@Override
1425
protected void onCreate(Bundle savedInstanceState) {
1526
super.onCreate(savedInstanceState);
1627
setContentView(R.layout.activity_event_description);
1728

18-
eventData.getData();
29+
tobic=findViewById(R.id.event_tobic_desc);
30+
time=findViewById(R.id.event_time_disc);
31+
disc=findViewById(R.id.event_discription_desc);
32+
fees=findViewById(R.id.event_fees_desc);
33+
eventImage=findViewById(R.id.img_event_disc);
34+
35+
eventData=getIntent();
36+
//events= eventData.getExtras().getParcelableArrayList("event");
37+
38+
39+
back=findViewById(R.id.back_disc);
40+
back.setOnClickListener(new View.OnClickListener() {
41+
@Override
42+
public void onClick(View view) {
43+
Intent i=new Intent(getApplicationContext(),EventActivity.class);
44+
startActivity(i);
45+
}
46+
});
1947

2048
}
2149
}

‎app/src/main/java/com/example/msp_app/ui/project/ProjectActivity.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
import androidx.recyclerview.widget.LinearLayoutManager;
77
import androidx.recyclerview.widget.RecyclerView;
88

9+
import android.content.Intent;
910
import android.os.Bundle;
11+
import android.view.View;
12+
import android.widget.ImageView;
1013

1114
import com.example.msp_app.R;
1215
import com.example.msp_app.model.ProjectsModel;
16+
import com.example.msp_app.ui.home.HomeAcivity;
1317
import com.example.msp_app.ui.main.DataViewModel;
1418

1519
import java.util.ArrayList;
@@ -18,17 +22,21 @@ public class ProjectActivity extends AppCompatActivity {
1822
RecyclerView prjectRecyclerView;
1923
ProjectAdapter projectAdapter;
2024
DataViewModel dataViewModel;
25+
ImageView back;
2126
@Override
2227
protected void onCreate(Bundle savedInstanceState) {
2328
super.onCreate(savedInstanceState);
2429
setContentView(R.layout.activity_project);
30+
getSupportActionBar().hide();
2531
prjectRecyclerView=findViewById(R.id.recproject);
2632

2733
prjectRecyclerView.setLayoutManager(new LinearLayoutManager(this));
2834
dataViewModel = ViewModelProviders.of(this).get(DataViewModel.class);
2935
dataViewModel.getProjects();
3036
projectAdapter=new ProjectAdapter(getApplicationContext());
3137
prjectRecyclerView.setAdapter(projectAdapter);
38+
39+
3240
dataViewModel.projectMutableLiveData.observe(this, new Observer<ArrayList<ProjectsModel>>() {
3341
@Override
3442
public void onChanged(ArrayList<ProjectsModel> projectsModels) {
@@ -37,7 +45,14 @@ public void onChanged(ArrayList<ProjectsModel> projectsModels) {
3745
});
3846

3947

40-
48+
back=findViewById(R.id.back_project);
49+
back.setOnClickListener(new View.OnClickListener() {
50+
@Override
51+
public void onClick(View view) {
52+
Intent i=new Intent(getApplicationContext(), HomeAcivity.class);
53+
startActivity(i);
54+
}
55+
});
4156

4257

4358

‎app/src/main/java/com/example/msp_app/ui/project/ProjectAdapter.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,10 @@ public ProjectHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
4747
@Override
4848
public void onBindViewHolder(@NonNull ProjectHolder holder, int position) {
4949
holder.ProjectName.setText(getProjects().get(position).getName());
50-
holder.Discrption.setText(getProjects().get(position).getDescription());
50+
holder.projectLink.setText(getProjects().get(position).getLink());
51+
52+
Picasso.get().load( getProjects().get( position ).getPhoto()).error(R.drawable.project_home).into( holder.ProjectImage);
5153

52-
Picasso.get().load( getProjects().get( position ).getPhoto()).placeholder(R.drawable.recyshape2).into( holder.ProjectImage);
53-
if(holder.ProjectImage==null) {
54-
holder.ProjectImage.setImageResource(R.drawable.recyshape2);
55-
}
5654

5755

5856
}
@@ -64,12 +62,12 @@ public int getItemCount() {
6462
}
6563

6664
public class ProjectHolder extends RecyclerView.ViewHolder{
67-
TextView ProjectName,Discrption;
65+
TextView ProjectName,projectLink;
6866
ImageView ProjectImage;
6967
public ProjectHolder(@NonNull View itemView) {
7068
super(itemView);
7169
ProjectName=itemView.findViewById(R.id.ProjectName);
72-
Discrption=itemView.findViewById(R.id.content);
70+
projectLink=itemView.findViewById(R.id.content);
7371
ProjectImage=itemView.findViewById(R.id.Projectimage);
7472

7573
}

‎app/src/main/res/anim/alpha.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android">
33
<translate
4-
android:duration="9000"
4+
android:duration="2000"
55
android:fromXDelta="0"
66
android:toXDelta="300">
77
</translate>

‎app/src/main/res/drawable/back.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="?attr/colorControlNormal">
7+
<path
8+
android:fillColor="@android:color/white"
9+
android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
10+
</vector>

0 commit comments

Comments
 (0)