This commit is contained in:
2017-10-10 22:27:15 +03:00
parent 73297d684e
commit 5e2abed2dd
8 changed files with 27 additions and 10 deletions

2
.idea/misc.xml generated
View File

@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View File

@@ -48,6 +48,7 @@ public class RegisterActivity extends BaseActivity {
setContentView(R.layout.activity_register);
ButterKnife.bind(this);
initViews();
setTestFields();
}
@OnClick(R.id.registerButton)
@@ -79,7 +80,7 @@ public class RegisterActivity extends BaseActivity {
return false;
}
if(pizzalinkEditTextList
if(!pizzalinkEditTextList
.get(4)
.getText()
.toLowerCase()
@@ -128,4 +129,19 @@ public class RegisterActivity extends BaseActivity {
}
});
}
private void setTestFields(){
pizzalinkEditTextList.get(0).getEditText().setText("testname");
pizzalinkEditTextList.get(1).getEditText().setText("testsurname");
pizzalinkEditTextList.get(2).getEditText().setText("1234567890");
pizzalinkEditTextList.get(3).getEditText().setText("test2@test.com");
pizzalinkEditTextList.get(4).getEditText().setText("test");
pizzalinkEditTextList.get(5).getEditText().setText("test");
pizzalinkEditTextList.get(6).getEditText().setText("test address 1");
pizzalinkEditTextList.get(7).getEditText().setText("test address 2");
pizzalinkEditTextList.get(8).getEditText().setText("test");
pizzalinkEditTextList.get(9).getEditText().setText("1234");
pizzalinkEditTextList.get(10).getEditText().setText("1");
pizzalinkEditTextList.get(11).getEditText().setText("1");
}
}

View File

@@ -30,8 +30,8 @@ public interface ApiInterface {
@Field("lastname") String lastname,
@Field("telephone") String telephone,
@Field("email") String email,
@Field("passsword") String passsword,
@Field("passsword1") String passswordRetype,
@Field("password") String passsword,
@Field("password1") String passswordRetype,
@Field("address_1") String addressLine1,
@Field("address_2") String addressLine2,
@Field("city") String passswocityrd,

View File

@@ -6,5 +6,5 @@
android:color="@color/bottom_menu_selected_item"
android:state_checked="true" />
<item android:color="@color/bottom_menu_unselected_item" />
<item android:color="@color/venus" />
</selector>

View File

@@ -55,7 +55,8 @@
android:id="@+id/passwordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password"/>
app:hint="@string/password"
app:inputType="password"/>
<android.support.v4.widget.Space
android:layout_width="match_parent"

View File

@@ -34,7 +34,7 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="@color/navigation_drawer_background"/>
android:background="@color/white"/>
</android.support.v4.widget.DrawerLayout>
@@ -47,7 +47,7 @@
app:itemTextColor="@drawable/selector_bottom_navigation_item"
android:background="@color/white"
app:menu="@menu/menu_bottom_navigation"
app:itemBackground="@color/black"/>
app:itemBackground="@color/white"/>
</RelativeLayout>

View File

@@ -4,7 +4,7 @@
android:id="@+id/categoryNameItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textColor="@color/navigation_drawer_background"
android:paddingLeft="20dp"
android:paddingStart="20dp"
android:paddingRight="20dp"

View File

@@ -4,7 +4,7 @@
android:id="@+id/subcategoryNameItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textColor="@color/navigation_drawer_background"
android:paddingLeft="40dp"
android:paddingStart="40dp"
android:paddingRight="40dp"