Merge pull request #65 from domoticz/development-branch

Development branch (v0.1.127)

Author: galadril

app/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 51
-        versionName '0.1.206'
+        versionCode 62
+        versionName '0.1.217'
         multiDexEnabled true
     }
 
@@ -18,6 +18,9 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            lintOptions {
+                disable 'MissingTranslation'
+            }
         }
     }
 
@@ -76,15 +79,17 @@ dependencies {
     }
     compile 'com.mcxiaoke.volley:library:1.0.15'
     compile 'com.android.support:design:23.1.1'
-    compile 'de.hdodenhof:circleimageview:1.2.1'
-    compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
     compile 'com.marvinlabs:android-floatinglabel-widgets:1.6.1@aar'
     compile 'com.splunk.mint:mint:4.4.0'
     compile 'com.larswerkman:lobsterpicker:1.0.0'
     compile 'com.github.lecho:hellocharts-library:1.5.8@aar'
     compile 'com.github.dexafree:materiallist:3.1.2'
     compile 'com.github.hotchemi:android-rate:0.5.6'
+    compile 'com.github.Triggertrap:SeekArc:+'
+    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.github.fenjuly:SpinnerLoader:fd5b8ab578'
+    compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
 
     paidWearApp project(path: ':wear', configuration: 'paidRelease')
 }

app/src/main/AndroidManifest.xml

@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="nl.hnogames.domoticz">
 
     <supports-screens
-        android:resizeable="true"
-        android:smallScreens="true"
+        android:anyDensity="true"
         android:largeScreens="true"
-        android:xlargeScreens="true"
         android:normalScreens="true"
-        android:anyDensity="true"/>
-
+        android:resizeable="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
 
     <permission
-        android:name="nl.hnogames.domoticz.permission.MAPS_RECEIVE"
+        android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="nl.hnogames.domoticz.permission.MAPS_RECEIVE" />
+    <uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -92,7 +91,7 @@
         <activity
             android:name=".WidgetActionActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Domoticz Widget Action"/>
+            android:label="Domoticz Widget Action" />
 
         <service android:name=".Service.WidgetProviderLarge$UpdateWidgetService" />
 
@@ -167,7 +166,7 @@
         <activity
             android:name=".Welcome.WelcomeViewActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/welcome_title_activity_welcome"/>
+            android:label="@string/welcome_title_activity_welcome" />
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"

app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java

@@ -27,27 +27,30 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.squareup.picasso.MemoryPolicy;
-import com.squareup.picasso.NetworkPolicy;
-import com.squareup.picasso.Picasso;
+import com.android.volley.toolbox.ImageLoader;
 
 import java.util.ArrayList;
 
 import nl.hnogames.domoticz.Containers.CameraInfo;
+import nl.hnogames.domoticz.Domoticz.Domoticz;
 import nl.hnogames.domoticz.R;
+import nl.hnogames.domoticz.Utils.RequestUtil;
+import nl.hnogames.domoticz.Utils.SessionUtil;
+
 
 @SuppressWarnings("unused")
 public class CamerasAdapter extends RecyclerView.Adapter<CamerasAdapter.DataObjectHolder> {
     private static onClickListener onClickListener;
     private final Context mContext;
     private ArrayList<CameraInfo> mDataset;
+    private Domoticz domoticz;
 
-    public CamerasAdapter(ArrayList<CameraInfo> data, Context mContext) {
+    public CamerasAdapter(ArrayList<CameraInfo> data, Context mContext, Domoticz domoticz) {
         this.mDataset = data;
         this.mContext = mContext;
+        this.domoticz=domoticz;
     }
 
     public void setOnItemClickListener(onClickListener onClickListener) {
@@ -64,23 +67,19 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(DataObjectHolder holder, int position) {
-
         if (mDataset != null && mDataset.size() > 0) {
             CameraInfo cameraInfo = mDataset.get(position);
             String name = cameraInfo.getName();
             String address = cameraInfo.getAddress();
-            String imageUrl = cameraInfo.getImageURL();
+            String imageUrl = cameraInfo.getSnapShotURL();
 
-            int numberOfDevices = mDataset.get(position).getDevices();
+            int numberOfDevices = cameraInfo.getDevices();
             String text = mContext.getResources().getQuantityString(R.plurals.devices, numberOfDevices, numberOfDevices);
-
             holder.name.setText(name);
 
-            Picasso.with(mContext)
-                    .load(cameraInfo.getFullURL())
-                    .memoryPolicy(MemoryPolicy.NO_CACHE, MemoryPolicy.NO_STORE)
-                    .networkPolicy(NetworkPolicy.NO_CACHE)
-                    .into(holder.camera);
+            ImageLoader imageLoader = RequestUtil.getImageLoader(domoticz, new SessionUtil(mContext), mContext);
+            holder.camera.setImageUrl(imageUrl, imageLoader);
+            holder.camera.setDefaultImageResId(R.drawable.placeholder);
         }
     }
 
@@ -89,20 +88,19 @@ public int getItemCount() {
         return mDataset.size();
     }
 
-
     public interface onClickListener {
         void onItemClick(int position, View v);
     }
 
     public static class DataObjectHolder extends RecyclerView.ViewHolder
             implements View.OnClickListener {
         TextView name;
-        ImageView camera;
+        com.android.volley.toolbox.NetworkImageView camera;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
             name = (TextView) itemView.findViewById(R.id.name);
-            camera = (ImageView) itemView.findViewById(R.id.image);
+            camera = (com.android.volley.toolbox.NetworkImageView) itemView.findViewById(R.id.image);
             itemView.setOnClickListener(this);
         }