diff --git a/.gitignore b/.gitignore
index 6e29157..5c3311e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+[core]
+ excludesfile = ~/.gitexcludes
+
+
local.properties
# User-specific stuff:
.idea/workspace.xml
@@ -48,7 +52,7 @@ fabric.properties
# modules.xml
# Windows thumbnail cache files
-Thumbs.db
+*Thumbs.db
ehthumbs.db
ehthumbs_vista.db
diff --git a/app/app.iml b/app/app.iml
index a16956c..8b0c423 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,14 +66,6 @@
-
-
-
-
-
-
-
-
@@ -82,6 +74,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java b/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java
index 5ed6104..e1ebf59 100644
--- a/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java
+++ b/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java
@@ -49,7 +49,6 @@ public class CabinetActivity extends AppCompatActivity
public RelativeLayout profileLayout, journalLayout, gRateLayout,
fRateLayout, aboutLayout, progressLayout, newsLayout;
public Toolbar myToolbar;
- public Chronometer timer;
Intent MainA;
FeedController feedController;
OldCabinetController cabinetController;
@@ -305,13 +304,13 @@ public class CabinetActivity extends AppCompatActivity
positionFaculty.setText(getString(R.string.cabinet_faculty_position) + position);
}
- public void fillGroup(){
+ public void updateGroup(){
ArrayAdapter groupL = new groupAdapter(this);
ListView groupList = (ListView) findViewById(R.id.groupList);
groupList.setAdapter(groupL);
}
- public void fillFaculty(){
+ public void updateFaculty(){
ArrayAdapter facultyL = new facultyAdapter(this);
ListView facultyList = (ListView) findViewById(R.id.facultyList);
facultyList.setAdapter(facultyL);
diff --git a/app/src/main/java/ru/defend/defdevteam/tstu/FeedParser.java b/app/src/main/java/ru/defend/defdevteam/tstu/FeedParser.java
index 9b97351..5503293 100644
--- a/app/src/main/java/ru/defend/defdevteam/tstu/FeedParser.java
+++ b/app/src/main/java/ru/defend/defdevteam/tstu/FeedParser.java
@@ -26,5 +26,4 @@ public class FeedParser {
}
-
}
diff --git a/app/src/main/java/ru/defend/defdevteam/tstu/FeedReader.java b/app/src/main/java/ru/defend/defdevteam/tstu/FeedReader.java
index ac195e9..77b9ef7 100644
--- a/app/src/main/java/ru/defend/defdevteam/tstu/FeedReader.java
+++ b/app/src/main/java/ru/defend/defdevteam/tstu/FeedReader.java
@@ -29,7 +29,6 @@ public class FeedReader extends Thread implements FeedController.FeedCallback {
this.threadState = States.THREAD_NULL;
}
-
public void run(){
try {
this.threadState = States.THREAD_WORK;
diff --git a/app/src/main/java/ru/defend/defdevteam/tstu/MainActivity.java b/app/src/main/java/ru/defend/defdevteam/tstu/MainActivity.java
index 7bbefdc..81b998e 100644
--- a/app/src/main/java/ru/defend/defdevteam/tstu/MainActivity.java
+++ b/app/src/main/java/ru/defend/defdevteam/tstu/MainActivity.java
@@ -12,15 +12,12 @@ import android.widget.ImageView;
public class MainActivity extends AppCompatActivity {
private EditText login, password;
- public ImageView logo;
private SharedPreferences sPref;
final String LOGIN = "login";
final String PASSWORD = "password";
final String CHECK = "check";
public CheckBox check;
-
-
public void authButtonOnClick(View v){
if(check.isChecked()){
saveForms();
@@ -83,7 +80,4 @@ public class MainActivity extends AppCompatActivity {
if(check.isChecked()) saveForms();
}
- public void OnSubsListClick(View v) {
-
- }
}
diff --git a/app/src/main/java/ru/defend/defdevteam/tstu/OldCabinetController.java b/app/src/main/java/ru/defend/defdevteam/tstu/OldCabinetController.java
index 285313c..e2402d8 100644
--- a/app/src/main/java/ru/defend/defdevteam/tstu/OldCabinetController.java
+++ b/app/src/main/java/ru/defend/defdevteam/tstu/OldCabinetController.java
@@ -13,11 +13,13 @@ import java.util.List;
*/
public class OldCabinetController {
- boolean authBegin, taskFinished = false;
- static public String AuthURL, MainURL, AdditionalURL ,JournalURL, RateValueURL, GroupRateURL,
+
+ boolean taskFinished = false;
+ static public String MainURL, JournalURL, RateValueURL, GroupRateURL,
FacultyRateURL, siteBuf;
static public String MainHTML, AdditionalHTML, JournalHTML, RateValueHTML, GroupRateHTML,
FacultyRateHTML;
+
public CabinetActivity cabinetActivity;
public OldCabinetController(CabinetActivity cabinet){
@@ -171,7 +173,7 @@ public class OldCabinetController {
}
gr = parser.cutLine("\\n", "", gr);
}
- cabinetActivity.fillGroup();
+ cabinetActivity.updateGroup();
}
public void fillFaculty(){
@@ -194,6 +196,6 @@ public class OldCabinetController {
}
fr = parser.cutLine("\\n", "", fr);
}
- cabinetActivity.fillFaculty();
+ cabinetActivity.updateFaculty();
}
}
diff --git a/app/src/main/java/ru/defend/defdevteam/tstu/OldParser.java b/app/src/main/java/ru/defend/defdevteam/tstu/OldParser.java
index 1f0f0ab..e93e596 100644
--- a/app/src/main/java/ru/defend/defdevteam/tstu/OldParser.java
+++ b/app/src/main/java/ru/defend/defdevteam/tstu/OldParser.java
@@ -21,10 +21,6 @@ public class OldParser {
m.appendTail(buf);
return buf;
}
-//
-// public ArrayList parseGroup(){
-// return null;
-// }
public String cutLine(String a, String b, String Line){
if(Line.contains(a)) Line = Line.substring(Line.indexOf(a)+ a.length());
diff --git a/app/src/main/res/mipmap-xxxhdpi/Thumbs.db b/app/src/main/res/mipmap-xxxhdpi/Thumbs.db
index a3e11b3..d8390bd 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/Thumbs.db and b/app/src/main/res/mipmap-xxxhdpi/Thumbs.db differ