diff --git a/app/build.gradle b/app/build.gradle index 0c4a14b..39bf9de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,11 +47,11 @@ android { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation "androidx.recyclerview:recyclerview:1.3.1" + implementation "androidx.recyclerview:recyclerview:1.3.2" implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' @@ -73,10 +73,10 @@ dependencies { // Material 3 - implementation "com.google.android.material:material:1.9.0" + implementation "com.google.android.material:material:1.11.0" // Navigation - def nav_version = "2.6.0" + def nav_version = "2.7.7" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version" @@ -92,7 +92,7 @@ dependencies { final def markwon_version = '4.6.2' // Customtabs - implementation 'androidx.browser:browser:1.7.0' + implementation 'androidx.browser:browser:1.8.0' implementation 'io.coil-kt:coil:2.5.0' implementation 'io.coil-kt:coil-svg:2.5.0' diff --git a/app/src/main/res/drawable/baseline_star_24.xml b/app/src/main/res/drawable/baseline_star_24.xml new file mode 100644 index 0000000..9b295a0 --- /dev/null +++ b/app/src/main/res/drawable/baseline_star_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 4ab79e2..68ce195 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -25,6 +25,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" + app:labelVisibilityMode="unlabeled" app:menu="@menu/home_menu" /> diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml index 559dcb3..bd9abbe 100644 --- a/app/src/main/res/layout/fragment_notifications.xml +++ b/app/src/main/res/layout/fragment_notifications.xml @@ -18,4 +18,15 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/notification_item.xml b/app/src/main/res/layout/notification_item.xml index 3bce909..affd303 100644 --- a/app/src/main/res/layout/notification_item.xml +++ b/app/src/main/res/layout/notification_item.xml @@ -3,6 +3,7 @@ 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" + style="?attr/materialCardViewFilledStyle" android:layout_width="match_parent" android:layout_height="80dp" android:layout_marginHorizontal="8dp" @@ -28,6 +29,8 @@ android:layout_height="25dp" app:layout_constraintBottom_toBottomOf="@+id/notification_main_image" app:layout_constraintEnd_toEndOf="@+id/notification_main_image" + android:background="@color/purple_lighter" + app:tint="@color/surface" app:shapeAppearance="@style/ShapeAppearanceOverlay.Avatar" tools:src="@drawable/baseline_image_24" /> @@ -36,7 +39,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/notification_message" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/option_button" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@id/notification_main_image" app:layout_constraintTop_toTopOf="parent" @@ -52,13 +55,24 @@ android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/option_button" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@id/notification_main_image" app:layout_constraintTop_toBottomOf="@+id/notification_title" android:layout_marginStart="16dp" android:maxLines="1" tools:text="Notification message" /> + + diff --git a/app/src/main/res/menu/notification_menu.xml b/app/src/main/res/menu/notification_menu.xml new file mode 100644 index 0000000..88d5c19 --- /dev/null +++ b/app/src/main/res/menu/notification_menu.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/home_navigation.xml b/app/src/main/res/navigation/home_navigation.xml index 2a35f04..a233317 100644 --- a/app/src/main/res/navigation/home_navigation.xml +++ b/app/src/main/res/navigation/home_navigation.xml @@ -29,6 +29,6 @@ android:label="ProfileActivity" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8bfa31..5e56918 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -195,4 +195,7 @@ Tap this notification to go to the post. %s is now following you Tap this notification to see their profile. + Delete notification + Remove this notification? + An error ocurred \ No newline at end of file