Version 1.0.0.52-rc: Small UI Tweaks

developerfromjokela · Jan 29, 2020 · 55637ad · 55637ad
1 parent 5910354
commit 55637ad
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 60 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
 def versionMajor = 1
 def versionMinor = 0
 def versionPatch = 0
-def versionBuild = 51 // 0-50=Alpha / 51-98=RC / 90-99=stable
+def versionBuild = 52 // 0-50=Alpha / 51-98=RC / 90-99=stable
 android {
     compileSdkVersion 28
     defaultConfig {

diff --git a/app/src/main/java/com/developerfromjokela/motioneyeclient/other/Utils.java b/app/src/main/java/com/developerfromjokela/motioneyeclient/other/Utils.java
@@ -102,7 +102,7 @@ public static String getCurrentWifiBSSID(Context context) {
         ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
         if (networkInfo.isConnected()) {
-            final WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+            final WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
             final WifiInfo connectionInfo = wifiManager.getConnectionInfo();
             if (connectionInfo != null && !StringUtil.isBlank(connectionInfo.getBSSID())) {
                 bSSID = connectionInfo.getBSSID();
@@ -116,7 +116,7 @@ public static int getCurrentWifiNetworkId(Context context) {
         ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
         if (networkInfo.isConnected()) {
-            final WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+            final WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
             final WifiInfo connectionInfo = wifiManager.getConnectionInfo();
             if (connectionInfo != null) {
                 networkId = connectionInfo.getNetworkId();

diff --git a/app/src/main/java/com/developerfromjokela/motioneyeclient/ui/activities/CameraViewer.java b/app/src/main/java/com/developerfromjokela/motioneyeclient/ui/activities/CameraViewer.java
@@ -400,7 +400,7 @@ protected CameraImage doInBackground(String... urls) {
                 e.printStackTrace();
                 return new CameraImage(false, e.getMessage());
             }
-            return null;
+            return new CameraImage(false, "Got no image from motionEye");
 
         }
 

diff --git a/app/src/main/res/layout/activity_full_camera_viewer.xml b/app/src/main/res/layout/activity_full_camera_viewer.xml
@@ -20,12 +20,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.activities.FullCameraViewer"
-    android:animateLayoutChanges="true"
-    android:gravity="center_horizontal|center_vertical"
-    android:orientation="vertical">
-
-
+    android:gravity="start"
+    android:orientation="vertical"
+    tools:context=".ui.activities.FullCameraViewer">
 
         <LinearLayout
             android:id="@+id/progressBar"
@@ -224,7 +221,6 @@
             </LinearLayout>
 
         </RelativeLayout>
-
 </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/camera.xml b/app/src/main/res/layout/camera.xml
@@ -16,67 +16,68 @@
   -->
 
 
-<android.support.v7.widget.CardView android:id="@+id/itemCard"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView 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"
-    app:cardElevation="6dp"
+    android:id="@+id/itemCard"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_margin="10dp"
+    app:cardElevation="6dp">
 
-        <LinearLayout
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="7dp"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/cameraImage"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="7dp"
-            android:orientation="vertical">
+            android:layout_height="300dp"
+            android:scaleType="fitCenter"
+            android:visibility="gone"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
 
-            <ImageView
-                android:id="@+id/cameraImage"
-                android:layout_width="match_parent"
-                android:layout_height="300dp"
-                android:scaleType="fitCenter"
-                android:visibility="gone"
-                tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+        <LinearLayout
+            android:id="@+id/cameraBar"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:gravity="center_horizontal|center_vertical"
+            android:orientation="vertical"
+            android:visibility="visible">
 
-            <LinearLayout
-                android:id="@+id/cameraBar"
+            <TextView
+                android:id="@+id/status"
                 android:layout_width="match_parent"
-                android:layout_height="300dp"
+                android:layout_height="wrap_content"
                 android:gravity="center_horizontal|center_vertical"
-                android:orientation="vertical"
-                android:visibility="visible">
-
-                <TextView
-                    android:id="@+id/status"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:text="@string/loading"
-                    android:textSize="24sp"
-                    android:visibility="visible" />
+                android:text="@string/loading"
+                android:textSize="24sp"
+                android:visibility="visible" />
 
-                <ProgressBar
-                    android:id="@+id/progressar"
-                    style="?android:attr/progressBarStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <Button
-                    android:id="@+id/tryagain"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/try_again"
-                    android:visibility="gone" />
-
-            </LinearLayout>
+            <ProgressBar
+                android:id="@+id/progressar"
+                style="?android:attr/progressBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-            <TextView
-                android:id="@+id/fps"
+            <Button
+                android:id="@+id/tryagain"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="0 fps"
-                android:textSize="18sp" />
+                android:text="@string/try_again"
+                android:visibility="gone" />
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+
+        <TextView
+            android:id="@+id/fps"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:text="0 fps"
+            android:textSize="18sp" />
+
+    </LinearLayout>
+</android.support.v7.widget.CardView>