Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull Request For Profile Page #67

Open
wants to merge 12 commits into
base: profile-page
Choose a base branch
from
30 changes: 17 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -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?
<ol>
Expand All @@ -18,19 +22,19 @@ Giving The Community A Common Platform Where Student's, Developers Together Can
<li>Popular Apps</li>
</ol>

## Maintainers
<ul>
<li>Kshitij Suri</li>
<li>pallab (Pallab Kalita)</li>
<li>maddySmith (Maddala Krishnachaitanya)</li>
<li>SABDAR SHAIK</li>
<li>thisismenaseem</li>
<li>Suhanshu Patel</li>
<li>Mohan Cm</li>
</ul>
## 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 <a href="https://github.com/UdacityAndroidBasicsScholarship/audacity/blob/master/CONTRIBUTING.md"> Here </a>

## How You Can Contribute? ##
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<activity android:name=".LoginActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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) {
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Binary file added app/src/main/res/drawable/audacity_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/dash.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="line">

<stroke android:color="@color/editTextBG"
android:width="1dp"
android:dashGap="1.5dp"
android:dashWidth="3dp"/>

</shape>
Binary file added app/src/main/res/drawable/img_authentication.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/img_checkbox_uncheck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/img_user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/logo.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/logo1.jpg
Binary file not shown.
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/round_google.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="#DEB887"/>
<stroke android:color="#8A2BE2" android:width="2dp" />
<!--corners allow us to make the rounded corners button-->
<corners android:radius="15dp" />
</shape>
</item>
</selector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/square.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/colorPrimary" />
</shape>
Binary file added app/src/main/res/font/google_sans.ttf
Binary file not shown.
Binary file added app/src/main/res/font/google_sans_bold.ttf
Binary file not shown.
Binary file not shown.
Binary file added app/src/main/res/font/google_sans_italic.ttf
Binary file not shown.
Loading