Skip to content

Commit 5146737

Browse files
atm1504atm1504
authored
Merge pull request #152 from dsciitpatna/development
Update master branch to release the first version of the app
2 parents ee66de7 + 1327244 commit 5146737

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2753
-173
lines changed

‎.idea/modules.xml

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml

+17-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
package="com.example.saar">
44

55
<uses-permission android:name="android.permission.INTERNET" />
6-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
7-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
6+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
7+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
8+
<uses-permission android:name="android.permission.CAMERA" />
9+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
10+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
811

912
<application
1013
android:allowBackup="true"
@@ -16,18 +19,27 @@
1619
<activity
1720
android:name=".MainActivity"
1821
android:label="@string/app_name"
19-
android:theme="@style/AppTheme.NoActionBar">
22+
android:theme="@style/AppTheme.NoActionBar" />
23+
<activity
24+
android:name=".Login_SignUp.LoginSignupActivity"
25+
android:windowSoftInputMode="adjustPan">
2026
<intent-filter>
2127
<action android:name="android.intent.action.MAIN" />
2228

2329
<category android:name="android.intent.category.LAUNCHER" />
2430
</intent-filter>
2531
</activity>
2632
<activity
27-
android:name=".Login_SignUp.LoginSignupActivity"
33+
android:name=".Profile.ProfileActivity"
34+
android:parentActivityName=".MainActivity"
35+
android:windowSoftInputMode="adjustPan" />
36+
<activity
37+
android:name=".ChangeCredentials.ChangeCredentialsActivity"
38+
android:parentActivityName=".Login_SignUp.LoginSignupActivity"
2839
android:windowSoftInputMode="adjustPan" />
2940
<activity android:name=".Timeline_Events.EventDetails" />
30-
<activity android:name=".OtpActivity"/>
41+
<activity android:name=".OtpActivity" />
42+
3143
<service android:name=".Notifications.FcmMessagingService">
3244
<intent-filter>
3345
<action android:name="com.google.firebase.MESSAGING_EVENT" />

‎app/src/main/java/com/example/saar/ChangeCredentials/ChangeCredentialsActivity.java

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.example.saar.ChangeCredentials;
2+
3+
import android.os.Bundle;
4+
import android.support.v4.app.FragmentTransaction;
5+
import android.support.v7.app.AppCompatActivity;
6+
7+
import com.example.saar.R;
8+
9+
public class ChangeCredentialsActivity extends AppCompatActivity {
10+
@Override
11+
protected void onCreate(Bundle savedInstanceState) {
12+
super.onCreate(savedInstanceState);
13+
setContentView(R.layout.activity_change_credentials);
14+
15+
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
16+
17+
if (getIntent().getStringExtra("EXTRA").equals("openFragment")) {
18+
19+
ft.replace(R.id.fragment_credentials_container, new ForgotPasswordFragment());
20+
ft.commit();
21+
}else if (getIntent().getStringExtra("EXTRA").equals("openChangeEmail")){
22+
ft.replace(R.id.fragment_credentials_container, new ChangeEmailFragment());
23+
ft.commit();
24+
}
25+
}
26+
27+
@Override
28+
public boolean onSupportNavigateUp() {
29+
//handle back button action
30+
onBackPressed();
31+
return true;
32+
}
33+
}

