TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 13:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #329 from metaphore/passphrase-theme-fix

Browse Source 
Fix Lock Screen Properly
This commit is contained in:
Niels Andriesse
2020-09-09 13:06:03 +10:00
committed by GitHub
parent 9345df8283 819494d1fe
commit d9d0a02bf8
43 changed files with 133 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/conversation_item_sent_document.xml
View File

@@ -9,5 +9,5 @@
android:visibility="gone"
app:doc_titleColor="?conversation_item_sent_text_primary_color"
app:doc_captionColor="?conversation_item_sent_text_secondary_color"
app:doc_downloadButtonTint="?conversation_item_sent_download_icon_color"
app:doc_downloadButtonTint="?android:colorControlNormal"
tools:visibility="visible"/>

2
res/layout/fragment_search.xml
View File

@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:background="?attr/search_background"
android:background="?android:windowBackground"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView

3
res/layout/invite_activity.xml
View File

@@ -13,8 +13,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="10dp"
android:background="?attr/invite_background">
android:padding="10dp">
<ImageView android:id="@+id/heart"
android:layout_width="wrap_content"

4
res/layout/media_keyboard.xml
View File

@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:padding="6dp"
android:src="@drawable/ic_search_white_24dp"
android:src="@drawable/ic_baseline_search_24"
android:tint="?media_keyboard_button_color"
android:background="?selectableItemBackgroundBorderless"
android:visibility="invisible"
@@ -98,7 +98,7 @@
android:tint="?media_keyboard_button_color"
android:visibility="gone"
android:background="?selectableItemBackground"
app:srcCompat="@drawable/ic_plus_24"
app:srcCompat="@drawable/ic_baseline_add_24"
app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
app:layout_constraintTop_toTopOf="@id/media_keyboard_tabs"
app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace_backup"

96
res/layout/prompt_passphrase_activity.xml
View File

@@ -6,7 +6,8 @@
android:id="@+id/prompt_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
tools:context="org.thoughtcrime.securesms.PassphrasePromptActivity">
<View android:id="@+id/shim"
android:layout_width="match_parent"
@@ -25,7 +26,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginTop="20dp">
android:layout_alignParentTop="true">
<ImageView
android:layout_width="wrap_content"
@@ -78,7 +79,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="60dp"
tools:visibility="gone">
tools:visibility="visible">
<EditText android:id="@+id/passphrase_edit"
android:layout_width="match_parent"
@@ -88,55 +89,56 @@
android:layout_marginEnd="50dp"
android:singleLine="true"
android:paddingStart="10dp"
android:paddingEnd="40dp"/>
android:paddingEnd="40dp"
tools:text="password"/>
<!-- <org.thoughtcrime.securesms.components.AnimatingToggle-->
<!-- android:id="@+id/button_toggle"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignRight="@+id/passphrase_edit"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_gravity="center"-->
<!-- android:gravity="center">-->
<org.thoughtcrime.securesms.components.AnimatingToggle
android:id="@+id/button_toggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignRight="@+id/passphrase_edit"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:gravity="center">
<!-- <ImageButton android:id="@+id/passphrase_visibility"-->
<!-- android:src="?ic_visibility"-->
<!-- android:background="@drawable/touch_highlight_background"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingStart="8dp"-->
<!-- android:paddingEnd="8dp"-->
<!-- android:paddingTop="3dp"-->
<!-- android:paddingBottom="3dp"-->
<!-- android:layout_centerVertical="true" />-->
<ImageButton android:id="@+id/passphrase_visibility"
android:src="?ic_visibility_on"
android:background="@drawable/touch_highlight_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="3dp"
android:paddingBottom="3dp"
android:layout_centerVertical="true" />
<!-- <ImageButton android:id="@+id/passphrase_visibility_off"-->
<!-- android:src="?ic_visibility_off"-->
<!-- android:background="@drawable/touch_highlight_background"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingStart="8dp"-->
<!-- android:paddingEnd="8dp"-->
<!-- android:paddingTop="3dp"-->
<!-- android:paddingBottom="3dp"-->
<!-- android:layout_centerVertical="true" />-->
<ImageButton android:id="@+id/passphrase_visibility_off"
android:src="?ic_visibility_off"
android:background="@drawable/touch_highlight_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="3dp"
android:paddingBottom="3dp"
android:layout_centerVertical="true" />
<!-- </org.thoughtcrime.securesms.components.AnimatingToggle>-->
</org.thoughtcrime.securesms.components.AnimatingToggle>
<!-- <ImageButton android:id="@+id/ok_button"-->
<!-- android:src="?ic_arrow_forward"-->
<!-- android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"-->
<!-- android:background="@null"-->
<!-- android:text="@string/prompt_passphrase_activity__unlock"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:textAppearance="?android:attr/textAppearanceMedium"-->
<!-- android:paddingStart="5dp"-->
<!-- android:paddingTop="5dp"-->
<!-- android:paddingEnd="10dp"-->
<!-- android:paddingBottom="5dp"/>-->
<ImageButton android:id="@+id/ok_button"
android:src="?ic_arrow_forward"
android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"
android:background="@null"
android:text="@string/prompt_passphrase_activity__unlock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingStart="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingBottom="5dp"/>
</RelativeLayout>
</LinearLayout>