Skip to content

Commit

Permalink
Changed EditTexts to the new TextInputLayout
Browse files Browse the repository at this point in the history
  • Loading branch information
@gourabsingha1 @aaronbrethorst
gourabsingha1 authored and aaronbrethorst committed Mar 21, 2024
1 parent a18606f commit e36d188
Show file tree
Hide file tree
Showing 8 changed files with 117 additions and 63 deletions.
28 changes: 17 additions & 11 deletions onebusaway-android/src/main/res/layout/activity_feedback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,25 @@
android:layout_marginTop="2dp"
android:orientation="horizontal">

<EditText
android:id="@+id/editFeedbackText"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="366dp"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:ems="10"
android:hint="@string/feedback_freeText"
android:inputType="textMultiLine" />
android:hint="@string/feedback_freeText" >

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/editFeedbackText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:ems="10"
android:inputType="textMultiLine" />

</com.google.android.material.textfield.TextInputLayout>
</FrameLayout>

<FrameLayout
Expand Down
16 changes: 11 additions & 5 deletions onebusaway-android/src/main/res/layout/infrastructure_issue.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,21 @@
android:src="@drawable/ic_drawer_maps_place"
android:id="@+id/ri_ic_location"/>

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/rt_address_hint">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/ri_address_editText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionSearch"
android:inputType="textPostalAddress"
android:maxLines="2"
style="@style/MaterialItem"
android:hint="@string/rt_address_hint"/>
android:layout_marginStart="56dp" />

</com.google.android.material.textfield.TextInputLayout>

</FrameLayout>

Expand Down
14 changes: 10 additions & 4 deletions onebusaway-android/src/main/res/layout/report_issue_text_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@
android:src="@drawable/ic_question_answer"
android:id="@+id/ri_ic_question_answer"/>

<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/riti_editText"
style="@style/MaterialItem"/>
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</com.google.android.material.textfield.TextInputLayout>


</FrameLayout>
</RelativeLayout>
23 changes: 14 additions & 9 deletions onebusaway-android/src/main/res/layout/report_stop_problem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,20 @@
android:layout_marginTop="2dp"
android:orientation="horizontal">

<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:id="@+id/report_problem_comment"
android:hint="@string/report_problem_comment_hint"
android:maxLines="4"
android:lines="2"
style="@style/MaterialItem"/>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginStart="56dp"
android:hint="@string/report_problem_comment_hint">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/report_problem_comment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="4"
android:lines="2"/>
</com.google.android.material.textfield.TextInputLayout>
</FrameLayout>

<FrameLayout
Expand Down
40 changes: 25 additions & 15 deletions onebusaway-android/src/main/res/layout/report_trip_problem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,20 @@
android:layout_marginTop="2dp"
android:orientation="horizontal">

<EditText
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginStart="56dp"
android:hint="@string/report_problem_comment_hint">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/report_problem_comment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:id="@+id/report_problem_comment"
android:hint="@string/report_problem_comment_hint"
android:maxLines="4"
android:lines="2"
style="@style/MaterialItem"/>
android:lines="2"/>
</com.google.android.material.textfield.TextInputLayout>
</FrameLayout>

<FrameLayout
Expand All @@ -107,15 +112,20 @@
android:layout_marginTop="2dp"
android:orientation="horizontal">

<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:id="@+id/report_problem_uservehicle"
android:hint="@string/report_problem_uservehicle_hint"
android:maxLines="4"
android:lines="2"
style="@style/MaterialItem"/>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/report_problem_uservehicle_hint">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/report_problem_uservehicle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="4"
android:lines="2"
android:layout_marginTop="2dp"
android:layout_marginStart="56dp" />
</com.google.android.material.textfield.TextInputLayout>
</FrameLayout>

<FrameLayout
Expand Down
14 changes: 11 additions & 3 deletions onebusaway-android/src/main/res/layout/search_box.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,22 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="@style/FindSearchBox">
<EditText

<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/search_text"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:singleLine="true"
android:imeOptions="actionSearch"/>

</com.google.android.material.textfield.TextInputLayout>

<ImageButton
android:id="@+id/search_button"
android:src="@drawable/ic_btn_search"
Expand Down
26 changes: 20 additions & 6 deletions onebusaway-android/src/main/res/layout/travel_behavior_email_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,32 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<EditText
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/travel_behavior_email_hint">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tb_email_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:inputType="textEmailAddress"
android:hint="@string/travel_behavior_email_hint" />
android:inputType="textEmailAddress" />

</com.google.android.material.textfield.TextInputLayout>


<EditText
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/travel_behavior_confirm_email_hint">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tb_email_edittext_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:hint="@string/travel_behavior_confirm_email_hint" />
android:layout_marginBottom="10dp"
android:inputType="textEmailAddress" />

</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
19 changes: 9 additions & 10 deletions onebusaway-android/src/main/res/layout/trip_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,17 @@
android:layout_height="wrap_content">
</Button>

<TextView
style="@style/FormLabel"
android:text="@string/trip_info_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
</TextView>
<EditText
android:hint="@string/trip_info_name_hint"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/trip_info_name_hint">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/name"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
</EditText>
android:layout_height="wrap_content" />

</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

0 comments on commit e36d188

Please sign in to comment.