dennisthiessen/RiskAhead-API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a minor bug in login activity (could not add dialog to activity) as well as spinner hint adapter (array out of bound)

Browse Source
This commit is contained in:
Dennis Thiessen
2019-05-25 18:25:29 +02:00
parent 215ddddd36
commit 396135eb84
64 changed files with 365 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/layout/activity_login.xml
View File

@@ -27,7 +27,7 @@
android:paddingRight="15dp"
android:paddingBottom="20dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_layout_email"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
@@ -43,9 +43,9 @@
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_layout_password"
android:layout_below="@+id/input_layout_email"
android:layout_width="match_parent"
@@ -62,7 +62,7 @@
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<com.beardedhen.androidbootstrap.BootstrapButton

2
app/src/main/res/layout/activity_maps.xml
View File

@@ -21,7 +21,7 @@
tools:context=".MapsActivity" >
</fragment>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_reportwf_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
app/src/main/res/layout/activity_profile.xml
View File

@@ -26,7 +26,7 @@
android:gravity="center"
android:orientation="vertical">
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_below="@+id/tab_layout"
android:layout_width="match_parent"

12
app/src/main/res/layout/activity_register.xml
View File

@@ -27,7 +27,7 @@
android:paddingRight="15dp"
android:paddingBottom="20dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_layout_username"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
@@ -43,10 +43,10 @@
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_layout_email"
android:layout_below="@+id/input_layout_username"
android:layout_width="match_parent"
@@ -62,9 +62,9 @@
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_layout_password"
android:layout_below="@+id/input_layout_email"
android:layout_width="match_parent"
@@ -80,7 +80,7 @@
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_register"

2
app/src/main/res/layout/activity_report_wf.xml
View File

@@ -73,7 +73,7 @@
android:layout_margin="5dp"
android:textColor="@color/bg_common" />
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_reportwf_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/activity_subscriptions.xml
View File

@@ -58,7 +58,7 @@
android:layout_marginBottom="10dp"
android:background="#464b4b4b" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/subs_viewpager"
android:layout_width="match_parent"

60
app/src/main/res/layout/activity_view_report.xml
View File

@@ -40,7 +40,7 @@
android:padding="10dp"
android:layout_marginRight="55dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_reportedfrom"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -52,9 +52,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_incidentcategory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -67,9 +67,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_incidentsubcategory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -82,9 +82,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_incidentposition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -97,9 +97,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -112,9 +112,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_suspect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -127,9 +127,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_suspectweapon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -142,9 +142,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_suspectcount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -157,9 +157,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_victim"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -172,9 +172,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_victimorigin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -187,9 +187,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_suspecttransport"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -202,9 +202,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_victimaff"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -217,9 +217,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_suspectrecon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -232,9 +232,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_viewreport_etcetc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -247,7 +247,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</RelativeLayout>
@@ -291,7 +291,7 @@
</RelativeLayout>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_viewreport_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -302,7 +302,7 @@
android:focusable="true"
android:src="@android:drawable/ic_dialog_map" />
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_viewreport_user"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/dialog_about.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:layout_width="match_parent"
android:background="@color/tw__blue_default"
android:background="@color/white"
android:padding="20dp"
android:layout_height="match_parent">

2
app/src/main/res/layout/layout_toolbar_col.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
<androidx.appcompat.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"

2
app/src/main/res/layout/layout_toolbar_trans.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"