Skip to content

Commit 14da8a5

Browse files
author
Juliana Marques
authored
Merge pull request #1 from julianamarques/update
Login.java movido de models para activities
2 parents 4d37068 + 340df66 commit 14da8a5

File tree

8 files changed

+46
-7
lines changed

8 files changed

+46
-7
lines changed

‎.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎.idea/misc.xml‎

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/app/boletim/activities/CadastroAlunoActivity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.app.boletim.R;
1010
import com.app.boletim.dal.App;
1111
import com.app.boletim.models.Aluno;
12-
import com.app.boletim.models.Login;
1312

1413
import butterknife.BindView;
1514
import butterknife.ButterKnife;

app/src/main/java/com/app/boletim/models/Login.java renamed to app/src/main/java/com/app/boletim/activities/Login.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package com.app.boletim.models;
1+
package com.app.boletim.activities;
22

33
import android.content.Intent;
44
import android.content.SharedPreferences;
55
import android.support.v7.app.AppCompatActivity;
66

77
import com.app.boletim.activities.MainActivity;
8+
import com.app.boletim.models.Aluno;
89

910
/**
1011
* Created by juliana on 15/03/18.

‎app/src/main/java/com/app/boletim/activities/LoginActivity.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22

33
import android.content.Intent;
44
import android.support.design.widget.Snackbar;
5-
import android.support.v7.app.AppCompatActivity;
65
import android.os.Bundle;
76
import android.view.View;
8-
import android.widget.Button;
97
import android.widget.EditText;
10-
import android.widget.TextView;
118

129
import com.app.boletim.R;
1310
import com.app.boletim.dal.App;
1411
import com.app.boletim.models.Aluno;
1512
import com.app.boletim.models.Aluno_;
16-
import com.app.boletim.models.Login;
1713

1814
import java.util.List;
1915

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.2'
12+
classpath 'com.android.tools.build:gradle:3.1.4'
1313
classpath "io.objectbox:objectbox-gradle-plugin:$objectboxVersion"
1414

1515
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)