cse437_e / smartdoorlock-frontend

Go to a project
Toggle navigation Toggle navigation pinning
sunnnl
165fe59d 1 parent 53193dc0

main activity publishing

Inline Side-by-side
Showing 141 changed files with 514 additions and 17 deletions
...@@ -15,13 +15,17 @@ ...@@ -15,13 +15,17 @@
15 <activity android:name=".ui.SplashActivity" 15 <activity android:name=".ui.SplashActivity"
16 android:screenOrientation="fullSensor" 16 android:screenOrientation="fullSensor"
17 android:noHistory="true"> 17 android:noHistory="true">
18 +
19 + </activity>
20 + <activity android:name=".ui.MainActivity" >
21 +
18 <intent-filter> 22 <intent-filter>
19 <action android:name="android.intent.action.MAIN" /> 23 <action android:name="android.intent.action.MAIN" />
20 24
21 <category android:name="android.intent.category.LAUNCHER" /> 25 <category android:name="android.intent.category.LAUNCHER" />
22 </intent-filter> 26 </intent-filter>
27 +
23 </activity> 28 </activity>
24 - <activity android:name=".ui.MainActivity" />
25 </application> 29 </application>
26 30
27 </manifest> 31 </manifest>
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.sunnni.smartdoorlock.ui; 1 package com.sunnni.smartdoorlock.ui;
2 2
3 import androidx.appcompat.app.AppCompatActivity; 3 import androidx.appcompat.app.AppCompatActivity;
4 +import androidx.appcompat.widget.Toolbar;
4 5
5 import android.os.Bundle; 6 import android.os.Bundle;
6 7
7 import com.sunnni.smartdoorlock.R; 8 import com.sunnni.smartdoorlock.R;
8 9
10 +import java.util.Objects;
11 +
9 public class MainActivity extends AppCompatActivity { 12 public class MainActivity extends AppCompatActivity {
10 13
14 + private Toolbar mToolbar;
15 +
11 @Override 16 @Override
12 protected void onCreate(Bundle savedInstanceState) { 17 protected void onCreate(Bundle savedInstanceState) {
13 super.onCreate(savedInstanceState); 18 super.onCreate(savedInstanceState);
14 setContentView(R.layout.activity_main); 19 setContentView(R.layout.activity_main);
20 +
21 + setToolbar();
22 + }
23 +
24 + // 툴바 설정
25 + private void setToolbar(){
26 + mToolbar = findViewById(R.id.toolbar_main);
27 + setSupportActionBar(mToolbar);
28 + Objects.requireNonNull(getSupportActionBar()).setDisplayShowCustomEnabled(true);
29 + getSupportActionBar().setDisplayShowTitleEnabled(false);
30 + getSupportActionBar().setDisplayHomeAsUpEnabled(true);
31 + getSupportActionBar().setHomeAsUpIndicator(R.drawable.baseline_menu_white_24);
15 } 32 }
16 } 33 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,14 +3,17 @@ package com.sunnni.smartdoorlock.ui; ...@@ -3,14 +3,17 @@ package com.sunnni.smartdoorlock.ui;
3 import androidx.appcompat.app.AppCompatActivity; 3 import androidx.appcompat.app.AppCompatActivity;
4 import androidx.constraintlayout.widget.ConstraintLayout; 4 import androidx.constraintlayout.widget.ConstraintLayout;
5 5
6 +import android.annotation.SuppressLint;
6 import android.content.Intent; 7 import android.content.Intent;
7 import android.os.Bundle; 8 import android.os.Bundle;
8 import android.os.Handler; 9 import android.os.Handler;
9 import android.util.Log; 10 import android.util.Log;
11 +import android.view.MotionEvent;
10 import android.view.View; 12 import android.view.View;
11 import android.view.animation.Animation; 13 import android.view.animation.Animation;
12 import android.view.animation.AnimationUtils; 14 import android.view.animation.AnimationUtils;
13 import android.widget.Button; 15 import android.widget.Button;
16 +import android.widget.ImageView;
14 import android.widget.LinearLayout; 17 import android.widget.LinearLayout;
15 import android.widget.Toast; 18 import android.widget.Toast;
16 19
...@@ -27,6 +30,9 @@ public class SplashActivity extends AppCompatActivity { ...@@ -27,6 +30,9 @@ public class SplashActivity extends AppCompatActivity {
27 30
28 private Animation logoAnimation; 31 private Animation logoAnimation;
29 32
33 + private ImageView test;
34 +
35 + @SuppressLint("ClickableViewAccessibility")
30 @Override 36 @Override
31 protected void onCreate(Bundle savedInstanceState) { 37 protected void onCreate(Bundle savedInstanceState) {
32 super.onCreate(savedInstanceState); 38 super.onCreate(savedInstanceState);
...@@ -39,6 +45,8 @@ public class SplashActivity extends AppCompatActivity { ...@@ -39,6 +45,8 @@ public class SplashActivity extends AppCompatActivity {
39 45
40 logoAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_bottom_up); 46 logoAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_bottom_up);
41 47
48 + test = findViewById(R.id.img_test);
49 +
42 splashLoading(); 50 splashLoading();
43 init(); 51 init();
44 } 52 }
...@@ -52,20 +60,49 @@ public class SplashActivity extends AppCompatActivity { ...@@ -52,20 +60,49 @@ public class SplashActivity extends AppCompatActivity {
52 60
53 textInputLayout.setVisibility(View.VISIBLE); 61 textInputLayout.setVisibility(View.VISIBLE);
54 btnEnter.setVisibility(View.VISIBLE); 62 btnEnter.setVisibility(View.VISIBLE);
63 + btnEnter.bringToFront();
64 +
65 + test.setVisibility(View.VISIBLE);
66 +
67 +
68 + test.setOnClickListener(new View.OnClickListener() {
69 + @Override
70 + public void onClick(View v) {
71 + Log.d("스플래시", "테스트 버튼");
72 + }
73 + });
74 +
75 + btnEnter.setOnClickListener(new View.OnClickListener(){
76 + @Override
77 + public void onClick(View v) {
78 + Log.d("스플래시", "버튼");
79 + }
80 + });
81 +
55 } 82 }
56 - }, 3000); 83 + }, 2000);
57 } 84 }
58 85
59 private void init() { 86 private void init() {
60 btnEnter.setOnClickListener(new View.OnClickListener() { 87 btnEnter.setOnClickListener(new View.OnClickListener() {
61 @Override 88 @Override
62 public void onClick(View v) { 89 public void onClick(View v) {
90 + Log.d("스플래시", "edtSuperKey.toString()");
63 if(edtSuperKey.toString().isEmpty()){ 91 if(edtSuperKey.toString().isEmpty()){
64 - Log.d("empty", "true"); 92 + Log.d("스플래시", "true");
65 } else { 93 } else {
66 - // main 화면으로 이동 94 + Intent intent = new Intent(SplashActivity.this, MainActivity.class);
95 + startActivity(intent);
96 + finish();
67 } 97 }
68 } 98 }
69 }); 99 });
100 +
101 + logoContainer.setOnClickListener(new View.OnClickListener() {
102 + @Override
103 + public void onClick(View v) {
104 + Log.d("스플래시", "edtSuperKey.toString()");
105 + }
106 + });
70 } 107 }
71 } 108 }
......
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="24dp"
3 + android:height="24dp"
4 + android:viewportWidth="24"
5 + android:viewportHeight="24"
6 + android:tint="?attr/colorControlNormal">
7 + <path
8 + android:fillColor="@android:color/white"
9 + android:pathData="M17,10L7,10v2h10v-2zM19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,8h14v11zM14,14L7,14v2h7v-2z"/>
10 +</vector>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="24dp"
3 + android:height="24dp"
4 + android:viewportWidth="24"
5 + android:viewportHeight="24"
6 + android:tint="?attr/colorControlNormal">
7 + <path
8 + android:fillColor="@android:color/white"
9 + android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
10 +</vector>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="24dp"
3 + android:height="24dp"
4 + android:viewportWidth="24"
5 + android:viewportHeight="24"
6 + android:tint="?attr/colorControlNormal">
7 + <path
8 + android:fillColor="@android:color/white"
9 + android:pathData="M21,3L3,3c-1.11,0 -2,0.89 -2,2v12c0,1.1 0.89,2 2,2h5v2h8v-2h5c1.1,0 1.99,-0.9 1.99,-2L23,5c0,-1.11 -0.9,-2 -2,-2zM21,17L3,17L3,5h18v12zM16,11l-7,4L9,7z"/>
10 +</vector>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="24dp"
3 + android:height="24dp"
4 + android:viewportWidth="24"
5 + android:viewportHeight="24"
6 + android:tint="?attr/colorControlNormal">
7 + <path
8 + android:fillColor="@android:color/white"
9 + android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
10 +</vector>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="24dp"
3 + android:height="24dp"
4 + android:viewportWidth="24"
5 + android:viewportHeight="24"
6 + android:tint="?attr/colorControlNormal">
7 + <path
8 + android:fillColor="@android:color/white"
9 + android:pathData="M15,9L9,9c-0.55,0 -1,0.45 -1,1v12c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L16,10c0,-0.55 -0.45,-1 -1,-1zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM7.05,6.05l1.41,1.41C9.37,6.56 10.62,6 12,6s2.63,0.56 3.54,1.46l1.41,-1.41C15.68,4.78 13.93,4 12,4s-3.68,0.78 -4.95,2.05zM12,0C8.96,0 6.21,1.23 4.22,3.22l1.41,1.41C7.26,3.01 9.51,2 12,2s4.74,1.01 6.36,2.64l1.41,-1.41C17.79,1.23 15.04,0 12,0z"/>
10 +</vector>
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 +
5 + <solid android:color="@color/colorBackground" />
6 + <corners android:radius="100dp" />
7 +
8 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 +
5 + <solid android:color="#F26612" />
6 + <corners android:radius="100dp" />
7 +
8 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 +
5 + <solid android:color="#53D605" />
6 + <corners android:radius="100dp" />
7 +
8 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Drop Shadow Stack -->
3 + <item>
4 + <shape>
5 + <padding
6 + android:bottom="2.5dp"
7 + android:top="2.5dp" />
8 + <solid android:color="#09CCCCCC" />
9 + </shape>
10 + </item>
11 + <item>
12 + <shape>
13 + <padding
14 + android:bottom="2.5dp"
15 + android:top="2.5dp" />
16 + <solid android:color="#0DCCCCCC" />
17 + </shape>
18 + </item>
19 + <item>
20 + <shape>
21 + <padding
22 + android:bottom="2.5dp"
23 + android:top="2.5dp" />
24 + <solid android:color="#12CCCCCC" />
25 + </shape>
26 + </item>
27 + <item>
28 + <shape>
29 + <padding
30 + android:bottom="2.5dp"
31 + android:top="2.5dp" />
32 + <solid android:color="#15CCCCCC" />
33 + </shape>
34 + </item>
35 + <item>
36 + <shape>
37 + <padding
38 + android:bottom="2.5dp"
39 + android:top="2.5dp" />
40 + <solid android:color="#1ACCCCCC" />
41 + </shape>
42 + </item> <!-- Background -->
43 + <item>
44 + <shape>
45 + <solid android:color="@android:color/white" />
46 + </shape>
47 + </item>
48 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="24dp"
3 + android:height="24dp"
4 + android:viewportWidth="24"
5 + android:viewportHeight="24"
6 + android:tint="#53d605"
7 + android:alpha="0.5">
8 + <path
9 + android:fillColor="@android:color/white"
10 + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"/>
11 +</vector>
...@@ -6,13 +6,311 @@ ...@@ -6,13 +6,311 @@
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 tools:context=".ui.MainActivity"> 7 tools:context=".ui.MainActivity">
8 8
9 + <androidx.appcompat.widget.Toolbar
10 + android:id="@+id/toolbar_main"
11 + android:layout_width="0dp"
12 + android:layout_height="?attr/actionBarSize"
13 + android:background="@color/colorBackground"
14 + app:layout_constraintEnd_toEndOf="parent"
15 + app:layout_constraintStart_toStartOf="parent"
16 + app:layout_constraintTop_toTopOf="parent">
17 +
18 + <TextView
19 + android:layout_width="wrap_content"
20 + android:layout_height="wrap_content"
21 + android:fontFamily="@font/g_market_sans_ttf_medium"
22 + android:text="@string/app_name_korean"
23 + android:textColor="@color/colorMainText"
24 + android:textSize="21sp" />
25 +
26 + </androidx.appcompat.widget.Toolbar>
27 +
28 + <androidx.constraintlayout.widget.ConstraintLayout
29 + android:id="@+id/container_tag_button"
30 + android:layout_width="0dp"
31 + android:layout_height="0dp"
32 + android:background="@color/colorBackground"
33 + app:layout_constraintEnd_toEndOf="parent"
34 + app:layout_constraintHeight_default="percent"
35 + app:layout_constraintHeight_percent="0.45"
36 + app:layout_constraintStart_toStartOf="parent"
37 + app:layout_constraintTop_toBottomOf="@+id/toolbar_main">
38 +
39 + <ImageView
40 + android:id="@+id/btn_tag_control_back"
41 + android:layout_width="0dp"
42 + android:layout_height="0dp"
43 + android:src="@drawable/round_lens_24"
44 + app:layout_constraintDimensionRatio="1:1"
45 + app:layout_constraintEnd_toEndOf="parent"
46 + app:layout_constraintStart_toStartOf="parent"
47 + app:layout_constraintTop_toTopOf="parent"
48 + app:layout_constraintWidth_default="percent"
49 + app:layout_constraintWidth_percent="0.53" />
50 +
51 + <Button
52 + style="?android:attr/borderlessButtonStyle"
53 + android:layout_width="0dp"
54 + android:layout_height="0dp"
55 + android:background="@drawable/bg_btn_circle_main"
56 + app:layout_constraintBottom_toBottomOf="@+id/btn_tag_control_back"
57 + app:layout_constraintDimensionRatio="1:1"
58 + app:layout_constraintEnd_toEndOf="@id/btn_tag_control_back"
59 + app:layout_constraintStart_toStartOf="@+id/btn_tag_control_back"
60 + app:layout_constraintTop_toTopOf="@+id/btn_tag_control_back"
61 + app:layout_constraintWidth_default="percent"
62 + app:layout_constraintWidth_percent="0.37" />
63 +
64 + <Button
65 + android:id="@+id/btn_tag_control"
66 + style="?android:attr/borderlessButtonStyle"
67 + android:layout_width="0dp"
68 + android:layout_height="0dp"
69 + android:background="@drawable/bg_btn_on"
70 + android:text="ON"
71 + android:textColor="@color/colorMainText"
72 + android:textSize="28sp"
73 + app:layout_constraintBottom_toBottomOf="@+id/btn_tag_control_back"
74 + app:layout_constraintDimensionRatio="1:1"
75 + app:layout_constraintEnd_toEndOf="@id/btn_tag_control_back"
76 + app:layout_constraintStart_toStartOf="@+id/btn_tag_control_back"
77 + app:layout_constraintTop_toTopOf="@+id/btn_tag_control_back"
78 + app:layout_constraintWidth_default="percent"
79 + app:layout_constraintWidth_percent="0.3" />
80 +
9 <TextView 81 <TextView
82 + android:id="@+id/tv_status"
10 android:layout_width="wrap_content" 83 android:layout_width="wrap_content"
11 android:layout_height="wrap_content" 84 android:layout_height="wrap_content"
12 - android:text="Hello World!" 85 + android:layout_marginTop="7dp"
86 + android:fontFamily="@font/g_market_sans_ttf_medium"
87 + android:text="도어락 태그 꺼짐"
88 + android:textColor="@color/colorMainText"
89 + android:textSize="17sp"
90 + app:layout_constraintEnd_toEndOf="parent"
91 + app:layout_constraintStart_toStartOf="parent"
92 + app:layout_constraintTop_toBottomOf="@+id/btn_tag_control_back" />
93 +
94 + <TextView
95 + android:id="@+id/tv_status_detail"
96 + android:layout_width="wrap_content"
97 + android:layout_height="wrap_content"
98 + android:layout_marginTop="7dp"
99 + android:fontFamily="@font/g_market_sans_ttf_light"
100 + android:text="버튼을 누른 후 스캔해주세요"
101 + android:textColor="@color/colorMainText"
102 + android:textSize="15sp"
103 + app:layout_constraintEnd_toEndOf="parent"
104 + app:layout_constraintStart_toStartOf="parent"
105 + app:layout_constraintTop_toBottomOf="@+id/tv_status" />
106 +
107 + </androidx.constraintlayout.widget.ConstraintLayout>
108 +
109 + <androidx.constraintlayout.widget.ConstraintLayout
110 + android:id="@+id/container_menu"
111 + android:layout_width="0dp"
112 + android:layout_height="0dp"
113 + android:background="@drawable/bg_shadow"
114 + app:layout_constraintEnd_toEndOf="parent"
115 + app:layout_constraintHeight_default="percent"
116 + app:layout_constraintHeight_percent="0.45"
117 + app:layout_constraintStart_toStartOf="parent"
118 + app:layout_constraintTop_toBottomOf="@+id/container_tag_button">
119 +
120 + <LinearLayout
121 + android:id="@+id/line_horizontal"
122 + android:layout_width="0dp"
123 + android:layout_height="0.5dp"
124 + android:background="@color/colorLine"
125 + android:orientation="horizontal"
126 + app:layout_constraintBottom_toBottomOf="parent"
127 + app:layout_constraintEnd_toEndOf="parent"
128 + app:layout_constraintStart_toStartOf="parent"
129 + app:layout_constraintTop_toTopOf="parent" />
130 +
131 + <LinearLayout
132 + android:id="@+id/line_vertical"
133 + android:layout_width="0.5dp"
134 + android:layout_height="0dp"
135 + android:background="@color/colorLine"
136 + android:orientation="vertical"
13 app:layout_constraintBottom_toBottomOf="parent" 137 app:layout_constraintBottom_toBottomOf="parent"
14 - app:layout_constraintLeft_toLeftOf="parent" 138 + app:layout_constraintEnd_toEndOf="parent"
15 - app:layout_constraintRight_toRightOf="parent" 139 + app:layout_constraintStart_toStartOf="parent"
140 + app:layout_constraintTop_toTopOf="parent" />
141 +
142 + <androidx.constraintlayout.widget.ConstraintLayout
143 + android:id="@+id/container_remote_button"
144 + android:layout_width="wrap_content"
145 + android:layout_height="wrap_content"
146 + android:background="@color/colorAccent"
147 + app:layout_constraintBottom_toTopOf="@id/line_horizontal"
148 + app:layout_constraintEnd_toStartOf="@id/line_vertical"
149 + app:layout_constraintStart_toStartOf="parent"
150 + app:layout_constraintTop_toTopOf="parent">
151 +
152 + <Button
153 + android:id="@+id/btn_back_1"
154 + style="?android:attr/borderlessButtonStyle"
155 + android:layout_width="48dp"
156 + android:layout_height="48dp"
157 + android:background="@drawable/bg_btn_circle_main"
158 + app:layout_constraintEnd_toEndOf="parent"
159 + app:layout_constraintStart_toStartOf="parent"
160 + app:layout_constraintTop_toTopOf="parent" />
161 +
162 + <ImageView
163 + android:layout_width="wrap_content"
164 + android:layout_height="wrap_content"
165 + android:src="@drawable/baseline_settings_remote_white_24"
166 + app:layout_constraintBottom_toBottomOf="@id/btn_back_1"
167 + app:layout_constraintEnd_toEndOf="@id/btn_back_1"
168 + app:layout_constraintStart_toStartOf="@id/btn_back_1"
169 + app:layout_constraintTop_toTopOf="@id/btn_back_1" />
170 +
171 + <TextView
172 + android:layout_width="wrap_content"
173 + android:layout_height="wrap_content"
174 + android:layout_marginTop="10dp"
175 + android:fontFamily="@font/g_market_sans_ttf_medium"
176 + android:text="원격 잠금해제"
177 + android:textColor="@color/colorBackground"
178 + android:textSize="15sp"
179 + app:layout_constraintEnd_toEndOf="parent"
180 + app:layout_constraintStart_toStartOf="parent"
181 + app:layout_constraintTop_toBottomOf="@id/btn_back_1" />
182 +
183 + </androidx.constraintlayout.widget.ConstraintLayout>
184 +
185 + <androidx.constraintlayout.widget.ConstraintLayout
186 + android:id="@+id/container_record_button"
187 + android:layout_width="wrap_content"
188 + android:layout_height="wrap_content"
189 + android:background="@color/colorAccent"
190 + app:layout_constraintBottom_toTopOf="@id/line_horizontal"
191 + app:layout_constraintEnd_toEndOf="parent"
192 + app:layout_constraintStart_toEndOf="@id/line_vertical"
193 + app:layout_constraintTop_toTopOf="parent">
194 +
195 + <Button
196 + android:id="@+id/btn_back_2"
197 + style="?android:attr/borderlessButtonStyle"
198 + android:layout_width="48dp"
199 + android:layout_height="48dp"
200 + android:background="@drawable/bg_btn_circle_main"
201 + app:layout_constraintEnd_toEndOf="parent"
202 + app:layout_constraintStart_toStartOf="parent"
16 app:layout_constraintTop_toTopOf="parent" /> 203 app:layout_constraintTop_toTopOf="parent" />
17 204
205 + <ImageView
206 + android:layout_width="wrap_content"
207 + android:layout_height="wrap_content"
208 + android:src="@drawable/baseline_event_note_white_24"
209 + app:layout_constraintBottom_toBottomOf="@id/btn_back_2"
210 + app:layout_constraintEnd_toEndOf="@id/btn_back_2"
211 + app:layout_constraintStart_toStartOf="@id/btn_back_2"
212 + app:layout_constraintTop_toTopOf="@id/btn_back_2" />
213 +
214 + <TextView
215 + android:layout_width="wrap_content"
216 + android:layout_height="wrap_content"
217 + android:layout_marginTop="10dp"
218 + android:fontFamily="@font/g_market_sans_ttf_medium"
219 + android:text="원격 잠금해제 기록"
220 + android:textColor="@color/colorBackground"
221 + android:textSize="15sp"
222 + app:layout_constraintEnd_toEndOf="parent"
223 + app:layout_constraintStart_toStartOf="parent"
224 + app:layout_constraintTop_toBottomOf="@id/btn_back_2" />
225 +
226 + </androidx.constraintlayout.widget.ConstraintLayout>
227 +
228 + <androidx.constraintlayout.widget.ConstraintLayout
229 + android:id="@+id/container_device_button"
230 + android:layout_width="wrap_content"
231 + android:layout_height="wrap_content"
232 + android:background="@color/colorAccent"
233 + app:layout_constraintBottom_toBottomOf="parent"
234 + app:layout_constraintEnd_toStartOf="@id/line_vertical"
235 + app:layout_constraintStart_toStartOf="parent"
236 + app:layout_constraintTop_toBottomOf="@id/line_horizontal">
237 +
238 + <Button
239 + android:id="@+id/btn_back_3"
240 + style="?android:attr/borderlessButtonStyle"
241 + android:layout_width="48dp"
242 + android:layout_height="48dp"
243 + android:background="@drawable/bg_btn_circle_main"
244 + app:layout_constraintEnd_toEndOf="parent"
245 + app:layout_constraintStart_toStartOf="parent"
246 + app:layout_constraintTop_toTopOf="parent" />
247 +
248 + <ImageView
249 + android:layout_width="wrap_content"
250 + android:layout_height="wrap_content"
251 + android:src="@drawable/baseline_perm_device_information_white_24"
252 + app:layout_constraintBottom_toBottomOf="@id/btn_back_3"
253 + app:layout_constraintEnd_toEndOf="@id/btn_back_3"
254 + app:layout_constraintStart_toStartOf="@id/btn_back_3"
255 + app:layout_constraintTop_toTopOf="@id/btn_back_3" />
256 +
257 + <TextView
258 + android:layout_width="wrap_content"
259 + android:layout_height="wrap_content"
260 + android:layout_marginTop="10dp"
261 + android:fontFamily="@font/g_market_sans_ttf_medium"
262 + android:text="기기 관리"
263 + android:textColor="@color/colorBackground"
264 + android:textSize="15sp"
265 + app:layout_constraintEnd_toEndOf="parent"
266 + app:layout_constraintStart_toStartOf="parent"
267 + app:layout_constraintTop_toBottomOf="@id/btn_back_3" />
268 +
269 + </androidx.constraintlayout.widget.ConstraintLayout>
270 +
271 + <androidx.constraintlayout.widget.ConstraintLayout
272 + android:id="@+id/container_video_button"
273 + android:layout_width="wrap_content"
274 + android:layout_height="wrap_content"
275 + android:background="@color/colorAccent"
276 + app:layout_constraintBottom_toBottomOf="parent"
277 + app:layout_constraintEnd_toEndOf="parent"
278 + app:layout_constraintStart_toEndOf="@id/line_vertical"
279 + app:layout_constraintTop_toBottomOf="@id/line_horizontal">
280 +
281 + <Button
282 + android:id="@+id/btn_back_4"
283 + style="?android:attr/borderlessButtonStyle"
284 + android:layout_width="48dp"
285 + android:layout_height="48dp"
286 + android:background="@drawable/bg_btn_circle_main"
287 + app:layout_constraintEnd_toEndOf="parent"
288 + app:layout_constraintStart_toStartOf="parent"
289 + app:layout_constraintTop_toTopOf="parent" />
290 +
291 + <ImageView
292 + android:layout_width="wrap_content"
293 + android:layout_height="wrap_content"
294 + android:src="@drawable/baseline_ondemand_video_white_24"
295 + app:layout_constraintBottom_toBottomOf="@id/btn_back_4"
296 + app:layout_constraintEnd_toEndOf="@id/btn_back_4"
297 + app:layout_constraintStart_toStartOf="@id/btn_back_4"
298 + app:layout_constraintTop_toTopOf="@id/btn_back_4" />
299 +
300 + <TextView
301 + android:layout_width="wrap_content"
302 + android:layout_height="wrap_content"
303 + android:layout_marginTop="10dp"
304 + android:fontFamily="@font/g_market_sans_ttf_medium"
305 + android:text="비디오 확인"
306 + android:textColor="@color/colorBackground"
307 + android:textSize="15sp"
308 + app:layout_constraintEnd_toEndOf="parent"
309 + app:layout_constraintStart_toStartOf="parent"
310 + app:layout_constraintTop_toBottomOf="@id/btn_back_4" />
311 +
312 + </androidx.constraintlayout.widget.ConstraintLayout>
313 +
314 + </androidx.constraintlayout.widget.ConstraintLayout>
315 +
18 </androidx.constraintlayout.widget.ConstraintLayout> 316 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,6 +7,15 @@ ...@@ -7,6 +7,15 @@
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 +
10 <LinearLayout 19 <LinearLayout
11 android:id="@+id/ll_logo" 20 android:id="@+id/ll_logo"
12 android:layout_width="wrap_content" 21 android:layout_width="wrap_content"
...@@ -28,24 +37,23 @@ ...@@ -28,24 +37,23 @@
28 android:layout_height="wrap_content" 37 android:layout_height="wrap_content"
29 android:layout_gravity="center" 38 android:layout_gravity="center"
30 android:fontFamily="@font/g_market_sans_ttf_bold" 39 android:fontFamily="@font/g_market_sans_ttf_bold"
31 - android:text="게이트웨이" 40 + android:text="@string/app_name_korean"
32 android:textColor="@color/colorMainText" 41 android:textColor="@color/colorMainText"
33 android:textSize="36sp" /> 42 android:textSize="36sp" />
34 43
35 </LinearLayout> 44 </LinearLayout>
36 45
37 <com.google.android.material.textfield.TextInputLayout 46 <com.google.android.material.textfield.TextInputLayout
38 - android:visibility="gone"
39 android:id="@+id/til_super_key" 47 android:id="@+id/til_super_key"
40 android:layout_width="0dp" 48 android:layout_width="0dp"
41 android:layout_height="0dp" 49 android:layout_height="0dp"
42 android:layout_marginTop="50dp" 50 android:layout_marginTop="50dp"
43 android:hint="고유번호" 51 android:hint="고유번호"
52 + android:visibility="invisible"
44 app:boxStrokeColor="@color/colorMainText" 53 app:boxStrokeColor="@color/colorMainText"
45 app:boxStrokeWidth="1dp" 54 app:boxStrokeWidth="1dp"
46 app:hintTextColor="@color/colorMainText" 55 app:hintTextColor="@color/colorMainText"
47 app:layout_constraintDimensionRatio="75:25" 56 app:layout_constraintDimensionRatio="75:25"
48 - app:layout_constraintEnd_toStartOf="@id/cl_enter"
49 app:layout_constraintStart_toStartOf="@+id/ll_logo" 57 app:layout_constraintStart_toStartOf="@+id/ll_logo"
50 app:layout_constraintTop_toBottomOf="@id/ll_logo" 58 app:layout_constraintTop_toBottomOf="@id/ll_logo"
51 app:layout_constraintWidth_default="percent" 59 app:layout_constraintWidth_default="percent"
...@@ -65,16 +73,14 @@ ...@@ -65,16 +73,14 @@
65 </com.google.android.material.textfield.TextInputLayout> 73 </com.google.android.material.textfield.TextInputLayout>
66 74
67 <androidx.constraintlayout.widget.ConstraintLayout 75 <androidx.constraintlayout.widget.ConstraintLayout
68 - android:visibility="gone"
69 android:id="@+id/cl_enter" 76 android:id="@+id/cl_enter"
70 android:layout_width="0dp" 77 android:layout_width="0dp"
71 android:layout_height="0dp" 78 android:layout_height="0dp"
72 android:layout_marginStart="10dp" 79 android:layout_marginStart="10dp"
73 - app:layout_constraintBottom_toBottomOf="@id/til_super_key" 80 + android:visibility="invisible"
74 - app:layout_constraintDimensionRatio="51:36" 81 + app:layout_constraintStart_toStartOf="parent"
75 - app:layout_constraintEnd_toEndOf="@id/ll_logo" 82 + app:layout_constraintEnd_toEndOf="parent"
76 - app:layout_constraintStart_toEndOf="@id/til_super_key" 83 + app:layout_constraintTop_toTopOf="parent">
77 - app:layout_constraintTop_toTopOf="@id/til_super_key">
78 84
79 <Button 85 <Button
80 android:id="@+id/btn_enter" 86 android:id="@+id/btn_enter"
......
...@@ -6,4 +6,5 @@ ...@@ -6,4 +6,5 @@
6 6
7 <color name="colorBackground">#090938</color> 7 <color name="colorBackground">#090938</color>
8 <color name="colorMainText">#ffffff</color> 8 <color name="colorMainText">#ffffff</color>
9 + <color name="colorLine">#dedede</color>
9 </resources> 10 </resources>
......
1 <resources> 1 <resources>
2 <string name="app_name">SmartDoorLock</string> 2 <string name="app_name">SmartDoorLock</string>
3 + <string name="app_name_korean">게이트웨이</string>
3 </resources> 4 </resources>
......
1 <resources> 1 <resources>
2 2
3 <!-- Base application theme. --> 3 <!-- Base application theme. -->
4 - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> 4 + <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
5 <!-- Customize your theme here. --> 5 <!-- Customize your theme here. -->
6 <item name="colorPrimary">@color/colorPrimary</item> 6 <item name="colorPrimary">@color/colorPrimary</item>
7 <item name="colorPrimaryDark">@color/colorPrimaryDark</item> 7 <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
......