diff --git a/app/build.gradle b/app/build.gradle
index ea53098..a2c258d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
@@ -30,9 +30,10 @@ android {
dependencies {
- implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+ implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.+'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+ implementation 'com.basgeekball:awesome-validation:4.2'
}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/pizzujemyv3/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/pizzujemyv3/ExampleInstrumentedTest.java
index 7f395ab..3c11480 100644
--- a/app/src/androidTest/java/com/example/pizzujemyv3/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/example/pizzujemyv3/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
package com.example.pizzujemyv3;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d5d4964..dd87ccb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.PizzujemyV3">
-
+
+
+
diff --git a/app/src/main/java/com/example/pizzujemyv3/CartActivity.java b/app/src/main/java/com/example/pizzujemyv3/CartActivity.java
index 7e5dcb8..a43e278 100644
--- a/app/src/main/java/com/example/pizzujemyv3/CartActivity.java
+++ b/app/src/main/java/com/example/pizzujemyv3/CartActivity.java
@@ -1,7 +1,6 @@
package com.example.pizzujemyv3;
-import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
diff --git a/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java b/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java
index cd04342..b0f3839 100644
--- a/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java
+++ b/app/src/main/java/com/example/pizzujemyv3/CartAdapter.java
@@ -1,10 +1,9 @@
package com.example.pizzujemyv3;
import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -14,7 +13,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
-import java.io.Serializable;
import java.util.ArrayList;
public class CartAdapter extends ArrayAdapter {
diff --git a/app/src/main/java/com/example/pizzujemyv3/CollectFormActivity.java b/app/src/main/java/com/example/pizzujemyv3/CollectFormActivity.java
new file mode 100644
index 0000000..ba9b2af
--- /dev/null
+++ b/app/src/main/java/com/example/pizzujemyv3/CollectFormActivity.java
@@ -0,0 +1,51 @@
+package com.example.pizzujemyv3;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.basgeekball.awesomevalidation.AwesomeValidation;
+import com.basgeekball.awesomevalidation.ValidationStyle;
+import com.basgeekball.awesomevalidation.utility.RegexTemplate;
+
+public class CollectFormActivity extends AppCompatActivity {
+
+ EditText tUserName, tUserNameS, tPhoneNumber;
+ Button zamowButton;
+ AwesomeValidation awesomeValidation;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_collect_form);
+ tUserName = findViewById(R.id.txtUserName);
+ tUserNameS = findViewById(R.id.txtUserNameS);
+ tPhoneNumber = findViewById(R.id.txtPhoneNumber);
+ zamowButton = findViewById((R.id.Confirm));
+ awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC);
+
+ awesomeValidation.addValidation(this,R.id.txtUserName, RegexTemplate.NOT_EMPTY,R.string.invalid_name);
+
+ awesomeValidation.addValidation(this,R.id.txtUserNameS, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS);
+
+ awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[5-9]{1}[0-9]{9}$",R.string.invalid_number);
+
+ zamowButton.setOnClickListener(new View.OnClickListener()
+ {
+ @Override
+ public void onClick(View v) {
+ if (awesomeValidation.validate()){
+ Intent intent = new Intent(CollectFormActivity.this, Menu.class);
+ startActivity(intent);
+ }
+ else{
+ Toast.makeText(getApplicationContext(),"Wprowadź dane poprawnie", Toast.LENGTH_LONG).show();
+ }
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivity.java b/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivity.java
new file mode 100644
index 0000000..e263040
--- /dev/null
+++ b/app/src/main/java/com/example/pizzujemyv3/DeliveryFormActivity.java
@@ -0,0 +1,60 @@
+package com.example.pizzujemyv3;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.basgeekball.awesomevalidation.AwesomeValidation;
+import com.basgeekball.awesomevalidation.ValidationStyle;
+import com.basgeekball.awesomevalidation.utility.RegexTemplate;
+
+public class DeliveryFormActivity extends AppCompatActivity {
+
+ EditText tUserName, tUserNameS, tPhoneNumber, tCity, tStreet, tStreetNumber;
+ Button zamowButton;
+ AwesomeValidation awesomeValidation;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_collect_form);
+ tUserName = findViewById(R.id.txtUserName);
+ tUserNameS = findViewById(R.id.txtUserNameS);
+ tPhoneNumber = findViewById(R.id.txtPhoneNumber);
+ tCity = findViewById(R.id.txtCity);
+ tStreet = findViewById(R.id.txtStreet);
+ tStreetNumber = findViewById(R.id.txtStreetNumber);
+ zamowButton = findViewById((R.id.Confirm));
+
+ awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC);
+
+ awesomeValidation.addValidation(this,R.id.txtUserName, RegexTemplate.NOT_EMPTY,R.string.invalid_name);
+
+ awesomeValidation.addValidation(this,R.id.txtUserNameS, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS);
+
+ awesomeValidation.addValidation(this,R.id.txtPhoneNumber, "[5-9]{1}[0-9]{9}$",R.string.invalid_number);
+
+ awesomeValidation.addValidation(this,R.id.txtCity, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS);
+ awesomeValidation.addValidation(this,R.id.txtStreet, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS);
+ awesomeValidation.addValidation(this,R.id.txtStreetNumber, RegexTemplate.NOT_EMPTY,R.string.invalid_nameS);
+
+
+ zamowButton.setOnClickListener(new View.OnClickListener()
+ {
+ @Override
+ public void onClick(View v) {
+ if (awesomeValidation.validate()){
+ Intent intent = new Intent(DeliveryFormActivity.this, Menu.class);
+ startActivity(intent);
+ }
+ else{
+ Toast.makeText(getApplicationContext(),"Wprowadź dane poprawnie", Toast.LENGTH_LONG).show();
+ }
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pizzujemyv3/MainActivity.java b/app/src/main/java/com/example/pizzujemyv3/MainActivity.java
index 4ebd741..0e51448 100644
--- a/app/src/main/java/com/example/pizzujemyv3/MainActivity.java
+++ b/app/src/main/java/com/example/pizzujemyv3/MainActivity.java
@@ -1,13 +1,13 @@
package com.example.pizzujemyv3;
import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
public class MainActivity extends AppCompatActivity {
- Button menuButton;
+ Button menuButton, dowozButton, odbiorButton;
public static SQLiteHelper sqLiteHelper;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -24,7 +24,27 @@ public class MainActivity extends AppCompatActivity {
});
- sqLiteHelper = new SQLiteHelper(this, "pizza.sqlite", null, 1);
- sqLiteHelper.queryData("CREATE TABLE IF NOT EXISTS PIZZA(name VARCHAR, price VARCHAR, image BLOG)");
+ odbiorButton = findViewById(R.id.odbior);
+ odbiorButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ Intent intent = new Intent(MainActivity.this, CollectFormActivity.class);
+ startActivity(intent);
+ }
+
+
+ });
+ dowozButton = findViewById(R.id.dowoz);
+ dowozButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ Intent intent = new Intent(MainActivity.this, DeliveryFormActivity.class);
+ startActivity(intent);
+ }
+
+
+ });
+
+
+
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pizzujemyv3/Menu.java b/app/src/main/java/com/example/pizzujemyv3/Menu.java
index 73f96e3..7909acf 100644
--- a/app/src/main/java/com/example/pizzujemyv3/Menu.java
+++ b/app/src/main/java/com/example/pizzujemyv3/Menu.java
@@ -1,12 +1,11 @@
package com.example.pizzujemyv3;
import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.ListView;
-import android.widget.Toast;
import java.util.ArrayList;
diff --git a/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java b/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java
index 990ab20..4d6963e 100644
--- a/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java
+++ b/app/src/main/java/com/example/pizzujemyv3/PizzaAdapter.java
@@ -1,10 +1,9 @@
package com.example.pizzujemyv3;
import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -14,7 +13,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
-import java.io.Serializable;
import java.util.ArrayList;
public class PizzaAdapter extends ArrayAdapter {
diff --git a/app/src/main/java/com/example/pizzujemyv3/SQLiteHelper.java b/app/src/main/java/com/example/pizzujemyv3/SQLiteHelper.java
index 5c70628..6c1a682 100644
--- a/app/src/main/java/com/example/pizzujemyv3/SQLiteHelper.java
+++ b/app/src/main/java/com/example/pizzujemyv3/SQLiteHelper.java
@@ -5,7 +5,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteStatement;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
public class SQLiteHelper extends SQLiteOpenHelper {
public SQLiteHelper(@Nullable Context context, @Nullable String name, @Nullable SQLiteDatabase.CursorFactory factory, int version) {
diff --git a/app/src/main/res/layout/activity_collect_form.xml b/app/src/main/res/layout/activity_collect_form.xml
new file mode 100644
index 0000000..f7187f1
--- /dev/null
+++ b/app/src/main/res/layout/activity_collect_form.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_delivery_form.xml b/app/src/main/res/layout/activity_delivery_form.xml
new file mode 100644
index 0000000..660248e
--- /dev/null
+++ b/app/src/main/res/layout/activity_delivery_form.xml
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a453b37..00ce612 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,4 +8,14 @@
ActivityMain
Menu
Zamów
+ Imię
+ Nazwisko
+ Numer telefonu
+ Miasto
+ Ulica
+ Numer
+ Wprowadź imie
+ Wprowadź nazwisko
+ Wprowadź poprawny numer telefonu
+
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index fbf26e6..71cf603 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit