diff --git a/Lookify/.idea/gradle.xml b/Lookify/.idea/gradle.xml index 720b1e7..afb74f2 100644 --- a/Lookify/.idea/gradle.xml +++ b/Lookify/.idea/gradle.xml @@ -1,8 +1,11 @@ + diff --git a/Lookify/app/src/main/java/com/example/lookifyv2/Favourites.java b/Lookify/app/src/main/java/com/example/lookifyv2/Favourites.java index 5f2bc29..21ea3b5 100644 --- a/Lookify/app/src/main/java/com/example/lookifyv2/Favourites.java +++ b/Lookify/app/src/main/java/com/example/lookifyv2/Favourites.java @@ -82,7 +82,7 @@ public class Favourites extends AppCompatActivity { protected Void doInBackground(Void... Void) { OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("http://192.168.8.101/products.php?id=0").build(); + Request request = new Request.Builder().url("http://192.168.0.87/products.php?id=0").build(); try { Response response = client.newCall(request).execute(); diff --git a/Lookify/app/src/main/java/com/example/lookifyv2/Help.java b/Lookify/app/src/main/java/com/example/lookifyv2/Help.java index 9e9423c..c2dcaa5 100644 --- a/Lookify/app/src/main/java/com/example/lookifyv2/Help.java +++ b/Lookify/app/src/main/java/com/example/lookifyv2/Help.java @@ -3,6 +3,8 @@ package com.example.lookifyv2; import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; +import android.text.method.ScrollingMovementMethod; +import android.widget.TextView; public class Help extends AppCompatActivity { @@ -11,6 +13,9 @@ public class Help extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_help); + TextView text = findViewById(R.id.help); + text.setMovementMethod(new ScrollingMovementMethod()); + assert getSupportActionBar() != null; getSupportActionBar().setDisplayHomeAsUpEnabled(true); } diff --git a/Lookify/app/src/main/java/com/example/lookifyv2/Results.java b/Lookify/app/src/main/java/com/example/lookifyv2/Results.java index 6ee5833..17364f0 100644 --- a/Lookify/app/src/main/java/com/example/lookifyv2/Results.java +++ b/Lookify/app/src/main/java/com/example/lookifyv2/Results.java @@ -81,7 +81,7 @@ public class Results extends AppCompatActivity { protected Void doInBackground(Void... Void) { OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("http://192.168.8.101/products.php?id=0").build(); + Request request = new Request.Builder().url("http://192.168.0.87/products.php?id=0").build(); try { Response response = client.newCall(request).execute(); diff --git a/Lookify/app/src/main/res/layout/activity_about.xml b/Lookify/app/src/main/res/layout/activity_about.xml index 1211539..9345dd4 100644 --- a/Lookify/app/src/main/res/layout/activity_about.xml +++ b/Lookify/app/src/main/res/layout/activity_about.xml @@ -8,14 +8,21 @@ + app:layout_constraintVertical_bias="0.0" /> \ No newline at end of file diff --git a/Lookify/app/src/main/res/layout/activity_help.xml b/Lookify/app/src/main/res/layout/activity_help.xml index c81001e..b1cee6d 100644 --- a/Lookify/app/src/main/res/layout/activity_help.xml +++ b/Lookify/app/src/main/res/layout/activity_help.xml @@ -7,15 +7,23 @@ tools:context=".Help"> + app:layout_constraintVertical_bias="0.0" /> \ No newline at end of file diff --git a/Lookify/build.gradle b/Lookify/build.gradle index a5bb815..2afeee3 100644 --- a/Lookify/build.gradle +++ b/Lookify/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.6.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Lookify/gradle/wrapper/gradle-wrapper.properties b/Lookify/gradle/wrapper/gradle-wrapper.properties index 05f1be2..2c6c3c5 100644 --- a/Lookify/gradle/wrapper/gradle-wrapper.properties +++ b/Lookify/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Dec 18 17:40:14 CET 2019 +#Tue Feb 25 21:47:27 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/Lookify/openCVLibrary348/build/.transforms/9076f704402979be5217c77df337f793.bin b/Lookify/openCVLibrary348/build/.transforms/9076f704402979be5217c77df337f793.bin new file mode 100644 index 0000000..0d259dd --- /dev/null +++ b/Lookify/openCVLibrary348/build/.transforms/9076f704402979be5217c77df337f793.bin @@ -0,0 +1 @@ +o/classes diff --git a/Lookify/openCVLibrary348/build/.transforms/9076f704402979be5217c77df337f793/classes/classes.dex b/Lookify/openCVLibrary348/build/.transforms/9076f704402979be5217c77df337f793/classes/classes.dex new file mode 100644 index 0000000..d460fb1 Binary files /dev/null and b/Lookify/openCVLibrary348/build/.transforms/9076f704402979be5217c77df337f793/classes/classes.dex differ diff --git a/Lookify/openCVLibrary348/build/generated/aidl_source_output_dir/debug/out/org/opencv/engine/OpenCVEngineInterface.java b/Lookify/openCVLibrary348/build/generated/aidl_source_output_dir/debug/out/org/opencv/engine/OpenCVEngineInterface.java new file mode 100644 index 0000000..b49387c --- /dev/null +++ b/Lookify/openCVLibrary348/build/generated/aidl_source_output_dir/debug/out/org/opencv/engine/OpenCVEngineInterface.java @@ -0,0 +1,198 @@ +/* + * This file is auto-generated. DO NOT MODIFY. + */ +package org.opencv.engine; +/** +* Class provides a Java interface for OpenCV Engine Service. It's synchronous with native OpenCVEngine class. +*/ +public interface OpenCVEngineInterface extends android.os.IInterface +{ +/** Local-side IPC implementation stub class. */ +public static abstract class Stub extends android.os.Binder implements org.opencv.engine.OpenCVEngineInterface +{ +private static final java.lang.String DESCRIPTOR = "org.opencv.engine.OpenCVEngineInterface"; +/** Construct the stub at attach it to the interface. */ +public Stub() +{ +this.attachInterface(this, DESCRIPTOR); +} +/** + * Cast an IBinder object into an org.opencv.engine.OpenCVEngineInterface interface, + * generating a proxy if needed. + */ +public static org.opencv.engine.OpenCVEngineInterface asInterface(android.os.IBinder obj) +{ +if ((obj==null)) { +return null; +} +android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR); +if (((iin!=null)&&(iin instanceof org.opencv.engine.OpenCVEngineInterface))) { +return ((org.opencv.engine.OpenCVEngineInterface)iin); +} +return new org.opencv.engine.OpenCVEngineInterface.Stub.Proxy(obj); +} +@Override public android.os.IBinder asBinder() +{ +return this; +} +@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException +{ +java.lang.String descriptor = DESCRIPTOR; +switch (code) +{ +case INTERFACE_TRANSACTION: +{ +reply.writeString(descriptor); +return true; +} +case TRANSACTION_getEngineVersion: +{ +data.enforceInterface(descriptor); +int _result = this.getEngineVersion(); +reply.writeNoException(); +reply.writeInt(_result); +return true; +} +case TRANSACTION_getLibPathByVersion: +{ +data.enforceInterface(descriptor); +java.lang.String _arg0; +_arg0 = data.readString(); +java.lang.String _result = this.getLibPathByVersion(_arg0); +reply.writeNoException(); +reply.writeString(_result); +return true; +} +case TRANSACTION_installVersion: +{ +data.enforceInterface(descriptor); +java.lang.String _arg0; +_arg0 = data.readString(); +boolean _result = this.installVersion(_arg0); +reply.writeNoException(); +reply.writeInt(((_result)?(1):(0))); +return true; +} +case TRANSACTION_getLibraryList: +{ +data.enforceInterface(descriptor); +java.lang.String _arg0; +_arg0 = data.readString(); +java.lang.String _result = this.getLibraryList(_arg0); +reply.writeNoException(); +reply.writeString(_result); +return true; +} +default: +{ +return super.onTransact(code, data, reply, flags); +} +} +} +private static class Proxy implements org.opencv.engine.OpenCVEngineInterface +{ +private android.os.IBinder mRemote; +Proxy(android.os.IBinder remote) +{ +mRemote = remote; +} +@Override public android.os.IBinder asBinder() +{ +return mRemote; +} +public java.lang.String getInterfaceDescriptor() +{ +return DESCRIPTOR; +} +@Override public int getEngineVersion() throws android.os.RemoteException +{ +android.os.Parcel _data = android.os.Parcel.obtain(); +android.os.Parcel _reply = android.os.Parcel.obtain(); +int _result; +try { +_data.writeInterfaceToken(DESCRIPTOR); +mRemote.transact(Stub.TRANSACTION_getEngineVersion, _data, _reply, 0); +_reply.readException(); +_result = _reply.readInt(); +} +finally { +_reply.recycle(); +_data.recycle(); +} +return _result; +} +@Override public java.lang.String getLibPathByVersion(java.lang.String version) throws android.os.RemoteException +{ +android.os.Parcel _data = android.os.Parcel.obtain(); +android.os.Parcel _reply = android.os.Parcel.obtain(); +java.lang.String _result; +try { +_data.writeInterfaceToken(DESCRIPTOR); +_data.writeString(version); +mRemote.transact(Stub.TRANSACTION_getLibPathByVersion, _data, _reply, 0); +_reply.readException(); +_result = _reply.readString(); +} +finally { +_reply.recycle(); +_data.recycle(); +} +return _result; +} +/** + * Tries to install defined version of OpenCV from Google Play Market. + * @param OpenCV version. + * @return Returns true if installation was successful or OpenCV package has been already installed. + */ +@Override public boolean installVersion(java.lang.String version) throws android.os.RemoteException +{ +android.os.Parcel _data = android.os.Parcel.obtain(); +android.os.Parcel _reply = android.os.Parcel.obtain(); +boolean _result; +try { +_data.writeInterfaceToken(DESCRIPTOR); +_data.writeString(version); +mRemote.transact(Stub.TRANSACTION_installVersion, _data, _reply, 0); +_reply.readException(); +_result = (0!=_reply.readInt()); +} +finally { +_reply.recycle(); +_data.recycle(); +} +return _result; +} +@Override public java.lang.String getLibraryList(java.lang.String version) throws android.os.RemoteException +{ +android.os.Parcel _data = android.os.Parcel.obtain(); +android.os.Parcel _reply = android.os.Parcel.obtain(); +java.lang.String _result; +try { +_data.writeInterfaceToken(DESCRIPTOR); +_data.writeString(version); +mRemote.transact(Stub.TRANSACTION_getLibraryList, _data, _reply, 0); +_reply.readException(); +_result = _reply.readString(); +} +finally { +_reply.recycle(); +_data.recycle(); +} +return _result; +} +} +static final int TRANSACTION_getEngineVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); +static final int TRANSACTION_getLibPathByVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); +static final int TRANSACTION_installVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); +static final int TRANSACTION_getLibraryList = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3); +} +public int getEngineVersion() throws android.os.RemoteException; +public java.lang.String getLibPathByVersion(java.lang.String version) throws android.os.RemoteException; +/** + * Tries to install defined version of OpenCV from Google Play Market. + * @param OpenCV version. + * @return Returns true if installation was successful or OpenCV package has been already installed. + */ +public boolean installVersion(java.lang.String version) throws android.os.RemoteException; +public java.lang.String getLibraryList(java.lang.String version) throws android.os.RemoteException; +} diff --git a/Lookify/openCVLibrary348/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/Lookify/openCVLibrary348/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json index c403c4d..920fb58 100644 --- a/Lookify/openCVLibrary348/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json +++ b/Lookify/openCVLibrary348/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json @@ -1 +1 @@ -[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":3480,"versionName":"3.4.8","enabled":true,"outputFile":"openCVLibrary348-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"org.opencv","split":""}}] \ No newline at end of file +[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":3480,"versionName":"3.4.8","enabled":true,"outputFile":"openCVLibrary348-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"org.opencv","split":""}}] \ No newline at end of file diff --git a/Lookify/openCVLibrary348/build/intermediates/compile_library_classes/debug/classes.jar b/Lookify/openCVLibrary348/build/intermediates/compile_library_classes/debug/classes.jar index cce7ad7..7a2b3d4 100644 Binary files a/Lookify/openCVLibrary348/build/intermediates/compile_library_classes/debug/classes.jar and b/Lookify/openCVLibrary348/build/intermediates/compile_library_classes/debug/classes.jar differ diff --git a/Lookify/openCVLibrary348/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/Lookify/openCVLibrary348/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar index 794b9c2..6ad9d37 100644 Binary files a/Lookify/openCVLibrary348/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar and b/Lookify/openCVLibrary348/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/Lookify/openCVLibrary348/build/intermediates/compile_symbol_list/debug/R.txt b/Lookify/openCVLibrary348/build/intermediates/compile_symbol_list/debug/R.txt new file mode 100644 index 0000000..d1d557c --- /dev/null +++ b/Lookify/openCVLibrary348/build/intermediates/compile_symbol_list/debug/R.txt @@ -0,0 +1,8 @@ +int attr camera_id 0x0 +int attr show_fps 0x0 +int id any 0x0 +int id back 0x0 +int id front 0x0 +int[] styleable CameraBridgeViewBase { 0x0, 0x0 } +int styleable CameraBridgeViewBase_camera_id 0 +int styleable CameraBridgeViewBase_show_fps 1 diff --git a/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugAssets/merger.xml b/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugAssets/merger.xml index 3dcd28c..d80515b 100644 --- a/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugAssets/merger.xml +++ b/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index d8dc314..f27d9fc 100644 --- a/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/Lookify/openCVLibrary348/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Fri Dec 20 20:43:57 CET 2019 +#Tue Feb 25 23:39:16 CET 2020 diff --git a/Lookify/openCVLibrary348/build/intermediates/local_only_symbol_list/debug/R-def.txt b/Lookify/openCVLibrary348/build/intermediates/local_only_symbol_list/debug/R-def.txt new file mode 100644 index 0000000..cfc1901 --- /dev/null +++ b/Lookify/openCVLibrary348/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -0,0 +1,8 @@ +R_DEF: Internal format may change without notice +local +attr? camera_id +attr? show_fps +id any +id back +id front +styleable CameraBridgeViewBase show_fps camera_id diff --git a/Lookify/openCVLibrary348/build/intermediates/merged_manifests/debug/output.json b/Lookify/openCVLibrary348/build/intermediates/merged_manifests/debug/output.json index d868634..a1e716d 100644 --- a/Lookify/openCVLibrary348/build/intermediates/merged_manifests/debug/output.json +++ b/Lookify/openCVLibrary348/build/intermediates/merged_manifests/debug/output.json @@ -1 +1 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":3480,"versionName":"3.4.8","enabled":true,"outputFile":"openCVLibrary348-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"org.opencv","split":""}}] \ No newline at end of file +[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":3480,"versionName":"3.4.8","enabled":true,"outputFile":"openCVLibrary348-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"org.opencv","split":""}}] \ No newline at end of file diff --git a/Lookify/openCVLibrary348/build/intermediates/navigation_json/debug/navigation.json b/Lookify/openCVLibrary348/build/intermediates/navigation_json/debug/navigation.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/Lookify/openCVLibrary348/build/intermediates/navigation_json/debug/navigation.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/Lookify/openCVLibrary348/build/intermediates/runtime_library_classes/debug/classes.jar b/Lookify/openCVLibrary348/build/intermediates/runtime_library_classes/debug/classes.jar index cce7ad7..a8655c3 100644 Binary files a/Lookify/openCVLibrary348/build/intermediates/runtime_library_classes/debug/classes.jar and b/Lookify/openCVLibrary348/build/intermediates/runtime_library_classes/debug/classes.jar differ diff --git a/Lookify/openCVLibrary348/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/Lookify/openCVLibrary348/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt new file mode 100644 index 0000000..be1c249 --- /dev/null +++ b/Lookify/openCVLibrary348/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -0,0 +1,7 @@ +org.opencv +attr camera_id +attr show_fps +id any +id back +id front +styleable CameraBridgeViewBase camera_id show_fps