From bbaca66e3ee2c6a4b24e553090b4170cb0147086 Mon Sep 17 00:00:00 2001 From: Kacper Dudzic Date: Wed, 8 Jan 2020 17:45:32 +0100 Subject: [PATCH] =?UTF-8?q?Dodaj=20pr=C3=B3bn=C4=85=20cz=C4=99=C5=9B=C4=87?= =?UTF-8?q?=20kodu=20odpowiedzialn=C4=85=20za=20komunikacj=C4=99=20z=20baz?= =?UTF-8?q?=C4=85=20danych=20online?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lookify/app/build.gradle | 6 ++ Lookify/app/src/main/AndroidManifest.xml | 6 +- .../example/lookifyv2/ConnectDatabase.java | 14 +++++ .../com/example/lookifyv2/PullDatabase.java | 14 +++++ .../src/main/res/layout/activity_about.xml | 2 +- .../res/layout/activity_connect_database.xml | 9 +++ .../src/main/res/layout/activity_decode.xml | 2 +- .../main/res/layout/activity_decode_fail.xml | 6 +- .../app/src/main/res/layout/activity_help.xml | 2 +- .../app/src/main/res/layout/activity_main.xml | 6 +- .../res/layout/activity_pull_database.xml | 20 +++++++ Lookify/app/src/main/res/layout/card.xml | 59 +++++++++++++++++++ .../app/src/main/res/menu/menu_context.xml | 13 ++++ Lookify/app/src/main/res/values/colors.xml | 10 ++++ 14 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 Lookify/app/src/main/java/com/example/lookifyv2/ConnectDatabase.java create mode 100644 Lookify/app/src/main/java/com/example/lookifyv2/PullDatabase.java create mode 100644 Lookify/app/src/main/res/layout/activity_connect_database.xml create mode 100644 Lookify/app/src/main/res/layout/activity_pull_database.xml create mode 100644 Lookify/app/src/main/res/layout/card.xml create mode 100644 Lookify/app/src/main/res/menu/menu_context.xml diff --git a/Lookify/app/build.gradle b/Lookify/app/build.gradle index 5b0cb79..6fa7867 100644 --- a/Lookify/app/build.gradle +++ b/Lookify/app/build.gradle @@ -33,4 +33,10 @@ dependencies { implementation project(path: ':openCVLibrary348') implementation 'com.journeyapps:zxing-android-embedded:3.0.2@aar' implementation 'com.google.zxing:core:3.2.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.10.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'com.github.bumptech.glide:glide:3.7.0' } diff --git a/Lookify/app/src/main/AndroidManifest.xml b/Lookify/app/src/main/AndroidManifest.xml index ff7d16f..b1ff686 100644 --- a/Lookify/app/src/main/AndroidManifest.xml +++ b/Lookify/app/src/main/AndroidManifest.xml @@ -5,6 +5,8 @@ + + - + + + diff --git a/Lookify/app/src/main/java/com/example/lookifyv2/ConnectDatabase.java b/Lookify/app/src/main/java/com/example/lookifyv2/ConnectDatabase.java new file mode 100644 index 0000000..74fc932 --- /dev/null +++ b/Lookify/app/src/main/java/com/example/lookifyv2/ConnectDatabase.java @@ -0,0 +1,14 @@ +package com.example.lookifyv2; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class ConnectDatabase extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_connect_database); + } +} diff --git a/Lookify/app/src/main/java/com/example/lookifyv2/PullDatabase.java b/Lookify/app/src/main/java/com/example/lookifyv2/PullDatabase.java new file mode 100644 index 0000000..ba9b384 --- /dev/null +++ b/Lookify/app/src/main/java/com/example/lookifyv2/PullDatabase.java @@ -0,0 +1,14 @@ +package com.example.lookifyv2; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class PullDatabase extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_pull_database); + } +} diff --git a/Lookify/app/src/main/res/layout/activity_about.xml b/Lookify/app/src/main/res/layout/activity_about.xml index 1c0da78..bf1466c 100644 --- a/Lookify/app/src/main/res/layout/activity_about.xml +++ b/Lookify/app/src/main/res/layout/activity_about.xml @@ -10,7 +10,7 @@ android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="About" + android:text="O aplikacji" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/Lookify/app/src/main/res/layout/activity_connect_database.xml b/Lookify/app/src/main/res/layout/activity_connect_database.xml new file mode 100644 index 0000000..db12dbb --- /dev/null +++ b/Lookify/app/src/main/res/layout/activity_connect_database.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/Lookify/app/src/main/res/layout/activity_decode.xml b/Lookify/app/src/main/res/layout/activity_decode.xml index c979e8f..ea9b055 100644 --- a/Lookify/app/src/main/res/layout/activity_decode.xml +++ b/Lookify/app/src/main/res/layout/activity_decode.xml @@ -10,7 +10,7 @@ android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Please wait a second..." + android:text="Proszę chwilę poczekać..." app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/Lookify/app/src/main/res/layout/activity_decode_fail.xml b/Lookify/app/src/main/res/layout/activity_decode_fail.xml index f2465c9..0dece61 100644 --- a/Lookify/app/src/main/res/layout/activity_decode_fail.xml +++ b/Lookify/app/src/main/res/layout/activity_decode_fail.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:text="Whoops! Barcode could not be found!" + android:text="Ups! Kodu kreskowego nie znaleziono!" app:layout_constraintBottom_toTopOf="@+id/try_again_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -23,7 +23,7 @@ android:id="@+id/try_again_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Try again" + android:text="Spróbuj ponownie" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="Return to menu" + android:text="Powrót do menu" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/Lookify/app/src/main/res/layout/activity_help.xml b/Lookify/app/src/main/res/layout/activity_help.xml index 41fe943..e0ec685 100644 --- a/Lookify/app/src/main/res/layout/activity_help.xml +++ b/Lookify/app/src/main/res/layout/activity_help.xml @@ -10,7 +10,7 @@ android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Help" + android:text="Pomoc" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/Lookify/app/src/main/res/layout/activity_main.xml b/Lookify/app/src/main/res/layout/activity_main.xml index 0a5d479..c6f2a1c 100644 --- a/Lookify/app/src/main/res/layout/activity_main.xml +++ b/Lookify/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ android:id="@+id/scan_start_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Scan" + android:text="Skanowanie" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="Help" + android:text="Pomoc" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="About" + android:text="O aplikacji" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/Lookify/app/src/main/res/layout/activity_pull_database.xml b/Lookify/app/src/main/res/layout/activity_pull_database.xml new file mode 100644 index 0000000..3815861 --- /dev/null +++ b/Lookify/app/src/main/res/layout/activity_pull_database.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/Lookify/app/src/main/res/layout/card.xml b/Lookify/app/src/main/res/layout/card.xml new file mode 100644 index 0000000..505489c --- /dev/null +++ b/Lookify/app/src/main/res/layout/card.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + diff --git a/Lookify/app/src/main/res/menu/menu_context.xml b/Lookify/app/src/main/res/menu/menu_context.xml new file mode 100644 index 0000000..5029e7a --- /dev/null +++ b/Lookify/app/src/main/res/menu/menu_context.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/Lookify/app/src/main/res/values/colors.xml b/Lookify/app/src/main/res/values/colors.xml index 69b2233..eb67b11 100644 --- a/Lookify/app/src/main/res/values/colors.xml +++ b/Lookify/app/src/main/res/values/colors.xml @@ -1,6 +1,16 @@ + + #2196F3 + #1976D2 + #BBDEFB + #03A9F4 + #FFFFFF + #727272 + #FFFFFF + #B6B6B6