diff --git a/README.md b/README.md
index 1207e4d..cba802d 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,54 @@
# SAAR-Android-Client
+
Android app for [Students' Association for Alumni Relations](https://saar.iitp.ac.in/)-SAAR, IIT Patna
## Overview
+
The SAAR app is an android application to bring together all alumni and former faculties of IIT Patna to share their experiences with each other and with the current students and faculties. The app will maintain and update the database of all alumni of the college. SAAR aims to provide guidance to the present students in their endeavour for better employment and higher studies, improve campus placements with the help of the alumni working in reputed industries in India and abroad, organise seminars, debates, workshops as well as cultural and social welfare programs and publish periodical magazines or bulletins with valuable information useful to the members and students. The SAAR app would ease the process of collecting donations for alumni affairs and it would also send notifications for varios events.
+## Screenshots
+
+
+
+ |
+ |
+
+ |
+ |
+
+ |
+ |
+
+ |
+
+
+
## TODO
-- [ ] Create the basic UI of the app
-- [ ] Build a perfect login and signup system
-- [ ] Create a well maintained alumni database
-- [ ] Send notifications for various events
-- [ ] A working payment gateway to collect donations
+
+- [x] Create the basic UI of the app
+- [x] Build a perfect login and signup system
+- [x] Create a well maintained alumni database
+- [x] Send notifications for various events
## Built With
+
- Client side
- Java
- - Room Persistence Library
+ - Firebase
+ - Retrofit
+ - Gson
+ - Timeline View
+ - Volley
+ - Glide
+ - CircleImageView
+ - Timber
+ - Pin View
+ - Photo View
- Server side
- PHP
## Installing
+
Clone the repository using the following command:
`$ git clone https://github.com/dsciitpatna/SAAR-Android-Client.git`
@@ -26,9 +56,11 @@ Clone the repository using the following command:
Then open in Android Studio.
## Contributing
+
Please read [CONTRIBUTING.md](https://github.com/dsciitpatna/SAAR-Android-Client/blob/development/CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.
## Branch Policy
+
We have the following branches:
- **master** The master branch contains all the stable and bug-free working code. The development branch once complete will be merged with this branch.
diff --git a/app/build.gradle b/app/build.gradle
index ff84a83..760029e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
minSdkVersion 21
targetSdkVersion 28
versionCode 1
- versionName "1.0"
+ versionName "1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/src/main/java/com/example/saar/Login_SignUp/LoginSignupActivity.java b/app/src/main/java/com/example/saar/Login_SignUp/LoginSignupActivity.java
index ec2cded..587a623 100644
--- a/app/src/main/java/com/example/saar/Login_SignUp/LoginSignupActivity.java
+++ b/app/src/main/java/com/example/saar/Login_SignUp/LoginSignupActivity.java
@@ -18,11 +18,13 @@
public class LoginSignupActivity extends AppCompatActivity implements BottomNavigationView.OnNavigationItemSelectedListener {
SharedPreferences preferences;
+ SharedPreferences.Editor sharedPreferenceEditor;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ sharedPreferenceEditor = preferences.edit();
if (preferences.getBoolean(Constant.LOGIN_STATUS, false)) {
//user logged in
Intent intent = new Intent(this, MainActivity.class);
@@ -75,6 +77,8 @@ private boolean loadFragment(Fragment fragment) {
@Override
public void onBackPressed() {
super.onBackPressed();
+ sharedPreferenceEditor.putBoolean(Constant.SKIP_LOGIN, true);
+ sharedPreferenceEditor.apply();
Intent intent = new Intent(getApplicationContext(), MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
diff --git a/app/src/main/java/com/example/saar/MainActivity.java b/app/src/main/java/com/example/saar/MainActivity.java
index 1f07108..f2815ce 100644
--- a/app/src/main/java/com/example/saar/MainActivity.java
+++ b/app/src/main/java/com/example/saar/MainActivity.java
@@ -61,7 +61,7 @@ protected void onCreate(Bundle savedInstanceState) {
preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
- if(!preferences.getBoolean(Constant.LOGIN_STATUS,false) && !preferences.getBoolean(Constant.SKIP_LOGIN,false)){
+ if (!preferences.getBoolean(Constant.LOGIN_STATUS, false) && !preferences.getBoolean(Constant.SKIP_LOGIN, false)) {
startActivity(new Intent(this, LoginSignupActivity.class));
}
@@ -140,10 +140,11 @@ private void showHomeFragment() {
@Override
public void onBackPressed() {
+ Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.content_frame);
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
if (drawer.isDrawerOpen(GravityCompat.START)) {
drawer.closeDrawer(GravityCompat.START);
- } else if (fragment instanceof HomeFragment) {
+ } else if (currentFragment instanceof HomeFragment) {
super.onBackPressed();
} else {
showHomeFragment();
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 31ad412..aaa842e 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="navigation_view">
-
+
- 56dp
- 250dp
+ 200dp
10dp
10dp
20dp
@@ -32,7 +32,7 @@
5dp
10dp
30dp
- 128dp
+ 100dp
32dp