awin/vc-kirby-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict fixed

Browse Source
This commit is contained in:
Awin Huang
2024-10-25 14:57:52 +08:00
parent bcd501a44b 548032a741
commit d691c9c47c
14 changed files with 215 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/res/layout/activity_server_setting.xml Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:orientation="vertical"
android:id="@+id/main">
<TextView
android:id="@+id/textViewServerSetting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_url"
android:textSize="24sp"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="20dp" />
<EditText
android:id="@+id/editTextServerSetting"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autofillHints="@string/kirby_data_post_url_default"
android:hint="@string/kirby_data_post_url_default" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center">
<Button
android:id="@+id/buttonDone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/done"
android:layout_marginEnd="10dp"/>
<Button
android:id="@+id/buttonCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"/>
<Button
android:id="@+id/buttonDefault"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/defaultString"
android:layout_marginStart="10dp"/>
</LinearLayout>
</LinearLayout>

5
app/src/main/res/menu/menu_main.xml
View File

@@ -17,4 +17,9 @@
android:orderInCategory="300"
android:title="@string/settings"
app:showAsAction="never" />
<item
android:id="@+id/action_server_setting"
android:orderInCategory="200"
android:title="@string/action_server_setting"
app:showAsAction="never" />
</menu>

5
app/src/main/res/values/strings.xml
View File

@@ -2,6 +2,7 @@
<string name="app_name">Kirby Test App</string>
<string name="action_export">Export to csv</string>
<string name="action_reset_log">Reset log</string>
<string name="action_server_setting">Server Setting</string>
<!-- Strings used for fragments for navigation -->
<string name="first_fragment_label">First Fragment</string>
<string name="second_fragment_label">Second Fragment</string>
@@ -13,5 +14,9 @@
<string name="save">Save</string>
<string name="cancel">Cancel</string>
<string name="start_scan">Start Scan</string>
<string name="server_url">Server URL</string>
<string name="kirby_data_post_url_default">http://vc-automation.logitech.com/api/kirby/addData</string>
<string name="done">Done</string>
<string name="defaultString">Default</string>
</resources>

7
app/src/main/res/xml/network_security_config.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true" />
<domain-config cleartextTrafficPermitted="true">
<domain includeSubdomains="true">192.168.1.154:5000</domain>
</domain-config>
</network-security-config>