diff --git a/README.md b/README.md index 7d24dbf..5dadd5d 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ -# audacity +# Audacity -A Collabrative Project under Udacity Scholarship Programme -Giving The Community A Common Platform Where Student's, Developers Together Can Showcase Their Work And Build Their Personal Portfolio. Feel Free To Share And Experience Everything Around Udacity +Breif Idea: +'Giving The Community A Common Platform Where Student's, Developers Together Can Showcase Their Work And Build Their Personal Portfolio. Feel Free To Share And Experience Everything Around Udacity` + +## Disclaimer +> `This project is only for the students who participated in Udacity Scholarship Programme.` ## What's Included?
    @@ -18,19 +22,19 @@ Giving The Community A Common Platform Where Student's, Developers Together Can
  1. Popular Apps
-## Maintainers - +## Project Maintained by: + +* [Kshitij Suri](https://github.com/kshitijsuri90) +* [pallab (Pallab Kalita)](#) +* [maddySmith (Maddala Krishnachaitanya)](https://github.com/sloth-grrr) +* [SABDAR SHAIK](https://github.com/sabdar18) +* [Suhanshu Patel](https://github.com/Suhanshu123) +* [Mohan Cm](https://github.com/mohancm) +* [Naseem](https://github.com/naseemali925) +* [Ankush S Shetkar](https://github.com/lifeLessCoder) ## Contributors -All Google Udacity Andriod Basics Scholars are eligible to Contribute. +All Google Udacity Android Basics Scholars are eligible to Contribute. Please Read The Contributing Guide Here ## How You Can Contribute? ## diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dc2d4f2..432cdff 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/LoginActivity"> diff --git a/app/src/main/java/com/example/android/audacity/DashboardActivity.java b/app/src/main/java/com/example/android/audacity/DashboardActivity.java index d177ada..a5f96a5 100644 --- a/app/src/main/java/com/example/android/audacity/DashboardActivity.java +++ b/app/src/main/java/com/example/android/audacity/DashboardActivity.java @@ -22,6 +22,9 @@ import com.example.android.audacity.fragments.HottestAppFragment; import com.example.android.audacity.fragments.QuizzesFragment; import com.example.android.audacity.fragments.ResultsFragment; +import com.google.android.gms.auth.api.signin.GoogleSignIn; +import com.google.android.gms.auth.api.signin.GoogleSignInClient; +import com.google.android.gms.auth.api.signin.GoogleSignInOptions; import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseUser; @@ -30,6 +33,8 @@ public class DashboardActivity extends AppCompatActivity implements NavigationVi private DrawerLayout mDrawer; private NavigationView mNavigationView; private FirebaseAuth mFirebaseAuth; + private GoogleSignInOptions gso; + private GoogleSignInClient mGoogleSignInClient; @Override protected void onCreate(Bundle savedInstanceState) { @@ -40,8 +45,15 @@ protected void onCreate(Bundle savedInstanceState) { if (mFirebaseAuth == null) { startActivity(new Intent(this, LoginActivity.class)); finish(); - } + + gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) + .requestIdToken(getString(R.string.default_web_client_id)) + .requestEmail() + .build(); + + mGoogleSignInClient = GoogleSignIn.getClient(this, gso); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); mDrawer = findViewById(R.id.drawer_layout); @@ -140,6 +152,7 @@ public boolean onOptionsItemSelected(MenuItem item) { break; case R.id.nav_sign_out: if (mFirebaseAuth != null) { + mGoogleSignInClient.signOut(); mFirebaseAuth.signOut(); Intent intent1 = new Intent(DashboardActivity.this, LoginActivity.class); startActivity(intent1); diff --git a/app/src/main/res/drawable/audacity_logo.png b/app/src/main/res/drawable/audacity_logo.png new file mode 100644 index 0000000..eeccb23 Binary files /dev/null and b/app/src/main/res/drawable/audacity_logo.png differ diff --git a/app/src/main/res/drawable/dash.xml b/app/src/main/res/drawable/dash.xml new file mode 100644 index 0000000..e28b3b4 --- /dev/null +++ b/app/src/main/res/drawable/dash.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/img_authentication.png b/app/src/main/res/drawable/img_authentication.png new file mode 100644 index 0000000..ca74709 Binary files /dev/null and b/app/src/main/res/drawable/img_authentication.png differ diff --git a/app/src/main/res/drawable/img_checkbox_checked.png b/app/src/main/res/drawable/img_checkbox_checked.png new file mode 100644 index 0000000..55c30ee Binary files /dev/null and b/app/src/main/res/drawable/img_checkbox_checked.png differ diff --git a/app/src/main/res/drawable/img_checkbox_uncheck.png b/app/src/main/res/drawable/img_checkbox_uncheck.png new file mode 100644 index 0000000..273e7de Binary files /dev/null and b/app/src/main/res/drawable/img_checkbox_uncheck.png differ diff --git a/app/src/main/res/drawable/img_user.png b/app/src/main/res/drawable/img_user.png new file mode 100644 index 0000000..d28978d Binary files /dev/null and b/app/src/main/res/drawable/img_user.png differ diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png deleted file mode 100644 index 28f00c1..0000000 Binary files a/app/src/main/res/drawable/logo.png and /dev/null differ diff --git a/app/src/main/res/drawable/logo1.jpg b/app/src/main/res/drawable/logo1.jpg deleted file mode 100644 index 47615ba..0000000 Binary files a/app/src/main/res/drawable/logo1.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/round_google.xml b/app/src/main/res/drawable/round_google.xml new file mode 100644 index 0000000..8540351 --- /dev/null +++ b/app/src/main/res/drawable/round_google.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/square.xml b/app/src/main/res/drawable/square.xml new file mode 100644 index 0000000..eeb7e92 --- /dev/null +++ b/app/src/main/res/drawable/square.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/google_sans.ttf b/app/src/main/res/font/google_sans.ttf new file mode 100644 index 0000000..ab605f9 Binary files /dev/null and b/app/src/main/res/font/google_sans.ttf differ diff --git a/app/src/main/res/font/google_sans_bold.ttf b/app/src/main/res/font/google_sans_bold.ttf new file mode 100644 index 0000000..8049766 Binary files /dev/null and b/app/src/main/res/font/google_sans_bold.ttf differ diff --git a/app/src/main/res/font/google_sans_bold_italic.ttf b/app/src/main/res/font/google_sans_bold_italic.ttf new file mode 100644 index 0000000..e940d02 Binary files /dev/null and b/app/src/main/res/font/google_sans_bold_italic.ttf differ diff --git a/app/src/main/res/font/google_sans_italic.ttf b/app/src/main/res/font/google_sans_italic.ttf new file mode 100644 index 0000000..bfb1a2c Binary files /dev/null and b/app/src/main/res/font/google_sans_italic.ttf differ diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 1ba52ad..ca122b1 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,19 +1,240 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +