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

Minor interface redesign, including First Time activity

Browse Source
This commit is contained in:
Deniz Düzgören
2019-07-30 22:48:13 +02:00
parent c53e9ce391
commit 47cbaaf53c
19 changed files with 245 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_first_time.xml
+64 -97
View File
@@ -19,24 +19,25 @@
android:layout_height="wrap_content"
android:layoutAnimation="@anim/layout_animation_fall_down">
<LinearLayout
android:layout_width="0px"
android:layout_height="0px"
android:focusable="true"
android:focusableInTouchMode="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <LinearLayout-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp"-->
<!-- android:focusable="true"-->
<!-- android:focusableInTouchMode="true"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<TextView
android:id="@+id/txtWelcome"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="56dp"
android:layout_marginStart="16dp"
android:text="@string/welcome"
android:textAlignment="center"
android:textColor="@color/textcolor"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
android:fontFamily="@font/manrope_extrabold"
android:textSize="24sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -44,115 +45,102 @@
android:id="@+id/txtsetupthings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:text="@string/firstsomethings"
android:textAlignment="center"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/txtWelcome"
app:layout_constraintTop_toBottomOf="@+id/txtWelcome" />
<TextView
android:id="@+id/txttellmename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:text="@string/tellmename"
android:textAlignment="center"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/txtsetupthings"
app:layout_constraintTop_toBottomOf="@+id/txtsetupthings" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClasses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/accent"
app:boxStrokeWidth="1dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="56dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="56dp"
android:layout_marginEnd="16dp"
android:hint="@string/yourname"
android:textColorHint="@color/hintcolor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/txttellmename"
app:layout_constraintTop_toBottomOf="@+id/txttellmename"
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="16dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="center_horizontal"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="@color/textcolor"
android:textSize="16sp"
android:theme="@style/EditTextTheme" />
android:textSize="16sp"/>
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/txtNextClass"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:gravity="start"
android:text="@string/nextclass"
android:textAlignment="center"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClasses" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClass"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
app:boxStrokeColor="@color/accent"
app:boxStrokeWidth="1dp"
android:layout_height="wrap_content"
android:layout_marginStart="56dp"
android:layout_width="0dp"
android:layout_marginTop="8dp"
android:hint="@string/yourclass"
android:textColorHint="@color/hintcolor"
app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/txtNextClass"
app:layout_constraintTop_toBottomOf="@+id/txtNextClass"
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="center_horizontal"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="@color/textcolor"
android:textSize="16sp"
android:theme="@style/EditTextTheme" />
android:textSize="16sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -172,48 +160,42 @@
android:id="@+id/txtSenior"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:text="@string/seniorsetup"
android:textAlignment="center"
android:gravity="start"
android:textColor="@color/textcolor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClass" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutCourses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
app:boxStrokeColor="@color/accent"
app:boxStrokeWidth="1dp"
android:layout_height="wrap_content"
android:layout_marginStart="56dp"
android:layout_width="0dp"
android:layout_marginTop="8dp"
android:hint="@string/yourcourses"
android:textColorHint="@color/hintcolor"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/txtSenior"
app:layout_constraintTop_toBottomOf="@+id/txtSenior">
<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="16dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="center_horizontal"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="@color/textcolor"
android:textSize="16sp"
android:theme="@style/EditTextTheme"
android:importantForAutofill="no"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -232,85 +214,70 @@
<TextView
android:id="@+id/txtMore"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:text="@string/moresettings"
android:textColor="@color/textcolor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
<CheckBox
android:id="@+id/cbDark"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
android:text="@string/enabledarkmode"
android:textAlignment="viewStart"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtMore" />
<CheckBox
android:id="@+id/cbNotif"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:text="@string/wantnotif"
android:textAlignment="viewStart"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/cbDark" />
<CheckBox
android:id="@+id/cbPersonalised"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:text="@string/personalised"
android:textAlignment="viewStart"
android:textColor="@color/textcolor"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/cbNotif" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/efab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="32dp"
android:backgroundTint="@color/accent"
android:text="@string/letsgo"
android:textColor="@color/background"
app:icon="@drawable/ic_tick"
app:iconTint="@color/background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cbPersonalised" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/efab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:backgroundTint="@color/accent"
android:text="@string/letsgo"
android:textColor="@color/background"
app:icon="@drawable/ic_tick"
app:iconTint="@color/background"
android:layout_gravity="bottom|end"
android:translationZ="-1dp"/>
<LinearLayout
android:id="@+id/linearInflation"
android:layout_width="match_parent"
@@ -321,6 +288,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/app_bar_main.xml
+14 -29
View File
@@ -16,7 +16,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="84dp"
app:popupTheme="@style/AppThemeLight.PopupOverlay"
app:titleTextColor="@color/accent"
app:contentInsetStart="0dp"
@@ -31,43 +31,28 @@
android:id="@+id/toolbarTxt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:animateLayoutChanges="true"
android:layout_gravity="start"
android:fontFamily="@font/manrope_extrabold"
android:layoutAnimation="@anim/layout_animation_fall_down"
android:text="@string/app_name"
android:textAlignment="center"
android:textColor="@color/accent"
android:textSize="22sp"
android:textSize="24sp"
android:singleLine="true"
android:layout_marginStart="16dp"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintStart_toStartOf="parent"/>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="2dp"
android:progressTint="@color/accent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:animateLayoutChanges="true"
android:progressBackgroundTint="@android:color/transparent"/>
<com.google.android.material.chip.Chip
android:id="@+id/chip"
<TextView
android:id="@+id/text_greeting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/toolbarTxt"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:elevation="4dp"
android:background="@color/lightbackground"
android:textColor="@color/textcolor"/>
android:layout_marginStart="16dp"
android:layout_marginBottom="4dp"
android:textColor="@color/accent"
android:textSize="18sp"
android:fontFamily="@font/manrope_semibold"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/content_settings.xml
+3 -3
View File
@@ -30,7 +30,7 @@
android:layout_marginBottom="3dp"
app:cardElevation="2dp"
android:backgroundTint="@color/lightbackground"
app:cardCornerRadius="8dp">
app:cardCornerRadius="12dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -194,7 +194,7 @@
android:layout_marginBottom="3dp"
app:cardElevation="2dp"
android:backgroundTint="@color/lightbackground"
app:cardCornerRadius="8dp">
app:cardCornerRadius="12dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -347,7 +347,7 @@
android:layout_marginBottom="3dp"
app:cardElevation="2dp"
android:backgroundTint="@color/lightbackground"
app:cardCornerRadius="8dp">
app:cardCornerRadius="12dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
app/src/main/res/layout/course_card.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/lightbackground"
app:cardCornerRadius="8dp"
app:cardCornerRadius="12dp"
android:clickable="true"
android:focusable="true"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
app:cardElevation="1dp">
app:cardElevation="2dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
app/src/main/res/layout/diagnostics_dialog.xml
+4 -3
View File
@@ -9,11 +9,12 @@
android:id="@+id/textviewtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textAlignment="center"/>
app/src/main/res/layout/edittext_dialog.xml
+4 -3
View File
@@ -9,11 +9,12 @@
android:id="@+id/textviewtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textAlignment="center"/>
app/src/main/res/layout/empty_dialog.xml
+4 -3
View File
@@ -7,11 +7,12 @@
android:id="@+id/empty_textviewtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textAlignment="center"/>
app/src/main/res/layout/just_a_card.xml
+2 -2
View File
@@ -5,14 +5,14 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:backgroundTint="@color/lightbackground"
app:cardCornerRadius="8dp"
app:cardCornerRadius="12dp"
android:clickable="true"
android:focusable="true"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
app:cardElevation="1dp">
app:cardElevation="2dp">
<LinearLayout
android:layout_width="match_parent"
app/src/main/res/layout/recycler_dialog.xml
+4 -3
View File
@@ -7,11 +7,12 @@
android:id="@+id/empty_textviewtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:fontFamily="@font/manrope_semibold"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textAlignment="center"/>
app/src/main/res/layout/secret_dialog.xml
+4 -3
View File
@@ -7,11 +7,12 @@
android:id="@+id/textviewtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/manrope_semibold"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textAlignment="center"/>
app/src/main/res/layout/simple_dialog.xml
+4 -3
View File
@@ -8,11 +8,12 @@
android:id="@+id/textviewtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/manrope_semibold"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:layout_gravity="start"
android:textColor="@color/textcolor"
android:textAlignment="center"/>