Commit fe2f62af authored by Niklas Fix's avatar Niklas Fix 🎓

fix #62

parent 1cfc13aa
<?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:id="@+id/Coordinator_profileScreen"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:fitsSystemWindows="true"
tools:context=".features.profile.ProfileActivity">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/Coordinator_profileScreen"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:fitsSystemWindows="true"
android:background="@color/white"
tools:context=".features.profile.ProfileActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolBar_profile"
......@@ -16,12 +17,12 @@
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
<include
layout="@layout/content_profile"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?android:actionBarSize"/>
android:layout_marginTop="?android:actionBarSize" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView 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"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".features.profile.ProfileActivity"
tools:showIn="@layout/activity_profile">
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="@color/white"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".features.profile.ProfileActivity"
tools:showIn="@layout/activity_profile">
<LinearLayout
android:id="@+id/linearLayout2"
......@@ -38,7 +39,7 @@
android:layout_height="match_parent"
android:alpha="1.0"
android:contentDescription="@string/user_avatar"
android:src="@drawable/oval_yellow"/>
android:src="@drawable/oval_yellow" />
</FrameLayout>
......@@ -54,7 +55,7 @@
android:elevation="4dp"
app:layout_constraintBottom_toBottomOf="@+id/framelayout_profile_avatar"
app:layout_constraintEnd_toEndOf="@+id/framelayout_profile_avatar"
app:srcCompat="@drawable/ic_edit_light"/>
app:srcCompat="@drawable/ic_edit_light" />
<TextView
android:id="@+id/username_profile"
......@@ -73,7 +74,7 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/framelayout_profile_avatar"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/textView_level_profile"
......@@ -84,13 +85,13 @@
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="Level"
android:textSize="18sp"
android:textColor="@color/textLight"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/framelayout_profile_avatar"
app:layout_constraintTop_toBottomOf="@+id/username_profile"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/score_profile"
......@@ -107,21 +108,21 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/framelayout_profile_avatar"
app:layout_constraintTop_toBottomOf="@id/textView_level_profile"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
<ProgressBar
android:id="@+id/progressbar_score_profile"
android:layout_width="0dp"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:progressDrawable="@drawable/progressbar_rounded"
android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="8dp"
android:progressDrawable="@drawable/progressbar_rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/framelayout_profile_avatar"
app:layout_constraintTop_toBottomOf="@+id/score_profile"/>
app:layout_constraintTop_toBottomOf="@+id/score_profile" />
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -134,19 +135,16 @@
android:layout_marginBottom="@dimen/profile_section_title"
android:text="@string/title"
android:textColor="@color/textLight"
android:textStyle="bold"/>
android:textStyle="bold" />
<View
android:id="@+id/sep1"
style="@style/Divider"/>
style="@style/Divider" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/title_profile_edit"
style="@style/TextButtonRipple"
......@@ -162,7 +160,7 @@
android:textSize="18sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/change_title_edit"
......@@ -178,13 +176,13 @@
app:layout_constraintHorizontal_bias="0.976"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5"/>
app:layout_constraintVertical_bias="0.5" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/sep2"
style="@style/Divider"/>
style="@style/Divider" />
<TextView
android:id="@+id/title_subjects_profile"
......@@ -195,11 +193,11 @@
android:layout_marginBottom="@dimen/profile_section_title"
android:text="@string/subjects"
android:textColor="@color/textLight"
android:textStyle="bold"/>
android:textStyle="bold" />
<View
android:id="@+id/sep3"
style="@style/Divider"/>
style="@style/Divider" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
......@@ -222,7 +220,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/select_subjects_edit"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"/>
app:layout_constraintVertical_bias="0.0" />
<ImageView
android:id="@+id/select_subjects_edit"
......@@ -238,13 +236,13 @@
app:layout_constraintHorizontal_bias="0.976"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5"/>
app:layout_constraintVertical_bias="0.5" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/sep4"
style="@style/Divider"/>
style="@style/Divider" />
<TextView
android:id="@+id/title_change_password"
......@@ -255,11 +253,11 @@
android:layout_marginBottom="@dimen/profile_section_title"
android:text="@string/change_your_password"
android:textColor="@color/textLight"
android:textStyle="bold"/>
android:textStyle="bold" />
<View
android:id="@+id/sep5"
style="@style/Divider"/>
style="@style/Divider" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
......@@ -280,7 +278,7 @@
android:textSize="18sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/change_password_edit"
......@@ -295,13 +293,13 @@
app:layout_constraintHorizontal_bias="0.954"
app:layout_constraintStart_toStartOf="@+id/change_password_btn"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5"/>
app:layout_constraintVertical_bias="0.5" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/sep6"
style="@style/Divider"/>
style="@style/Divider" />
<TextView
android:id="@+id/title_more"
......@@ -312,11 +310,11 @@
android:layout_marginBottom="@dimen/profile_section_title"
android:text="@string/more"
android:textColor="@color/textLight"
android:textStyle="bold"/>
android:textStyle="bold" />
<View
android:id="@+id/sep7"
style="@style/Divider"/>
style="@style/Divider" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
......@@ -337,7 +335,7 @@
android:textSize="18sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/app_settings_edit"
......@@ -352,13 +350,13 @@
app:layout_constraintHorizontal_bias="0.954"
app:layout_constraintStart_toStartOf="@+id/app_settings_btn"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5"/>
app:layout_constraintVertical_bias="0.5" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/sep8"
style="@style/Divider"/>
style="@style/Divider" />
<Button
android:id="@+id/button_sign_out"
......@@ -372,7 +370,7 @@
android:paddingStart="35dp"
android:paddingEnd="35dp"
android:text="@string/sign_out"
android:textColor="@drawable/text_color_blue"/>
android:textColor="@drawable/text_color_blue" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
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