Testing release
This commit is contained in:
@ -57,48 +57,6 @@
|
||||
android:layout_marginTop="30dp"
|
||||
android:text="@string/add_stream_save"/>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_margin="50dp"
|
||||
android:background="@color/purple_200"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_horizontal"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Title"
|
||||
android:textColor="@color/purple_500"
|
||||
android:text="@string/app_info_title"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_creator_desc"
|
||||
android:autoLink="web"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_license_desc"
|
||||
android:autoLink="web"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_repo_desc"
|
||||
android:autoLink="web"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_lib_desc"
|
||||
android:autoLink="web"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
61
app/src/main/res/layout/fragment_info.xml
Normal file
61
app/src/main/res/layout/fragment_info.xml
Normal file
@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal"
|
||||
android:padding="50dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@mipmap/ic_launcher_round"/>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_margin="50dp"
|
||||
android:background="@color/purple_200"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_horizontal"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Title"
|
||||
android:textColor="@color/purple_500"
|
||||
android:text="@string/app_info_title"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_creator_desc"
|
||||
android:autoLink="web"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_license_desc"
|
||||
android:autoLink="web"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_repo_desc"
|
||||
android:autoLink="web"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/app_info_lib_desc"
|
||||
android:autoLink="web"/>
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
@ -11,13 +11,14 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/settingsToolbar"
|
||||
app:title="@string/app_name"
|
||||
style="@style/ToolBarStyle"/>
|
||||
style="@style/ToolBarStyle" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/list"
|
||||
android:name="it.danieleverducci.ojo.ui.SettingsFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
app:layoutManager="LinearLayoutManager"
|
||||
|
@ -1,8 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item android:id="@+id/menuitem_add_camera"
|
||||
android:icon="@drawable/ic_add"
|
||||
android:title="@string/add_stream"
|
||||
android:title="@string/menuitem_add_camera"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
<item android:id="@+id/menuitem_allow_rotation"
|
||||
android:title="@string/menuitem_allow_rotation"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item android:id="@+id/menuitem_info"
|
||||
android:title="@string/menuitem_info"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
</menu>
|
@ -36,5 +36,12 @@
|
||||
<action
|
||||
android:id="@+id/action_settingsToCameraUrl"
|
||||
app:destination="@id/CameraUrlFragment" />
|
||||
<action
|
||||
android:id="@+id/action_SettingsToInfoFragment"
|
||||
app:destination="@id/infoFragment" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/infoFragment"
|
||||
android:name="it.danieleverducci.ojo.ui.InfoFragment"
|
||||
android:label="InfoFragment" />
|
||||
</navigation>
|
@ -10,13 +10,15 @@
|
||||
<string name="add_stream_placeholder_url">rtsp://username:password@192.168.1.123:554</string>
|
||||
<string name="add_stream_placeholder_name">Nome della IP Camera</string>
|
||||
<string name="add_stream_name">Nome della IP Camera</string>
|
||||
<string name="add_stream">Inserisci l\'url dello stream RTSP della tua IP Camera. Nota che questo differisce tra un modello e l\'altro. Consulta il pannello di configurazione o il manuale della tua IP Camera.</string>
|
||||
<string name="add_stream_save">Salva</string>
|
||||
<string name="add_stream_invalid_url">L\'URL RTSP non è valido</string>
|
||||
<string name="add_stream_invalid_url_dismiss">Chiudi</string>
|
||||
<string name="add_stream_error_saving">Si è verificato un errore durante il salvataggio della configurazione.</string>
|
||||
|
||||
<string name="menu_add_camera">Aggiungi</string>
|
||||
<string name="add_stream">Inserisci l\'url dello stream RTSP della tua IP Camera. Nota che questo differisce tra un modello e l\'altro. Consulta il pannello di configurazione o il manuale della tua IP Camera.</string>
|
||||
<string name="menuitem_allow_rotation">Allow screen rotation</string>
|
||||
<string name="menuitem_deny_rotation">Landscape only</string>
|
||||
<string name="menuitem_info">Info</string>
|
||||
<string name="menuitem_add_camera">Aggiungi</string>
|
||||
|
||||
<string name="app_info_title">Informazioni su Ojo</string>
|
||||
<string name="app_info_creator_desc">Creato da Daniele Verducci.</string>
|
||||
|
@ -9,13 +9,15 @@
|
||||
<string name="add_stream_placeholder_url">rtsp://username:password@192.168.1.123:554</string>
|
||||
<string name="add_stream_placeholder_name">Camera name</string>
|
||||
<string name="add_stream_name">Camera name</string>
|
||||
<string name="add_stream">Please insert your camera\'s RTSP stream. Note that the URL differs from camera to camera: you can find the complete URL in your camera\'s settings or user manual.</string>
|
||||
<string name="add_stream_save">Save</string>
|
||||
<string name="add_stream_invalid_url">Invalid RTSP url</string>
|
||||
<string name="add_stream_invalid_url_dismiss">Dismiss</string>
|
||||
<string name="add_stream_error_saving">An error has occurred while saving configuration</string>
|
||||
|
||||
<string name="menu_add_camera">Add</string>
|
||||
<string name="add_stream">Please insert your camera\'s RTSP stream. Note that the URL differs from camera to camera: you can find the complete URL in your camera\'s settings or user manual.</string>
|
||||
<string name="menuitem_allow_rotation">Allow screen rotation</string>
|
||||
<string name="menuitem_deny_rotation">Landscape only</string>
|
||||
<string name="menuitem_info">Info</string>
|
||||
<string name="menuitem_add_camera">Add</string>
|
||||
|
||||
<string name="app_info_title">About Ojo</string>
|
||||
<string name="app_info_creator_desc">Created by Daniele Verducci.</string>
|
||||
|
@ -12,9 +12,11 @@
|
||||
<item name="colorSecondary">@color/purple_500</item>
|
||||
<item name="colorSecondaryVariant">@color/purple_700</item>
|
||||
<item name="colorOnSecondary">@color/white</item>
|
||||
|
||||
<item name="colorAccent">@color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="ToolBarStyle" parent="">
|
||||
<style name="ToolBarStyle" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||
<item name="android:background">@color/purple_500</item>
|
||||
<item name="titleTextColor">@color/white</item>
|
||||
</style>
|
||||
|
Reference in New Issue
Block a user