Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #164 Enhance UI of home page #165

Merged
merged 1 commit into from Aug 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions visionppi/app/src/main/res/drawable-anydpi/ic_search.xml
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#333333"
android:alpha="0.6">
<path
android:fillColor="@android:color/white"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions visionppi/app/src/main/res/drawable/list_selector.xml
Expand Up @@ -2,9 +2,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@color/blueDark"
/>
<item
android:drawable="@color/lightGray"
android:drawable="@color/primary"
/>
</selector>
5 changes: 5 additions & 0 deletions visionppi/app/src/main/res/layout/client_search_row.xml
Expand Up @@ -26,4 +26,9 @@
android:paddingLeft="@dimen/foursp_margin"
android:paddingBottom="@dimen/foursp_margin"/>

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>

</LinearLayout>
57 changes: 34 additions & 23 deletions visionppi/app/src/main/res/layout/content_main.xml
Expand Up @@ -20,37 +20,48 @@
style="@style/heading_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/foursp_margin"
android:layout_marginBottom="@dimen/foursp_margin"
android:text="@string/search" />

<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/textView6"
style="@style/sub_heading_style2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Search client via name or account number" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_vertical_margin">
android:orientation="horizontal">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/search_query"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/search_query"
android:imeOptions="actionSearch"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginTop="@dimen/activity_vertical_margin">

<Button
android:id="@+id/search_btn"
style="@style/SearchButton"
android:background="@drawable/button_design"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:enabled="false"
android:alpha="0.5"
android:layout_marginTop="@dimen/ll_margin"
android:layout_marginBottom="@dimen/ll_margin"
android:text="@string/search" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/search_query"
android:layout_width="320dp"
android:layout_height="wrap_content"
android:hint="@string/search_query"
android:imeOptions="actionSearch"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>

<ImageButton
android:id="@+id/search_btn"
android:background="@drawable/button_design"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="7dp"
android:enabled="false"
android:alpha="0.5"
android:src="@drawable/ic_search"
android:layout_marginTop="25dp" />

</LinearLayout>

<TextView
android:id="@+id/listHeading"
Expand Down
2 changes: 1 addition & 1 deletion visionppi/app/src/main/res/values/strings.xml
Expand Up @@ -46,7 +46,7 @@
<string name="analyze_images">Analyze Images</string>
<string name="cant_open_gallery">Cannot open gallery</string>
<string name="cv_logo" translatable="false">cv_logo</string>
<string name="search_query">Enter name/account number of client</string>
<string name="search_query">Enter name/account number</string>
<string name="search_results">Client Results</string>
<string name="object_detection_results">Object Detection Results</string>
<string name="title_activity_main">MainActivity</string>
Expand Down
4 changes: 4 additions & 0 deletions visionppi/app/src/main/res/values/styles.xml
Expand Up @@ -105,4 +105,8 @@
<item name="android:background">@color/veryLightGray</item>
</style>

<style name="sub_heading_style2">
<item name="android:textSize">15dp</item>
<item name="android:background">@color/veryLightGray</item>
</style>
</resources>