Skip to content

Commit 3c95886

Browse files
RamolaWebRamolaWeb
authored
Merge pull request #51 from mnprtpsingh/master
Login Activity Modified
2 parents 0499b87 + ddf1ba8 commit 3c95886

File tree

8 files changed

+69
-72
lines changed

8 files changed

+69
-72
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,8 @@ dependencies {
4444
compile 'com.cloudinary:cloudinary-android:1.2.2'
4545
compile 'com.android.support:palette-v7:25.0.1'
4646

47+
compile 'net.steamcrafted:load-toast:1.0.10'
48+
compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
49+
compile 'com.github.florent37:materialleanback:1.0.2'
50+
compile 'com.nineoldandroids:library:2.4.0'
4751
}

‎app/src/main/java/com/nith/appteam/nimbus/Activity/LoginActivity.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
import com.nith.appteam.nimbus.R;
1313
import com.nith.appteam.nimbus.Utils.SharedPref;
1414

15+
import static com.nith.appteam.nimbus.R.id.tvSkip;
16+
1517
public class LoginActivity extends AppCompatActivity {
1618

17-
private TextView tvSkip;
1819
private SharedPref sharedPref;
1920

2021
@Override
@@ -27,17 +28,5 @@ protected void onCreate(Bundle savedInstanceState) {
2728
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
2829
setContentView(R.layout.activity_login);
2930

30-
tvSkip = (TextView)findViewById(R.id.tvSkip);
31-
32-
tvSkip.setOnClickListener(new View.OnClickListener() {
33-
@Override
34-
public void onClick(View v) {
35-
sharedPref.setSkipStatus(true);
36-
sharedPref.setLoginStatus(false);
37-
startActivity(new Intent(LoginActivity.this,MainActivity.class));
38-
finish();
39-
}
40-
});
41-
4231
}
4332
}

‎app/src/main/java/com/nith/appteam/nimbus/Fragment/FbLoginFragment.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.view.View;
1111
import android.view.ViewGroup;
1212
import android.widget.ProgressBar;
13+
import android.widget.TextView;
1314
import android.widget.Toast;
1415

