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

Merge branch 'dev' of https://github.com/loki-project/session-android into store-permission-refactoring

Browse Source
This commit is contained in:
Anton Chekulaev
2020-09-11 12:12:23 +10:00
parent f20ebc31f3 fe0d382a00
commit e0fe8d10e2
30 changed files with 646 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/activity_create_closed_group.xml
View File

@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="?android:colorControlNormal" />
app:SpinKit_Color="@android:color/white" />
</RelativeLayout>

11
res/layout/activity_home.xml
View File

@@ -14,7 +14,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:elevation="1dp"
app:contentInsetStart="0dp">
<LinearLayout
@@ -65,6 +64,12 @@
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<org.thoughtcrime.securesms.loki.views.SeedReminderView
android:id="@+id/seedReminderView"
android:layout_width="match_parent"
@@ -95,8 +100,8 @@
<org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
android:id="@+id/newConversationButtonSet"
android:layout_width="252dp"
android:layout_height="212dp"
android:layout_width="276dp"
android:layout_height="236dp"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true" />

2
res/layout/activity_join_public_chat.xml
View File

@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="@color/text" />
app:SpinKit_Color="@android:color/white" />
</RelativeLayout>

2
res/layout/activity_settings.xml
View File

@@ -248,7 +248,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="@color/text" />
app:SpinKit_Color="@android:color/white" />
</RelativeLayout>

6
res/layout/conversation_activity.xml
View File

@@ -108,6 +108,12 @@
android:indeterminate="false"
android:progress="0" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<org.thoughtcrime.securesms.loki.views.SessionRestoreBannerView
android:id="@+id/sessionRestoreBannerView"
android:layout_width="match_parent"

15
res/layout/expiration_timer_menu.xml
View File

@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/actionButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true"
android:gravity="center">
xmlns:app="http://schemas.android.com/apk/res-auto"
style="?android:attr/actionButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true"
android:gravity="center">
<ImageView
android:id="@+id/menu_badge_icon"
@@ -25,6 +26,6 @@
android:paddingBottom="3dp"
android:paddingTop="1dp"
android:background="@color/transparent"
android:textColor="@android:color/white"
android:textColor="@color/text"
android:textSize="10sp" />
</FrameLayout>

6
res/layout/fragment_enter_chat_url.xml
View File

@@ -7,6 +7,12 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<EditText
style="@style/SmallSessionEditText"
android:id="@+id/chatURLEditText"

6
res/layout/fragment_enter_public_key.xml
View File

@@ -7,6 +7,12 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<EditText
style="@style/SmallSessionEditText"
android:id="@+id/publicKeyEditText"

6
res/layout/fragment_view_my_qr_code.xml
View File

@@ -4,6 +4,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"