From 9fba40e20c66575a5292732b517189f0deb12dfe Mon Sep 17 00:00:00 2001
From: Defend <itsmylivex@gmail.com>
Date: Sun, 12 Feb 2017 14:52:32 +0300
Subject: [PATCH] Little fixes on code

---
 .gitignore                                    |   6 +++++-
 app/app.iml                                   |  16 ++++++++--------
 .../defdevteam/tstu/CabinetActivity.java      |   5 ++---
 .../ru/defend/defdevteam/tstu/FeedParser.java |   1 -
 .../ru/defend/defdevteam/tstu/FeedReader.java |   1 -
 .../defend/defdevteam/tstu/MainActivity.java  |   6 ------
 .../defdevteam/tstu/OldCabinetController.java |  10 ++++++----
 .../ru/defend/defdevteam/tstu/OldParser.java  |   4 ----
 app/src/main/res/mipmap-xxxhdpi/Thumbs.db     | Bin 11776 -> 13824 bytes
 9 files changed, 21 insertions(+), 28 deletions(-)

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 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
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<GroupList> groupL = new groupAdapter(this);
         ListView groupList = (ListView) findViewById(R.id.groupList);
         groupList.setAdapter(groupL);
     }
 
-    public void fillFaculty(){
+    public void updateFaculty(){
         ArrayAdapter<GroupList> 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("</td></tr>\\n", "", gr);
         }
-        cabinetActivity.fillGroup();
+        cabinetActivity.updateGroup();
     }
 
     public void fillFaculty(){
@@ -194,6 +196,6 @@ public class OldCabinetController {
             }
             fr = parser.cutLine("</td></tr>\\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<CabinetActivity.groupList> 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 a3e11b3203ccbfb9f4d6a3947919184e9278e087..d8390bd716c34ff8317029468707ff52569859c7 100644
GIT binary patch
delta 1723
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

delta 162
zcmZq3X^7dt!^H9*2qp`#xiJ3Q7`U2o5{nNb<77n^dA<WPe?Ajwy2SVoD9^w!xr)V;
zml32E1||oxs<5#zFfa%zO%^oqntX)SX0n2b3y9trxSnxhLf|A04uPMFKovmn?)oJG
k)uTTOHw&7)V3d#miZBB)hO7k73&qJBbon;(nS5dd0RHSh(EtDd