cse437_e / smartdoorlock-frontend

Go to a project
Toggle navigation Toggle navigation pinning
sunnnl
d0df0373 1 parent 7a83c47f

스플래시 뷰 visibility 수정

Inline Side-by-side
Showing 2 changed files with 15 additions and 12 deletions
...@@ -26,6 +26,7 @@ import java.util.TimerTask; ...@@ -26,6 +26,7 @@ import java.util.TimerTask;
26 26
27 public class MainActivity extends AppCompatActivity { 27 public class MainActivity extends AppCompatActivity {
28 28
29 + private Button btnSetting;
29 private Button mBtnTagControl; 30 private Button mBtnTagControl;
30 private ImageView mBtnTagControlBackground; 31 private ImageView mBtnTagControlBackground;
31 private TextView mTvTagButtonStatus, mTvTagButtonStatusDetail; 32 private TextView mTvTagButtonStatus, mTvTagButtonStatusDetail;
...@@ -42,6 +43,14 @@ public class MainActivity extends AppCompatActivity { ...@@ -42,6 +43,14 @@ public class MainActivity extends AppCompatActivity {
42 43
43 init(); 44 init();
44 timer = new TagTimer(5 * 1000, 1000, 5); 45 timer = new TagTimer(5 * 1000, 1000, 5);
46 +
47 + btnSetting = (Button) findViewById(R.id.btn_setting);
48 + btnSetting.setOnClickListener(new View.OnClickListener() {
49 + @Override
50 + public void onClick(View view) {
51 + startActivity(new Intent(MainActivity.this, SettingActivity.class));
52 + }
53 + });
45 } 54 }
46 55
47 // 툴바 설정 56 // 툴바 설정
......
...@@ -7,15 +7,6 @@ ...@@ -7,15 +7,6 @@
7 android:background="@color/colorBackground" 7 android:background="@color/colorBackground"
8 tools:context=".ui.SplashActivity"> 8 tools:context=".ui.SplashActivity">
9 9
10 - <ImageView
11 - android:id="@+id/img_test"
12 - android:layout_width="wrap_content"
13 - android:layout_height="wrap_content"
14 - android:src="@drawable/ic_launcher_background"
15 - app:layout_constraintStart_toStartOf="parent"
16 - app:layout_constraintTop_toTopOf="parent"
17 - android:visibility="invisible"/>
18 -
19 <LinearLayout 10 <LinearLayout
20 android:id="@+id/ll_logo" 11 android:id="@+id/ll_logo"
21 android:layout_width="wrap_content" 12 android:layout_width="wrap_content"
...@@ -76,11 +67,14 @@ ...@@ -76,11 +67,14 @@
76 android:id="@+id/cl_enter" 67 android:id="@+id/cl_enter"
77 android:layout_width="0dp" 68 android:layout_width="0dp"
78 android:layout_height="0dp" 69 android:layout_height="0dp"
70 + app:layout_constraintWidth_default="percent"
71 + app:layout_constraintWidth_percent="0.12"
72 + app:layout_constraintDimensionRatio="52:36"
79 android:layout_marginStart="10dp" 73 android:layout_marginStart="10dp"
80 android:visibility="invisible" 74 android:visibility="invisible"
81 - app:layout_constraintStart_toStartOf="parent" 75 + app:layout_constraintStart_toEndOf="@+id/til_super_key"
82 - app:layout_constraintEnd_toEndOf="parent" 76 + app:layout_constraintEnd_toEndOf="@+id/ll_logo"
83 - app:layout_constraintTop_toTopOf="parent"> 77 + app:layout_constraintTop_toTopOf="@+id/til_super_key">
84 78
85 <Button 79 <Button
86 android:id="@+id/btn_enter" 80 android:id="@+id/btn_enter"
......