Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
4647c296
Commit
4647c296
authored
Jul 12, 2017
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ConstraintLayout, fix crash
parent
379b1157
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java
.../main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java
+2
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
...c/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
+1
-1
app/src/main/res/layout/content_main.xml
app/src/main/res/layout/content_main.xml
+2
-2
build.gradle
build.gradle
+1
-1
No files found.
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java
View file @
4647c296
...
@@ -122,6 +122,7 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -122,6 +122,7 @@ public class LoginActivity extends AppCompatActivity {
"AuthCode: "
+
response
.
authorizationCode
,
Toast
.
LENGTH_SHORT
)
"AuthCode: "
+
response
.
authorizationCode
,
Toast
.
LENGTH_SHORT
)
.
show
();
.
show
();
// TODO: Replace gcmId
login
(
response
.
authorizationCode
,
"xyz"
);
login
(
response
.
authorizationCode
,
"xyz"
);
}
else
{
}
else
{
Log
.
i
(
TAG
,
"Authorization failed: "
+
error
.
getMessage
());
Log
.
i
(
TAG
,
"Authorization failed: "
+
error
.
getMessage
());
...
@@ -174,6 +175,7 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -174,6 +175,7 @@ public class LoginActivity extends AppCompatActivity {
@Override
@Override
public
void
onResponse
(
Call
<
LoginResponse
>
call
,
Response
<
LoginResponse
>
response
)
{
public
void
onResponse
(
Call
<
LoginResponse
>
call
,
Response
<
LoginResponse
>
response
)
{
if
(
response
.
isSuccessful
())
{
if
(
response
.
isSuccessful
())
{
//Save credentials in AccountManager to keep user logged in
//Go to MainActivity
//Go to MainActivity
}
}
//Server error
//Server error
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
View file @
4647c296
...
@@ -140,7 +140,7 @@ public class MainActivity extends AppCompatActivity
...
@@ -140,7 +140,7 @@ public class MainActivity extends AppCompatActivity
private
void
updateFragment
(
Fragment
fragment
)
{
private
void
updateFragment
(
Fragment
fragment
)
{
FragmentManager
manager
=
getSupportFragmentManager
();
FragmentManager
manager
=
getSupportFragmentManager
();
FragmentTransaction
transaction
=
manager
.
beginTransaction
();
FragmentTransaction
transaction
=
manager
.
beginTransaction
();
transaction
.
replace
(
R
.
id
.
constraint
layout_for_fragment
,
fragment
,
fragment
.
getTag
());
transaction
.
replace
(
R
.
id
.
frame
layout_for_fragment
,
fragment
,
fragment
.
getTag
());
transaction
.
commit
();
transaction
.
commit
();
}
}
}
}
app/src/main/res/layout/content_main.xml
View file @
4647c296
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<
android.support.constraint.Constraint
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
Frame
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/
constraint
layout_for_fragment"
android:id=
"@+id/
frame
layout_for_fragment"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
app:layout_behavior=
"@string/appbar_scrolling_view_behavior"
app:layout_behavior=
"@string/appbar_scrolling_view_behavior"
...
...
build.gradle
View file @
4647c296
...
@@ -7,7 +7,7 @@ buildscript {
...
@@ -7,7 +7,7 @@ buildscript {
jcenter
()
jcenter
()
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.0.0-alpha
5
'
classpath
'com.android.tools.build:gradle:3.0.0-alpha
6
'
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
// in the individual module build.gradle files
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment