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

Added Login and sign up layout #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- Clone on your local machine

```terminal
git clone https://github.com/example
git clone https://github.com/dsc-iem/Dristi-Hacktoberfest22.git
```
- Navigate to project directory.
```terminal
Expand Down Expand Up @@ -44,7 +44,7 @@ git push origin my-new-branch
An easy way to avoid conflicts is to add an 'upstream' for your git repo, as other PR's may be merged while you're working on your branch/fork.

```terminal
git remote add upstream https://github.com/fineanmol/Hacktoberfest2022
git remote add upstream https://github.com/dsc-iem/Dristi-Hacktoberfest22.git
```

You can verify that the new remote has been added by typing
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<p align="center">
<a href="https://blogbook-blog.herokuapp.com/">
<img src="https://github.com/Rohit-554/Project-Template-Hacktoberfest22/blob/main/student.svg" alt="[Project Logo]" width="30%">
<img src="https://github.com/dsc-iem/Dristi-Hacktoberfest22/blob/master/App_logo1.svg" alt="[Project Logo]" width="30%">
</a>
</p>

# Dristi : A guide to college freshers
# Dristi : Look Beyond
## ⭐ About Dristi
**Dristi is an application that aims for bringing ones ideas, thoughts to the virtual world . So you can post your fav picture tell your experience , Others will like or comment on it .**
## 🧑‍💻 Tech Stack / Prerequisites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ import android.os.Bundle
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
setContentView(R.layout.activity_login)
}
}
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/vect_email.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10h5v-2h-5c-4.34,0 -8,-3.66 -8,-8s3.66,-8 8,-8 8,3.66 8,8v1.43c0,0.79 -0.71,1.57 -1.5,1.57s-1.5,-0.78 -1.5,-1.57L17,12c0,-2.76 -2.24,-5 -5,-5s-5,2.24 -5,5 2.24,5 5,5c1.38,0 2.64,-0.56 3.54,-1.47 0.65,0.89 1.77,1.47 2.96,1.47 1.97,0 3.5,-1.6 3.5,-3.57L22,12c0,-5.52 -4.48,-10 -10,-10zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z"/>
</vector>
18 changes: 18 additions & 0 deletions app/src/main/res/drawable/vect_google.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M5.2662,9.7645C6.1988,6.9386 8.8544,4.9091 12,4.9091C13.6909,4.9091 15.2182,5.5091 16.4182,6.4909L19.9091,3C17.7818,1.1455 15.0545,0 12,0C7.2701,0 3.1977,2.6983 1.24,6.65L5.2662,9.7645Z"
android:fillColor="#EA4335"/>
<path
android:pathData="M16.0407,18.0126C14.9509,18.7163 13.5661,19.0909 12,19.0909C8.8665,19.0909 6.2191,17.0769 5.277,14.2679L1.2375,17.335C3.1928,21.2936 7.265,24 12,24C14.9328,24 17.7353,22.9574 19.8342,20.9996L16.0407,18.0126Z"
android:fillColor="#34A853"/>
<path
android:pathData="M19.8342,20.9996C22.0292,18.9521 23.4545,15.9037 23.4545,12C23.4545,11.2909 23.3455,10.5273 23.1818,9.8182L12,9.8182L12,14.4545L18.4364,14.4545C18.1188,16.0136 17.2663,17.2212 16.0407,18.0126L19.8342,20.9996Z"
android:fillColor="#4A90E2"/>
<path
android:pathData="M5.277,14.2679C5.0383,13.5563 4.9091,12.7938 4.9091,12C4.9091,11.2183 5.0344,10.4668 5.2662,9.7645L1.24,6.65C0.4366,8.2604 0,10.0754 0,12C0,13.9195 0.4448,15.7302 1.2375,17.335L5.277,14.2679Z"
android:fillColor="#FBBC05"/>
</vector>
1,042 changes: 1,042 additions & 0 deletions app/src/main/res/drawable/vect_login.xml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions app/src/main/res/drawable/vect_name.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/vect_password.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
</vector>
Loading