‎app/src/main/java/com/example/saar/ChangeCredentials/ChangeEmailFragment.java

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
package com.example.saar.ChangeCredentials;
2+
3+
import android.app.ProgressDialog;
4+
import android.content.Intent;
5+
import android.os.Bundle;
6+
import android.support.annotation.NonNull;
7+
import android.support.annotation.Nullable;
8+
import android.support.v4.app.Fragment;
9+
import android.util.Log;
10+
import android.view.LayoutInflater;
11+
import android.view.View;
12+
import android.view.ViewGroup;
13+
import android.widget.Button;
14+
import android.widget.EditText;
15+
import android.widget.Toast;
16+
17+
import com.android.volley.AuthFailureError;
18+
import com.android.volley.DefaultRetryPolicy;
19+
import com.android.volley.Request;
20+
import com.android.volley.RequestQueue;
21+
import com.android.volley.Response;
22+
import com.android.volley.VolleyError;
23+
import com.android.volley.toolbox.StringRequest;
24+
import com.android.volley.toolbox.Volley;
25+
import com.example.saar.Constant;
26+
import com.example.saar.OtpActivity;
27+
import com.example.saar.R;
28+
29+
import org.json.JSONArray;
30+
import org.json.JSONException;
31+
import org.json.JSONObject;
32+
33+
import java.util.HashMap;
34+
import java.util.Map;
35+
36+
import timber.log.Timber;
37+
38+
public class ChangeEmailFragment extends Fragment {
39+
40+
EditText old_email, new_email, password, rollno;
41+
Button emailChangeButton;
42+
ProgressDialog progressDialog;
43+
44+
@Override
45+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
46+
Bundle savedInstanceState) {
47+
// Inflate the layout for this fragment
48+
View rootView = inflater.inflate(R.layout.fragment_change_email, container, false);
49+
old_email=rootView.findViewById(R.id.old_email_text);
50+
new_email=rootView.findViewById(R.id.new_email_text);
51+
password=rootView.findViewById(R.id.password_text);
52+
rollno=rootView.findViewById(R.id.roll_text);
53+
emailChangeButton=rootView.findViewById(R.id.email_change_button);
54+
return rootView;
55+
}
56+
57+
@Override
58+
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
59+
super.onViewCreated(view, savedInstanceState);
60+
getActivity().setTitle(R.string.change_email);
61+
62+
emailChangeButton.setOnClickListener(new View.OnClickListener() {
63+
@Override
64+
public void onClick(View v) {
65+
requestEmailChange();
66+
}
67+
});
68+
}
69+
70+
private void requestEmailChange() {
71+
progressDialog = new ProgressDialog(getActivity());
72+
progressDialog.setMessage("Sending request....");
73+
progressDialog.show();
74+
StringRequest stringRequest = new StringRequest(Request.Method.POST, Constant.CHANGE_EMAIL_URL, new Response.Listener<String>() {
75+
76+
@Override
77+
public void onResponse(String response) {
78+
progressDialog.dismiss();
79+
Timber.d(response);
80+
Log.d("KHANKI","Response - " +response);
81+
try {
82+
JSONObject jsonObject = new JSONObject(response);
83+
int status = Integer.parseInt(jsonObject.getString("status"));
84+
if (status == 203) {
85+
Timber.d(getString(R.string.change_email_success));
86+
Toast.makeText(getContext(), getString(R.string.change_email_success), Toast.LENGTH_LONG).show();
87+
Intent intent = new Intent(getActivity(), OtpActivity.class);
88+
intent.putExtra("rollno", rollno.getText().toString());
89+
startActivity(intent);
90+
91+
} else {
92+
93+
JSONArray jsonArray = jsonObject.getJSONArray("messages");
94+
Timber.d(getString(R.string.change_email_failure));
95+
Toast.makeText(getContext(), getString(R.string.change_email_failure), Toast.LENGTH_LONG).show();
96+
}
97+
98+
} catch (JSONException e) {
99+
e.printStackTrace();
100+
}
101+
102+
103+
}
104+
}, new Response.ErrorListener() {
105+
@Override
106+
public void onErrorResponse(VolleyError error) {
107+
// signupProgress.setVisibility(View.GONE);
108+
progressDialog.dismiss();
109+
Timber.d(error.toString());
110+
}
111+
112+
}) {
113+
protected Map<String, String> getParams() throws AuthFailureError {
114+
Map<String, String> params = new HashMap<String, String>();
115+
params.put("new_email", new_email.getText().toString());
116+
params.put("old_email", old_email.getText().toString());
117+
params.put("password", password.getText().toString());
118+
119+
return params;
120+
}
121+
};
122+
stringRequest.setRetryPolicy(new DefaultRetryPolicy(
123+
10000,
124+
DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
125+
DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
126+
127+
RequestQueue requestQueue = Volley.newRequestQueue(getContext());
128+
Request<String> data = requestQueue.add(stringRequest);
129+
}
130+
}

‎app/src/main/java/com/example/saar/ChangeCredentials/ChangePasswordFragment.java

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.example.saar.ChangeCredentials;
2+
3+
import android.os.Bundle;
4+
import android.support.annotation.NonNull;
5+
import android.support.annotation.Nullable;
6+
import android.support.v4.app.Fragment;
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.example.saar.R;
12+
13+
public class ChangePasswordFragment extends Fragment {
14+
15+
@Override
16+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
17+
Bundle savedInstanceState) {
18+
// Inflate the layout for this fragment
19+
return inflater.inflate(R.layout.fragment_change_password, container, false);
20+
}
21+
22+
@Override
23+
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
24+
super.onViewCreated(view, savedInstanceState);
25+
getActivity().setTitle(R.string.change_password_fragment);
26+
}
27+
}