1516
import com.facebook.CallbackManager;
@@ -20,6 +21,7 @@
2021
import com.facebook.login.LoginResult;
2122
import com.facebook.login.widget.LoginButton;
2223
import com.google.gson.annotations.SerializedName;
24+
import com.nith.appteam.nimbus.Activity.LoginActivity;
2325
import com.nith.appteam.nimbus.Activity.MainActivity;
2426
import com.nith.appteam.nimbus.R;
2527
import com.nith.appteam.nimbus.Utils.SharedPref;
@@ -41,6 +43,7 @@
4143
public class FbLoginFragment extends Fragment {
4244

4345
private LoginButton btnLogin;
46+
private TextView tvSkip;
4447
private SharedPref sharedPref;
4548
private ArrayList<String> permissions;
4649
private CallbackManager callbackManager;
@@ -71,6 +74,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
7174
pbLogin = (ProgressBar)view.findViewById(R.id.pbLogin);
7275
btnLogin.setFragment(this);
7376

77+
tvSkip = (TextView)view.findViewById(R.id.tvSkip);
78+
79+
tvSkip.setOnClickListener(new View.OnClickListener() {
80+
@Override
81+
public void onClick(View v) {
82+
sharedPref.setSkipStatus(true);
83+
startActivity(new Intent(getContext(), MainActivity.class));
84+
}
85+
});
86+
7487
permissions = new ArrayList<>();
7588
permissions.add("email");
7689
btnLogin.setReadPermissions(permissions);

‎app/src/main/res/drawable/ic_skip.png‎

1.57 KB
Loading

‎app/src/main/res/layout/activity_login.xml‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
android:paddingBottom="@dimen/activity_vertical_margin"
8-
android:paddingLeft="@dimen/activity_horizontal_margin"
9-
android:paddingRight="@dimen/activity_horizontal_margin"
10-
android:paddingTop="@dimen/activity_vertical_margin"
117
tools:context="com.nith.appteam.nimbus.Activity.LoginActivity">
128

139
<fragment
@@ -16,25 +12,4 @@
1612
android:id="@+id/fragmentLogin"
1713
android:name="com.nith.appteam.nimbus.Fragment.FbLoginFragment"/>
1814

19-
<TextView
20-
android:layout_width="wrap_content"
21-
android:layout_height="wrap_content"
22-
android:visibility="visible"
23-
android:text="SKIP"
24-
android:textStyle="bold"
25-
android:textSize="15sp"
26-
android:textColor="#fff"
27-
android:id="@+id/tvSkip"
28-
android:layout_centerHorizontal="true"
29-
android:layout_below="@+id/btnLogin"
30-
android:layout_marginBottom="12dp"
31-
android:layout_gravity="bottom|center_horizontal"
32-
android:paddingLeft="45dp"
33-
android:paddingRight="45dp"
34-
android:paddingTop="10dp"
35-
android:paddingBottom="10dp"
36-
android:gravity="center"
37-
android:background="#4e000000"
38-
/>
39-
40-
</FrameLayout>
15+
</FrameLayout>

‎app/src/main/res/layout/fragment_fblogin.xml‎

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,51 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:orientation="vertical" android:layout_width="match_parent"
4-
android:layout_height="match_parent">
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent">
55

6-
<ImageView
7-
android:layout_width="220dp"
8-
android:layout_height="220dp"
9-
android:layout_centerHorizontal="true"
10-
android:layout_marginTop="40dp"
11-
android:src="@drawable/nimbuslogo"
12-
android:id="@+id/ivAppLogo"
13-
/>
6+
<ImageView
7+
android:id="@+id/ivAppLogo"
8+
android:layout_width="320dp"
9+
android:layout_height="320dp"
10+
android:layout_centerHorizontal="true"
11+
android:layout_marginTop="54dp"
12+
android:src="@drawable/nimbuslogo" />
1413

15-
<com.facebook.login.widget.LoginButton
16-
android:layout_width="250dp"
17-
android:layout_height="50dp"
18-
android:layout_centerHorizontal="true"
19-
android:layout_below="@+id/ivAppLogo"
20-
android:paddingBottom="15dp"
21-
android:paddingTop="15dp"
22-
android:textSize="15dp"
23-
android:id="@+id/btnLogin"
24-
android:layout_marginTop="50dp"/>
14+
<ProgressBar
15+
android:id="@+id/pbLogin"
16+
android:layout_width="120dp"
17+
android:layout_height="120dp"
18+
android:visibility="gone"
19+
android:layout_alignParentBottom="true"
20+
android:layout_centerHorizontal="true"
21+
android:layout_marginBottom="54dp" />
2522

26-
<ProgressBar
27-
android:layout_width="60dp"
28-
android:layout_height="60dp"
29-
android:layout_below="@+id/btnLogin"
30-
android:layout_centerHorizontal="true"
31-
android:layout_marginTop="100dp"
32-
android:visibility="gone"
33-
android:id="@+id/pbLogin"/>
3423

35-
</RelativeLayout>
24+
<TextView
25+
android:id="@+id/tvSkip"
26+
android:layout_width="60dp"
27+
android:layout_height="60dp"
28+
android:background="@drawable/ic_skip"
29+
android:gravity="center_vertical"
30+
android:paddingLeft="12dp"
31+
android:text="SKIP"
32+
android:textSize="14dp"
33+
android:textStyle="bold"
34+
android:visibility="visible"
35+
android:layout_alignParentBottom="true"
36+
android:layout_alignParentRight="true"
37+
android:layout_marginBottom="8dp"
38+
android:layout_marginRight="8dp"/>
39+
40+
<com.facebook.login.widget.LoginButton
41+
android:id="@+id/btnLogin"
42+
android:layout_width="wrap_content"
43+
android:layout_height="32dp"
44+
android:paddingBottom="16dp"
45+
android:paddingTop="16dp"
46+
android:textSize="16dp"
47+
android:layout_alignParentBottom="true"
48+
android:layout_centerHorizontal="true"
49+
android:layout_marginBottom="100dp" />
50+
51+
</RelativeLayout>

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:2.2.3'
14+
classpath 'com.android.tools.build:gradle:2.3.0'
1515

1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 28 10:00:20 PST 2015
1+
#Fri Mar 03 19:49:20 IST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)