TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-07 11:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

polish

Browse Source
This commit is contained in:
andrew
2023-05-22 22:20:52 +09:30
parent 76466e57de
commit 8b39c4e56a
5 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/res/drawable/destructive_outline_button_medium_background.xml
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/transparent" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="@color/button_destructive" />
</shape>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/button_destructive">
<item>
<shape android:shape="rectangle">
<solid android:color="?colorPrimary"/>
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke
android:color="@color/button_destructive"
android:width="@dimen/border_thickness" />
</shape>
</item>
</ripple>

22
app/src/main/res/drawable/prominent_outline_button_medium_background.xml
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/transparent" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="?prominentButtonColor" />
</shape>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?prominentButtonColor">
<item>
<shape android:shape="rectangle">
<solid android:color="?colorPrimary"/>
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke
android:color="?prominentButtonColor"
android:width="@dimen/border_thickness" />
</shape>
</item>
</ripple>

35
app/src/main/res/layout/activity_blocked_contacts.xml
View File

@@ -4,28 +4,37 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/unblockButton"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@drawable/preference_single_no_padding"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:cardCornerRadius="?preferenceCornerRadius"
app:cardElevation="0dp"
app:cardBackgroundColor="?colorSettingsBackground"
android:layout_marginHorizontal="@dimen/medium_spacing"
android:layout_marginVertical="@dimen/large_spacing"
/>
android:layout_width="match_parent"
android:layout_height="0dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
/>
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/emptyStateMessageTextView"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@+id/recyclerView"
app:layout_constraintTop_toTopOf="@+id/cardView"
android:layout_marginTop="@dimen/medium_spacing"
app:layout_constraintStart_toStartOf="@+id/recyclerView"
app:layout_constraintEnd_toEndOf="@+id/recyclerView"
app:layout_constraintStart_toStartOf="@+id/cardView"
app:layout_constraintEnd_toEndOf="@+id/cardView"
android:text="@string/blocked_contacts_empty_state"
/>
@@ -38,7 +47,7 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/recyclerView"
app:layout_constraintTop_toBottomOf="@+id/cardView"
android:id="@+id/unblockButton"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginVertical="@dimen/large_spacing"
@@ -49,6 +58,6 @@
android:id="@+id/nonEmptyStateGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="unblockButton,recyclerView"/>
app:constraint_referenced_ids="unblockButton,cardView"/>
</androidx.constraintlayout.widget.ConstraintLayout>