添加UI布局

diff --git a/app/src/main/java/com/ic/sos/MainActivity.java b/app/src/main/java/com/ic/sos/MainActivity.java
index 826e317..058a9f8 100644 (file)
--- a/app/src/main/java/com/ic/sos/MainActivity.java
+++ b/app/src/main/java/com/ic/sos/MainActivity.java
@@ -25,9 +25,9 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        sosPresenter = new SOSPresenter(this);
+        //sosPresenter = new SOSPresenter(this);
         //监听状态变化
-        initObserver();
+        //initObserver();
     }
 
     @Override

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4fc2444..0b79811 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <include
+        layout="@layout/include_calling"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+
+    <include
+        layout="@layout/include_error"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <include
+        layout="@layout/include_no_sos_number"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/include_calling.xml b/app/src/main/res/layout/include_calling.xml
index 02dcf51..d57e231 100644 (file)
--- a/app/src/main/res/layout/include_calling.xml
+++ b/app/src/main/res/layout/include_calling.xml
@@ -1,7 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:src="@drawable/calling_anim" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/calling_text"
+            android:textColor="#EA9A45"
+            android:textSize="28sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/urgent_text"
+            android:textColor="@color/white"
+            android:textSize="36sp" />
+
+    </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/include_error.xml b/app/src/main/res/layout/include_error.xml
index 7091983..17c498e 100644 (file)
--- a/app/src/main/res/layout/include_error.xml
+++ b/app/src/main/res/layout/include_error.xml
@@ -1,5 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/call_error_text"
+            android:textColor="#EC2E35"
+            android:textSize="28sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/urgent_text"
+            android:textColor="@color/white"
+            android:textSize="36sp" />
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:src="@mipmap/icon_cancel" />
+
+    </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/include_no_sim.xml b/app/src/main/res/layout/include_no_sim.xml
new file mode 100644 (file)
index 0000000..2bc14e0
--- /dev/null
+++ b/app/src/main/res/layout/include_no_sim.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:src="@mipmap/icon_no_sim_card" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/no_sim_text"
+            android:textColor="@color/white"
+            android:textSize="36sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/set_up_sim_text"
+            android:textColor="@color/white"
+            android:textSize="36sp" />
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/include_no_sos_number.xml b/app/src/main/res/layout/include_no_sos_number.xml
index 7091983..5ac7ceb 100644 (file)
--- a/app/src/main/res/layout/include_no_sos_number.xml
+++ b/app/src/main/res/layout/include_no_sos_number.xml
@@ -1,5 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:src="@mipmap/icon_no_sos_number" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/no_urgent_number_text"
+            android:textColor="@color/white"
+            android:textSize="36sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/set_up_sos_number_text"
+            android:textColor="@color/white"
+            android:textSize="36sp" />
+
+    </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/mipmap-hdpi/icon_cancel.png b/app/src/main/res/mipmap-hdpi/icon_cancel.png
index 85a2ab2..f25e09d 100644 (file)
Binary files a/app/src/main/res/mipmap-hdpi/icon_cancel.png and b/app/src/main/res/mipmap-hdpi/icon_cancel.png differ

diff --git a/app/src/main/res/mipmap-hdpi/icon_no_sim_card.png b/app/src/main/res/mipmap-hdpi/icon_no_sim_card.png
index 0afe4d8..a10fa71 100644 (file)
Binary files a/app/src/main/res/mipmap-hdpi/icon_no_sim_card.png and b/app/src/main/res/mipmap-hdpi/icon_no_sim_card.png differ

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
new file mode 100644 (file)
index 0000000..a389ac7
--- /dev/null
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,9 @@
+<resources>
+    <string name="app_name">ICSOS</string>
+    <string name="calling_text">Calling…</string>
+    <string name="call_error_text">呼叫失败</string>
+    <string name="no_sim_text">当前没有SIM卡</string>
+    <string name="set_up_sim_text">请立即安装</string>
+    <string name="no_urgent_number_text">当前没有紧急联系人</string>
+    <string name="set_up_sos_number_text">请立即设置</string>
+</resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
new file mode 100644 (file)
index 0000000..a29bc05
--- /dev/null
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,9 @@
+<resources>
+    <string name="app_name">ICSOS</string>
+    <string name="calling_text">正在呼叫…</string>
+    <string name="call_error_text">呼叫失败</string>
+    <string name="no_sim_text">当前没有SIM卡</string>
+    <string name="set_up_sim_text">请立即安装</string>
+    <string name="no_urgent_number_text">当前没有紧急联系人</string>
+    <string name="set_up_sos_number_text">请立即设置</string>
+</resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644 (file)
index a2b2573..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.ICSOS" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c581f81..930aad6 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,10 @@
 <resources>
     <string name="app_name">ICSOS</string>
+    <string name="calling_text">正在呼叫…</string>
+    <string name="urgent_text">紧急服务</string>
+    <string name="call_error_text">呼叫失败</string>
+    <string name="no_sim_text">当前没有SIM卡</string>
+    <string name="set_up_sim_text">请立即安装</string>
+    <string name="no_urgent_number_text">当前没有紧急联系人</string>
+    <string name="set_up_sos_number_text">请立即设置</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 14539bb..c6efe08 100644 (file)
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.ICSOS" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.ICSOS" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -9,8 +9,7 @@
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+        <item name="android:background">@color/black</item>
+        <item name="android:textStyle">bold</item>
     </style>
 </resources>
\ No newline at end of file