karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 1.3.0 (little design overhaul) with additional fixes

Browse Source
This commit is contained in:
Deniz Düzgören
2019-05-09 07:48:17 +02:00
parent 4c3d011c6f
commit 907a746b55
35 changed files with 392 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/app_bar_main.xml
+4 -2
View File
@@ -90,12 +90,14 @@
android:layout_height="56dp"
android:layout_marginBottom="0dp"
app:elevation="0dp"
app:itemIconTint="@color/bottom_nav_color_avhblue"
app:itemTextColor="@color/bottom_nav_color_avhblue"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="bottom"
app:menu="@menu/nav_items"/>
<!-- app:itemIconTint="@drawable/tintlist_light"-->
<!-- app:itemTextColor="@drawable/tintlist_light"-->
<View
android:id="@+id/bottom_nav_divider"
android:layout_width="match_parent"
app/src/main/res/layout/bottom_sheet.xml
+24 -9
View File
@@ -22,21 +22,36 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/bottom_sheet_header"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:gravity="top|start"
android:text="@string/information"
android:textSize="16sp"/>
android:orientation="horizontal"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="4dp">
<ImageView
android:id="@+id/info_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_information"/>
<TextView
android:id="@+id/bottom_sheet_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:gravity="top|start"
android:text="@string/information"
android:textSize="16sp"/>
</LinearLayout>
<TextView
android:id="@+id/bottom_sheet_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="8dp"
android:layout_margin="16dp"
android:gravity="top|start"
android:text="@string/noinfo"
android:textSize="12sp"/>
app/src/main/res/layout/content_settings.xml
+17 -31
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorBackground">
@@ -10,7 +9,8 @@
android:id="@+id/nsvsettings"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
android:fillViewport="true"
android:scrollbars="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -32,6 +32,8 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutName"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -44,25 +46,18 @@
app:layout_constraintTop_toBottomOf="@+id/txtPersonalise"
android:importantForAutofill="no">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/txtName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textCursorDrawable="@null"
android:textSize="14sp"
android:theme="@style/EditTextTheme" />
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -215,6 +210,8 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClasses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -227,24 +224,18 @@
app:layout_constraintTop_toBottomOf="@+id/txtFilter"
android:importantForAutofill="no">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/txtClasses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textSize="14sp"
android:theme="@style/EditTextTheme" />
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -265,34 +256,29 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/courses"
android:importantForAutofill="no"
android:textColorHint="?attr/colorHint"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClasses"
android:importantForAutofill="no">
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClasses">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/txtCourses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textSize="14sp"
android:theme="@style/EditTextTheme" />
android:textSize="14sp" />
</com.google.android.material.textfield.TextInputLayout>
app/src/main/res/layout/dating_dialog.xml
+43 -16
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
@@ -40,16 +42,28 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<EditText
android:id="@+id/dating_txt1"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/datingPink"
app:boxStrokeWidth="2dp"
android:layout_width="0px"
android:layout_weight="7"
android:backgroundTint="?attr/colorText"
android:layout_height="wrap_content"
android:hint="@string/boy"
android:inputType="textNoSuggestions"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:textColorHint="?attr/colorHint"
android:textColor="?attr/colorText"/>
android:hint="@string/boy"
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dating_txt1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:textColor="?attr/colorText"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cb1"
@@ -66,16 +80,28 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<EditText
android:id="@+id/dating_txt2"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/datingPink"
app:boxStrokeWidth="2dp"
android:layout_width="0px"
android:layout_weight="7"
android:backgroundTint="?attr/colorText"
android:layout_height="wrap_content"
android:hint="@string/girl"
android:inputType="textNoSuggestions"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:textColorHint="?attr/colorHint"
android:textColor="?attr/colorText"/>
android:hint="@string/girl"
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dating_txt2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:textColor="?attr/colorText"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cb2"
@@ -97,10 +123,11 @@
android:layout_width="0px"
android:layout_weight="5"
android:layout_height="wrap_content"
android:backgroundTint="@color/datingPink"
android:text="@string/calculate"
android:textColor="@color/white"
android:layout_gravity="start|center_vertical"/>
android:textColor="@color/datingPink"
app:strokeColor="@color/datingPink"
android:layout_gravity="start|center_vertical"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
<TextView
android:id="@+id/dating_txtp"
app/src/main/res/layout/diagnostics_dialog.xml
+15 -9
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -36,22 +38,26 @@
<Button
android:id="@+id/btnResetLaunch"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/accent"
android:textColor="@color/white"
android:textColor="?attr/colorAccent"
app:strokeColor="?attr/colorAccent"
android:layout_marginStart="24dp"
android:text="Reset launch counter"/>
android:layout_marginEnd="24dp"
android:text="Reset launch counter"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
<Button
android:id="@+id/btnResetNotif"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/accent"
android:textColor="@color/white"
android:textColor="?attr/colorAccent"
app:strokeColor="?attr/colorAccent"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp"
android:text="Reset notification counter"/>
android:text="Reset notification counter"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
</LinearLayout>
app/src/main/res/layout/edittext_dialog.xml
+27 -7
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
@@ -34,19 +36,37 @@
android:layout_width="wrap_content"
android:textColor="?attr/colorText"/>
<EditText
android:id="@+id/dialog_edittext"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"/>
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:textColorHint="?attr/colorHint"
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dialog_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:ems="10"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/dialog_button"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorAccent"
android:textColor="?attr/colorAccent"
android:text="@string/positivebutton"
android:textColor="@color/white"/>
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
app:strokeColor="?attr/colorAccent"/>
</LinearLayout>
app/src/main/res/layout/food_layout.xml
+2 -3
View File
@@ -19,8 +19,7 @@
android:id="@+id/linear_food"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_animation_fall_down">
</androidx.recyclerview.widget.RecyclerView>
android:layoutAnimation="@anim/layout_animation_fall_down"
android:scrollbars="vertical"/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
app/src/main/res/layout/plan.xml
+2 -1
View File
@@ -53,7 +53,8 @@
android:id="@+id/linearRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_animation_fall_down"/>
android:layoutAnimation="@anim/layout_animation_fall_down"
android:scrollbars="vertical"/>
</LinearLayout>
app/src/main/res/layout/search.xml
+1 -1
View File
@@ -27,7 +27,7 @@
android:theme="@style/EditTextTheme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
<androidx.core.widget.NestedScrollView
android:layout_width="0dp"