TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-18 05:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Share activity complies with day/night configuration.

Browse Source
This commit is contained in:
Anton Chekulaev 2020-08-25 20:34:30 +10:00
parent 2252dea0a1
commit 724d323125
6 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -205,7 +205,7 @@
android:screenOrientation="portrait"
android:noHistory="true"
android:taskAffinity=""
android:theme="@style/TextSecure.LightNoActionBar"
android:theme="@style/Theme.TextSecure.DayNight.NoActionBar"
android:windowSoftInputMode="stateHidden">
<intent-filter>
<action android:name="android.intent.action.SEND" />

10
res/drawable/ic_baseline_search_24.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>

9
res/layout/contact_selection_list_divider.xml
View File

@ -3,8 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/contact_list_divider">
android:layout_height="wrap_content">
<TextView android:id="@+id/label"
android:layout_width="wrap_content"
@ -12,8 +11,12 @@
android:paddingStart="16dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textSize="14sp"
android:textColor="@color/signal_primary_dark"
tools:text="Recent chats"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?dividerHorizontal"/>
</LinearLayout>

11
res/layout/contact_selection_list_fragment.xml
View File

@ -1,7 +1,7 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:id="@+id/emptyStateContainer"
@ -14,7 +14,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="You don't have any contacts yet"
android:textColor="@color/text"
android:textSize="@dimen/medium_font_size" />
</LinearLayout>
@ -35,14 +34,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="vertical" />
android:scrollbars="vertical"
tools:listitem="@layout/view_user"/>
<TextView
android:id="@+id/loadingTextView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/text"
android:text="@string/contact_selection_group_activity__finding_contacts"
android:textSize="@dimen/large_font_size" />

5
res/layout/share_activity.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
android:background="@color/action_bar_background"
android:background="?colorPrimary"
android:elevation="0dp"
android:theme="@style/Session.DarkActionBar">
@ -24,7 +24,6 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Share"
android:textColor="@color/white"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/very_large_font_size"
android:layout_alignParentStart="true"
@ -34,7 +33,7 @@
<ImageView android:id="@+id/search_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search_white_24dp"
android:src="@drawable/ic_baseline_search_24"
android:visibility="gone"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"/>

3
src/org/thoughtcrime/securesms/ShareActivity.java
View File

@ -75,7 +75,6 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
public static final String EXTRA_ADDRESS_MARSHALLED = "address_marshalled";
public static final String EXTRA_DISTRIBUTION_TYPE = "distribution_type";
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
private ContactSelectionListFragment contactsFragment;
@ -88,7 +87,6 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
@Override
protected void onPreCreate() {
dynamicTheme.onCreate(this);
dynamicLanguage.onCreate(this);
}
@ -122,7 +120,6 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
public void onResume() {
Log.i(TAG, "onResume()");
super.onResume();
dynamicTheme.onResume(this);
dynamicLanguage.onResume(this);
}