Skip to content

I
InstiApp
Commit c63f58a8 authored by Varun Patil's avatar Varun Patil
Browse files
Options

Make some more fixes

parent a25f9ca7
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 14 deletions
app/src/main/assets/login.html
View file @ c63f58a8
<!DOCTYPE HTML>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
a {
-webkit-tap-highlight-color: transparent;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.logodiv {
width: 45%;
margin: 0 auto;
......@@ -15,9 +27,14 @@
font-weight: 200;
font-size: 1.5em;
}
.gap {
height: 35%;
.lowerdiv {
position: fixed;
bottom: 8%;
left: 0;
width: 100%;
}
.logindiv {
margin: 0 auto;
width: 100%;
......@@ -54,8 +71,7 @@
<div class="app-name">InstiApp</div>
</div>
<div class="gap"></div>
<div class="lowerdiv">
<div class="logindiv">
<a class="login" href="https://gymkhana.iitb.ac.in/sso/account/login/?next=/sso/oauth/authorize/%3Fclient_id%3DvR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ%26response_type%3Dcode%26scope%3Dbasic%2520profile%2520picture%2520sex%2520ldap%2520phone%2520insti_address%2520program%2520secondary_emails%26redirect_uri=https://redirecturi">
LOG IN VIA SSO
......@@ -67,5 +83,6 @@
Continue as a Guest
</a>
</div>
</div>
</body>
</html>
\ No newline at end of file
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java
View file @ c63f58a8
......@@ -144,6 +144,14 @@ public class LoginActivity extends AppCompatActivity {
login(authCode, redirectUri.toString(), authCode);
return true;
}
/* Guest Login */
if (url.startsWith("https://guesturi")) {
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
startActivity(intent);
return true;
}
/* Load URL */
view.loadUrl(url);
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment