Skip to content

Commit f8498c5

Browse files
committed
changed login and otp backend fixed schedule modified college list
1 parent ed3024c commit f8498c5

File tree

5 files changed

+28
-16
lines changed

5 files changed

+28
-16
lines changed

app/src/main/java/dpi/ks19/participantapp/Adapter/ClusterAdapter.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,13 @@ public void onBindViewHolder(@NonNull final ClusterHolder holder, final int list
6969
public void onClick(View v) {
7070
if(!holder.isExpanded){
7171
progressDialog.show();
72-
ApiHelper.getInstance(mContext).getEventsForCluster(day, "a", holder, ClusterAdapter.this);
72+
if(clusterName.equals(mContext.getString(R.string.tamil_sangam_display_text))){
73+
ApiHelper.getInstance(mContext).getEventsForCluster(day, mContext.getString(R.string.tamil_sangam_query_text), holder, ClusterAdapter.this);
74+
}else{
75+
//use clusterName instead of "a"
76+
ApiHelper.getInstance(mContext).getEventsForCluster(day, "a", holder, ClusterAdapter.this);
77+
}
78+
7379
}else{
7480
holder.hideRecyclerView();
7581
}

app/src/main/java/dpi/ks19/participantapp/Networking/ApiHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public void onErrorResponse(VolleyError error) {
292292

293293
public void getEventsForCluster(final int day, String cluster, final ClusterAdapter.ClusterHolder holder, final EventsByCluster callback) {
294294

295-
String URL = baseUrl + "getEventsByCluster.php";
295+
String URL = "https://protocolfest.co.in/ks/participants/getEventsByCluster.php";
296296

297297
HashMap<String, String> params = new HashMap<>();
298298
params.put("cluster", cluster);

app/src/main/java/dpi/ks19/participantapp/proshows.java

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,36 @@
44
import android.os.Bundle;
55
import android.widget.ImageView;
66

7+
import com.squareup.picasso.Picasso;
8+
79
public class proshows extends AppCompatActivity {
810

911
@Override
1012
protected void onCreate(Bundle savedInstanceState) {
1113
super.onCreate(savedInstanceState);
1214
setContentView(R.layout.activity_proshows);
1315

14-
ImageView musicteam = (ImageView) findViewById(R.id.musicteam);
15-
musicteam.setImageResource(R.drawable.smt_final);
16+
ImageView musicteam = findViewById(R.id.musicteam);
17+
Picasso.get().load(R.drawable.smt_final).into(musicteam);
18+
19+
20+
ImageView veena = findViewById(R.id.veenasrivani);
21+
Picasso.get().load(R.drawable.veenasrivani).into(veena);
22+
23+
24+
ImageView crazy = findViewById(R.id.crazymohan);
25+
Picasso.get().load(R.drawable.crazymohan_final).into(crazy);
1626

17-
ImageView veena = (ImageView) findViewById(R.id.veenasrivani);
18-
veena.setImageResource(R.drawable.veenasrivani);
1927

20-
ImageView crazy = (ImageView) findViewById(R.id.crazymohan);
21-
crazy.setImageResource(R.drawable.crazymohan_final);
28+
ImageView choreo = findViewById(R.id.choreonite);
29+
Picasso.get().load(R.drawable.choreo_final).into(choreo);
2230

23-
ImageView choreo = (ImageView) findViewById(R.id.choreonite);
24-
choreo.setImageResource(R.drawable.choreo_final);
2531

26-
ImageView pattimandram = (ImageView) findViewById(R.id.pattimandram);
27-
pattimandram.setImageResource(R.drawable.p_final);
32+
ImageView pattimandram = findViewById(R.id.pattimandram);
33+
Picasso.get().load(R.drawable.p_final).into(pattimandram);
2834

29-
ImageView navin = (ImageView) findViewById(R.id.navin);
30-
navin.setImageResource(R.drawable.navin_final);
35+
ImageView navin = findViewById(R.id.navin);
36+
Picasso.get().load(R.drawable.navin_final).into(navin);
3137

3238

3339
}

app/src/main/res/layout/cluster_card.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
android:layout_marginStart="8dp"
2121
android:layout_marginEnd="8dp"
2222
android:adjustViewBounds="true"
23-
android:scaleType="fitXY"
2423
app:layout_constraintBottom_toTopOf="@+id/guideline"
2524
app:layout_constraintEnd_toEndOf="parent"
2625
app:layout_constraintStart_toStartOf="parent"

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
<string name="no">No</string>
3232
<string name="ok">Ok</string>
3333
<string name="hostel_accomodation">Hostel accomodation needed</string>
34-
34+
<string name="tamil_sangam_display_text">சாஸ்த்ரா தமிழ்ச் சங்கம்</string>
35+
<string name="tamil_sangam_query_text">Tamil Lits</string>
3536
<!--clusters-->
3637
<string-array name="cluster_list">
3738
<item>FlagShip Event</item>

0 commit comments

Comments
 (0)