ArenaControl

ScCraftRU · Feb 16, 2018 · b1b0927 · b1b0927
1 parent 0e65d99
commit b1b0927
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/app/src/main/java/ru/sccraft/arenacontrol/MainActivity.java b/app/src/main/java/ru/sccraft/arenacontrol/MainActivity.java
@@ -7,12 +7,10 @@
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
 import java.util.ArrayList;
@@ -21,23 +19,21 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    private static final String LOG_TAG = "MainActivity";
     Server[] сервер;
     String[] file;
     Fe fe;
     ListView lv;
-    String[] s;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         fe = new Fe(this);
         setContentView(R.layout.activity_main);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        lv = (ListView) findViewById(R.id.listView_main);
+        lv = findViewById(R.id.listView_main);
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        FloatingActionButton fab = findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -54,12 +50,14 @@ protected void onResume() {
         file = fileList();
         if (file.length == 0) {
             //нет серверов
+            setTitle(R.string.noServers);
         } else {
+            setTitle(R.string.app_name);
             {
                 ArrayList<Server> pre = new ArrayList<>();
-                for (int i = 0; i < file.length; i++) {
-                    if (!(file[i].contains(".json"))) continue;
-                    pre.add(Server.fromJSON(fe.getFile(file[i])));
+                for (String файл : file) {
+                    if (!(файл.contains(".json"))) continue;
+                    pre.add(Server.fromJSON(fe.getFile(файл)));
                 }
                 сервер = pre.toArray(new Server[pre.size()]);
             }
@@ -88,12 +86,6 @@ public int compare(Server server, Server t1) {
                     }
                 });
             }
-            s = new String[сервер.length];
-            for (int i = 0; i < сервер.length; i++) {
-                s[i] = сервер[i].имя_сервера;
-                Log.d(LOG_TAG, "Сервер: " + s[i]);
-            }
-            //ArrayAdapter<String> aa = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, s);
             ServerAdapter адаптер = new ServerAdapter(this, сервер);
             lv.setAdapter(адаптер);
             lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -92,4 +92,5 @@
     <string name="player_whitelist_add">Добавить</string>
     <string name="player_whitelist_remove">Удалить</string>
     <string name="serverActivity_error">Неверный токен или нет подключения к интернету</string>
+    <string name="noServers">Нет серверов</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -100,4 +100,5 @@
     <string name="player_whitelist_add">Add</string>
     <string name="player_whitelist_remove">Remove</string>
     <string name="serverActivity_error">Invalid token or no network connection</string>
+    <string name="noServers">No servers</string>
 </resources>