diff --git a/app/build.gradle b/app/build.gradle index 38abb9d..5e1951b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,4 +119,6 @@ dependencies { testImplementation "androidx.room:room-testing:$room_version" implementation 'com.youth.banner:banner:2.0.7' + + implementation 'de.hdodenhof:circleimageview:3.1.0' } diff --git a/app/src/main/res/drawable/black_border.xml b/app/src/main/res/drawable/black_border.xml new file mode 100644 index 0000000..e99fbd6 --- /dev/null +++ b/app/src/main/res/drawable/black_border.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_arrow_left.xml index b1cdf47..235b99d 100644 --- a/app/src/main/res/drawable/ic_arrow_left.xml +++ b/app/src/main/res/drawable/ic_arrow_left.xml @@ -1,7 +1,7 @@ - + + + diff --git a/app/src/main/res/drawable/ic_garbage.xml b/app/src/main/res/drawable/ic_garbage.xml new file mode 100644 index 0000000..bd91669 --- /dev/null +++ b/app/src/main/res/drawable/ic_garbage.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml new file mode 100644 index 0000000..e09b73a --- /dev/null +++ b/app/src/main/res/drawable/ic_info.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_score.xml b/app/src/main/res/drawable/ic_score.xml new file mode 100644 index 0000000..e4fd405 --- /dev/null +++ b/app/src/main/res/drawable/ic_score.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_visitor.xml b/app/src/main/res/drawable/ic_visitor.xml new file mode 100644 index 0000000..3bf253e --- /dev/null +++ b/app/src/main/res/drawable/ic_visitor.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/main/layout/activity_main_menu.xml b/app/src/main/res/layout/main/layout/activity_main_menu.xml index cde4748..bc4e387 100644 --- a/app/src/main/res/layout/main/layout/activity_main_menu.xml +++ b/app/src/main/res/layout/main/layout/activity_main_menu.xml @@ -34,10 +34,10 @@ android:id="@+id/nav_view" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="?android:attr/windowBackground" + android:background="@color/colorBlue" android:textAlignment="gravity" - app:itemTextAppearanceActive="@style/selected_menu" - app:itemTextAppearanceInactive="@style/unselected_menu" + app:itemTextAppearanceActive="@style/Button_select" + app:itemTextAppearanceInactive="@style/Button_unselect" app:labelVisibilityMode="labeled" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/main/layout/forum/layout/forum.xml b/app/src/main/res/layout/main/layout/forum/layout/forum.xml index 95293a7..eadfbb4 100644 --- a/app/src/main/res/layout/main/layout/forum/layout/forum.xml +++ b/app/src/main/res/layout/main/layout/forum/layout/forum.xml @@ -34,7 +34,7 @@ android:id="@+id/notice_next" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="32dp" + android:layout_marginTop="82dp" android:alpha="0.1" android:contentDescription="@string/notice_next" android:visibility="gone" @@ -46,7 +46,7 @@ android:id="@+id/notice_prev" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="32dp" + android:layout_marginTop="82dp" android:alpha="0.1" android:contentDescription="@string/notice_prev" android:visibility="gone" diff --git a/app/src/main/res/layout/main/layout/info/layout/info_fragment.xml b/app/src/main/res/layout/main/layout/info/layout/info_fragment.xml index e7906d1..1743df7 100644 --- a/app/src/main/res/layout/main/layout/info/layout/info_fragment.xml +++ b/app/src/main/res/layout/main/layout/info/layout/info_fragment.xml @@ -14,18 +14,31 @@ - + + + + + + + + + + @@ -33,9 +46,10 @@ android:id="@+id/nickname" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="32dp" android:layout_marginTop="@dimen/size_50" + android:gravity="center" android:textSize="18sp" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/headimg" app:layout_constraintTop_toTopOf="parent" /> @@ -43,20 +57,21 @@ android:id="@+id/credit_score" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="32dp" android:layout_marginTop="@dimen/size_50" + android:gravity="center" android:textSize="18sp" - app:layout_constraintStart_toEndOf="@id/headimg" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@id/nickname" app:layout_constraintTop_toBottomOf="@id/nickname" /> @@ -72,7 +87,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.5" - android:background="@drawable/border" + android:background="@drawable/black_border" android:gravity="center" android:textSize="18sp" /> @@ -81,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/border" + android:background="@drawable/black_border" android:gravity="center" android:textSize="18sp" /> @@ -95,7 +110,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.5" - android:background="@drawable/border" + android:background="@drawable/black_border" android:gravity="center" android:text="@string/mobie" android:textSize="18sp" /> @@ -105,7 +120,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/border" + android:background="@drawable/black_border" android:gravity="center" android:textSize="18sp" /> @@ -119,7 +134,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.5" - android:background="@drawable/border" + android:background="@drawable/black_border" android:gravity="center" android:text="@string/email" android:textSize="18sp" /> @@ -129,19 +144,36 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/border" + android:background="@drawable/black_border" android:gravity="center" android:textSize="18sp" /> - + android:layout_height="match_parent" + android:layout_marginTop="@dimen/size_30"> + + + + + diff --git a/app/src/main/res/navigation/nav_mainmenu.xml b/app/src/main/res/navigation/nav_mainmenu.xml index 5670d71..202eb43 100644 --- a/app/src/main/res/navigation/nav_mainmenu.xml +++ b/app/src/main/res/navigation/nav_mainmenu.xml @@ -3,22 +3,22 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/mobile_navigation" - app:startDestination="@+id/navigation_home"> + app:startDestination="@+id/navigation_forum">