‎app/src/main/java/com/example/saar/ChangeCredentials/ForgotPasswordFragment.java

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.example.saar.ChangeCredentials;
2+
3+
import android.os.Bundle;
4+
import android.support.annotation.NonNull;
5+
import android.support.annotation.Nullable;
6+
import android.support.v4.app.Fragment;
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
11+
import com.example.saar.R;
12+
13+
public class ForgotPasswordFragment extends Fragment {
14+
15+
@Override
16+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
17+
Bundle savedInstanceState) {
18+
// Inflate the layout for this fragment
19+
return inflater.inflate(R.layout.fragment_forgot_password, container, false);
20+
}
21+
22+
@Override
23+
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
24+
super.onViewCreated(view, savedInstanceState);
25+
getActivity().setTitle(R.string.forgot_password);
26+
}
27+
}

‎app/src/main/java/com/example/saar/Constant.java

+31-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,39 @@ public class Constant {
44
public static final String FACEBOOK_LINK = "https://www.facebook.com/saar.iitp/";
55
public static final String INSTAGRAM_LINK = "https://www.instagram.com/saar.iitp/";
66
public static final String TWITTER_LINK = "https://twitter.com/saar_iitp";
7-
public static final String LINKEDIN_LINK = "https://www.linkedin.com/company/saar-iitp";
7+
public static final String SAAR_LINKEDIN_LINK = "https://www.linkedin.com/company/saar-iitp";
88
public static final String YOUTUBE_LINK = "https://www.youtube.com/channel/UCoAb1YggffbfgVxQyXaZB-g";
99
public static final String WEBSITE_LINK = "https://saar.iitp.ac.in/";
1010
public static final String DONATE_LINK = "https://www.onlinesbi.com/sbicollect/icollecthome.htm";
1111
public static final String BASE_URL = "https://atm1504.in";
12+
public static final String LOGIN_URL = "https://saar-server.000webhostapp.com/functions/login.php";
13+
public static final String OTP_URL = "https://saar-server.000webhostapp.com/functions/verifyOTP.php";
14+
public static final String SIGNUP_URL = "https://saar-server.000webhostapp.com/functions/signup.php";
15+
public static final String CHANGE_EMAIL_URL = "https://saar-server.000webhostapp.com/functions/changeEmail.php";
16+
public static final String UPDATE_PROFILE_URL = "https://saar-server.000webhostapp.com/functions/updateProfile.php";
17+
public static final String UPDATE_PROFILE_IMAGE = "https://saar-server.000webhostapp.com/functions/profile_image.php";
18+
19+
//Store user profile data
20+
public static final String LOGIN_STATUS = "login_status";
21+
public static final String EMAIL = "email";
22+
public static final String ROLLNO = "rollno";
23+
public static final String FIRST_NAME = "first_name";
24+
public static final String LAST_NAME = "last_name";
25+
public static final String PHONE = "phone";
26+
public static final String FB_LINK = "fb_link";
27+
public static final String LINKEDIN_LINK = "linkedin_link";
28+
public static final String DOB = "dob";
29+
public static final String GRADUATION_YEAR = "graduation_year";
30+
public static final String DEGREE = "degree";
31+
public static final String DEPARTMENT = "department";
32+
public static final String EMPLOYEMENT_TYPE = "employment_type";
33+
public static final String PRESENT_EMPLOYER = "present_employer";
34+
public static final String DESIGNATION = "designation";
35+
public static final String ADDRESS = "address";
36+
public static final String COUNTRY = "country";
37+
public static final String STATE = "state";
38+
public static final String CITY = "city";
39+
public static final String ACHIEVEMENTS = "achievements";
40+
public static final String IMG_URL = "img_url";
41+
1242
}

0 commit comments

Comments
 (0)