Skip to content

I
InstiApp
Commit 8385ec05 authored by preetamozarde3's avatar preetamozarde3 Committed by GitHub
Browse files
Options

Merge pull request #1 from sshivam95/subbranch_nss-patch1 

Subbranch nss patch1
parents be6dd191 7db0c351
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 65 deletions
app/src/main/res/layout/fragment_file_complaint.xml
View file @ 8385ec05
...@@ -39,22 +39,6 @@ ...@@ -39,22 +39,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_gravity="bottom|end"
android:layout_marginEnd="20dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:src="@drawable/ic_add_a_photo_black_24dp"
app:backgroundTint="@color/colorSecondary"
app:borderWidth="0dp"
app:fabSize="normal"
app:layout_anchorGravity="bottom|end" />
<LinearLayout <LinearLayout
android:id="@+id/linearLayoutAddImage" android:id="@+id/linearLayoutAddImage"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -66,7 +50,7 @@ ...@@ -66,7 +50,7 @@
android:id="@+id/imageViewAddImage" android:id="@+id/imageViewAddImage"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
android:src="@drawable/baseline_photo_size_select_actual_black_48"/> android:src="@drawable/baseline_photo_size_select_actual_black_48" />
</LinearLayout> </LinearLayout>
...@@ -187,10 +171,18 @@ ...@@ -187,10 +171,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.gms.maps.MapView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:id="@+id/google_map" android:id="@+id/mapLinearLayout"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="200dp" /> android:layout_height="300dp"
android:orientation="vertical">
<com.google.android.gms.maps.MapView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/google_map"
android:layout_width="match_parent"
android:layout_height="300dp" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -198,25 +190,24 @@ ...@@ -198,25 +190,24 @@
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <android.support.design.widget.TextInputLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#ccc" app:hintTextAppearance="@style/edit_text_hint_apperarance">
android:padding="10dp">
<TextView <EditText
android:layout_width="wrap_content" android:id="@+id/editTextLocationDetails"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TAGS" android:gravity="top"
android:textColor="#4A4A4A" android:hint="@string/enter_location_details"
android:textSize="16sp" android:imeOptions="flagNoExtractUi|actionSearch"
android:textStyle="bold" /> android:inputType="textMultiLine"
android:minLines="3"
</LinearLayout> android:textColor="@android:color/black"
android:textSize="14sp" />
<View </android.support.design.widget.TextInputLayout>
android:layout_width="match_parent"
android:layout_height="7dp" />
<com.cunoraz.tagview.TagView <com.cunoraz.tagview.TagView
android:id="@+id/tag_view" android:id="@+id/tag_view"
...@@ -224,10 +215,6 @@ ...@@ -224,10 +215,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="10dp" /> android:layout_margin="10dp" />
<View
android:layout_width="match_parent"
android:layout_height="7dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -247,7 +234,7 @@ ...@@ -247,7 +234,7 @@
android:id="@+id/editTextTags" android:id="@+id/editTextTags"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="Add more Tags" android:hint="Add Tags"
android:inputType="text" android:inputType="text"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textColorHint="#66000000" android:textColorHint="#66000000"
...@@ -276,7 +263,9 @@ ...@@ -276,7 +263,9 @@
android:id="@+id/tag_populate" android:id="@+id/tag_populate"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="10dp" /> android:layout_margin="10dp"
android:focusable="true"
android:focusableInTouchMode="true"/>
</ScrollView> </ScrollView>
...@@ -290,8 +279,24 @@ ...@@ -290,8 +279,24 @@
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:layout_marginEnd="20dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:src="@drawable/ic_add_a_photo_black_24dp"
app:backgroundTint="@color/colorSecondary"
app:borderWidth="0dp"
app:fabSize="normal" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
<LinearLayout <LinearLayout
android:id="@+id/layout_buttons" android:id="@+id/layout_buttons"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/values/strings.xml
View file @ 8385ec05
...@@ -48,4 +48,5 @@ ...@@ -48,4 +48,5 @@
<string name="getting_current_location">Getting current location. Please try after some time</string> <string name="getting_current_location">Getting current location. Please try after some time</string>
<string name="GPS_not_enables">GPS is not enabled!</string> <string name="GPS_not_enables">GPS is not enabled!</string>
<string name="no_permission">No permission!</string> <string name="no_permission">No permission!</string>
<string name="enter_location_details">Enter Location Details</string>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment