diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index bec7e95..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 66bb77d..af8c64f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "it.danieleverducci.ojo" - minSdkVersion 21 + minSdkVersion 15 targetSdkVersion 33 versionCode 7 versionName "0.1.2" diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 2e9b1d7..cd84d40 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/it/danieleverducci/ojo/ui/SettingsFragment.java b/app/src/main/java/it/danieleverducci/ojo/ui/SettingsFragment.java index 3dc9387..57408c0 100644 --- a/app/src/main/java/it/danieleverducci/ojo/ui/SettingsFragment.java +++ b/app/src/main/java/it/danieleverducci/ojo/ui/SettingsFragment.java @@ -1,6 +1,7 @@ package it.danieleverducci.ojo.ui; import android.graphics.Color; +import android.os.Build; import android.os.Bundle; import androidx.annotation.NonNull; @@ -45,7 +46,9 @@ public class SettingsFragment extends Fragment { @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { // Setup toolbar - binding.settingsToolbar.getOverflowIcon().setTint(Color.WHITE); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + binding.settingsToolbar.getOverflowIcon().setTint(Color.WHITE); + } binding.settingsToolbar.inflateMenu(R.menu.settings_menu); MenuItem rotMenuItem = binding.settingsToolbar.getMenu().findItem(R.id.menuitem_allow_rotation); rotMenuItem.setTitle(((SettingsActivity)getActivity()).getRotationEnabledSetting() ? R.string.menuitem_deny_rotation : R.string.menuitem_allow_rotation); diff --git a/app/src/main/res/drawable-anydpi-v17/ic_add.xml b/app/src/main/res/drawable-anydpi-v17/ic_add.xml new file mode 100644 index 0000000..672478e --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v17/ic_add.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi-v17/ic_delete.xml b/app/src/main/res/drawable-anydpi-v17/ic_delete.xml new file mode 100644 index 0000000..18b7e77 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v17/ic_delete.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi-v17/ic_drag_handle.xml b/app/src/main/res/drawable-anydpi-v17/ic_drag_handle.xml new file mode 100644 index 0000000..dd203d3 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v17/ic_drag_handle.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi-v17/ic_network_camera.xml b/app/src/main/res/drawable-anydpi-v17/ic_network_camera.xml new file mode 100644 index 0000000..9ebf420 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v17/ic_network_camera.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v17/ic_settings.xml b/app/src/main/res/drawable-anydpi-v17/ic_settings.xml new file mode 100644 index 0000000..52faccc --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v17/ic_settings.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_eye.xml b/app/src/main/res/drawable-anydpi/ic_eye.xml new file mode 100644 index 0000000..b6874cd --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_eye.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-hdpi-v17/ic_add.png b/app/src/main/res/drawable-hdpi-v17/ic_add.png new file mode 100644 index 0000000..9a20be8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v17/ic_add.png differ diff --git a/app/src/main/res/drawable-hdpi-v17/ic_delete.png b/app/src/main/res/drawable-hdpi-v17/ic_delete.png new file mode 100644 index 0000000..d95f99f Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v17/ic_delete.png differ diff --git a/app/src/main/res/drawable-hdpi-v17/ic_drag_handle.png b/app/src/main/res/drawable-hdpi-v17/ic_drag_handle.png new file mode 100644 index 0000000..e4b95dc Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v17/ic_drag_handle.png differ diff --git a/app/src/main/res/drawable-hdpi-v17/ic_network_camera.png b/app/src/main/res/drawable-hdpi-v17/ic_network_camera.png new file mode 100644 index 0000000..591d520 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v17/ic_network_camera.png differ diff --git a/app/src/main/res/drawable-hdpi-v17/ic_settings.png b/app/src/main/res/drawable-hdpi-v17/ic_settings.png new file mode 100644 index 0000000..8bb1b83 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v17/ic_settings.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_eye.png b/app/src/main/res/drawable-hdpi/ic_eye.png new file mode 100644 index 0000000..7622b45 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_eye.png differ diff --git a/app/src/main/res/drawable-mdpi-v17/ic_add.png b/app/src/main/res/drawable-mdpi-v17/ic_add.png new file mode 100644 index 0000000..be6d625 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v17/ic_add.png differ diff --git a/app/src/main/res/drawable-mdpi-v17/ic_delete.png b/app/src/main/res/drawable-mdpi-v17/ic_delete.png new file mode 100644 index 0000000..333620e Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v17/ic_delete.png differ diff --git a/app/src/main/res/drawable-mdpi-v17/ic_drag_handle.png b/app/src/main/res/drawable-mdpi-v17/ic_drag_handle.png new file mode 100644 index 0000000..70c086f Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v17/ic_drag_handle.png differ diff --git a/app/src/main/res/drawable-mdpi-v17/ic_network_camera.png b/app/src/main/res/drawable-mdpi-v17/ic_network_camera.png new file mode 100644 index 0000000..bbfb331 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v17/ic_network_camera.png differ diff --git a/app/src/main/res/drawable-mdpi-v17/ic_settings.png b/app/src/main/res/drawable-mdpi-v17/ic_settings.png new file mode 100644 index 0000000..fe710f7 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v17/ic_settings.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_eye.png b/app/src/main/res/drawable-mdpi/ic_eye.png new file mode 100644 index 0000000..31d1727 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_eye.png differ diff --git a/app/src/main/res/drawable-xhdpi-v17/ic_add.png b/app/src/main/res/drawable-xhdpi-v17/ic_add.png new file mode 100644 index 0000000..6eedadf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v17/ic_add.png differ diff --git a/app/src/main/res/drawable-xhdpi-v17/ic_delete.png b/app/src/main/res/drawable-xhdpi-v17/ic_delete.png new file mode 100644 index 0000000..dc3a749 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v17/ic_delete.png differ diff --git a/app/src/main/res/drawable-xhdpi-v17/ic_drag_handle.png b/app/src/main/res/drawable-xhdpi-v17/ic_drag_handle.png new file mode 100644 index 0000000..ace5500 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v17/ic_drag_handle.png differ diff --git a/app/src/main/res/drawable-xhdpi-v17/ic_network_camera.png b/app/src/main/res/drawable-xhdpi-v17/ic_network_camera.png new file mode 100644 index 0000000..a8b4713 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v17/ic_network_camera.png differ diff --git a/app/src/main/res/drawable-xhdpi-v17/ic_settings.png b/app/src/main/res/drawable-xhdpi-v17/ic_settings.png new file mode 100644 index 0000000..8b683c6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v17/ic_settings.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_eye.png b/app/src/main/res/drawable-xhdpi/ic_eye.png new file mode 100644 index 0000000..cf94433 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_eye.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v17/ic_add.png b/app/src/main/res/drawable-xxhdpi-v17/ic_add.png new file mode 100644 index 0000000..7a27534 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v17/ic_add.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v17/ic_delete.png b/app/src/main/res/drawable-xxhdpi-v17/ic_delete.png new file mode 100644 index 0000000..3d908c4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v17/ic_delete.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v17/ic_drag_handle.png b/app/src/main/res/drawable-xxhdpi-v17/ic_drag_handle.png new file mode 100644 index 0000000..04d1401 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v17/ic_drag_handle.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v17/ic_network_camera.png b/app/src/main/res/drawable-xxhdpi-v17/ic_network_camera.png new file mode 100644 index 0000000..ea1ccfe Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v17/ic_network_camera.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v17/ic_settings.png b/app/src/main/res/drawable-xxhdpi-v17/ic_settings.png new file mode 100644 index 0000000..c3a05ec Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v17/ic_settings.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_eye.png b/app/src/main/res/drawable-xxhdpi/ic_eye.png new file mode 100644 index 0000000..eff96bd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_eye.png differ diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 8c276c2..6348316 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,13 +1,13 @@ - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8af1fbd..e548ff8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,8 @@ android:id="@+id/fragment_surveillance" android:name="it.danieleverducci.ojo.ui.SurveillanceFragment" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + tools:layout="@layout/fragment_surveillance" /> diff --git a/app/src/main/res/layout/fragment_add_stream.xml b/app/src/main/res/layout/fragment_add_stream.xml index d336e97..639fadc 100644 --- a/app/src/main/res/layout/fragment_add_stream.xml +++ b/app/src/main/res/layout/fragment_add_stream.xml @@ -14,11 +14,12 @@ android:gravity="center_horizontal"> + android:src="@drawable/ic_eye"/> + android:src="@drawable/ic_eye"/>