drop xml for activity

thermatk · Nov 15, 2017 · d94693b · d94693b
1 parent f294917
commit d94693b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 45 deletions.
diff --git a/app/src/main/java/com/thermatk/android/l/hsewifi/OptionActivity.java b/app/src/main/java/com/thermatk/android/l/hsewifi/OptionActivity.java
@@ -8,7 +8,10 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
 import android.widget.Switch;
+import android.widget.TextView;
 
 public class OptionActivity extends Activity implements Switch.OnCheckedChangeListener {
 
@@ -32,7 +35,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
                         dialogInterface.dismiss();
-                        hideIconSwitch.setChecked(false);
+                        hideIconSwitch.setVisibility(View.GONE);
                     }
                 })
                 .create()
@@ -42,9 +45,27 @@ public void onClick(DialogInterface dialogInterface, int i) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_option);
 
-        hideIconSwitch = (Switch) findViewById(R.id.hide_icon_switch);
+        LinearLayout linearLayout = new LinearLayout(this);
+        linearLayout.setOrientation(LinearLayout.VERTICAL);
+        int padding = SixteenDpFromPix();
+        linearLayout.setPadding(padding,padding,padding,padding);
+
+        TextView textView = new TextView(this);
+        textView.setText(R.string.hello);
+        linearLayout.addView(textView, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+
+        hideIconSwitch = new Switch(this);
+        hideIconSwitch.setText(R.string.hide_icon);
+        linearLayout.addView(hideIconSwitch, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+
+        setContentView(linearLayout, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
         hideIconSwitch.setOnCheckedChangeListener(this);
     }
+
+    private int SixteenDpFromPix() {
+        float scale = getResources().getDisplayMetrics().density;
+        return (int) (16 * scale + 0.5f);
+    }
 }
diff --git a/app/src/main/res/layout/activity_option.xml b/app/src/main/res/layout/activity_option.xml
diff --git a/app/src/main/res/values-sw720dp-land/dimens.xml b/app/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="hello_world">Нечего настраивать :) Приложение работает само, если может.</string>
+    <string name="hello">Нечего настраивать :) Приложение работает само, если может.</string>
     <string name="connectedto">Подключён к HSE</string>
     <string name="authsent">Запрос на аутентификацию отправлен</string>
     <string name="hide_icon">Скрывать значок приложения</string>
-
 </resources>