Skip to content

Commit 56ea666

Browse files
authored
Merge branch 'master' into enter-to-send
2 parents 407538e + c75dc69 commit 56ea666

File tree

99 files changed

+2348
-589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+2348
-589
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:0828fecd09'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:9162225f33'
6767
implementation 'org.greenrobot:eventbus:3.3.1'
6868
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
69-
implementation 'com.github.tibbi:android-smsmms:875a46a9c4'
69+
implementation 'com.github.tibbi:android-smsmms:3581774c39'
7070
implementation "me.leolin:ShortcutBadger:1.1.22"
7171
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
7272
implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
<activity
5353
android:name=".activities.ThreadActivity"
5454
android:exported="false"
55-
android:parentActivityName=".activities.MainActivity" />
55+
android:parentActivityName=".activities.MainActivity"
56+
android:windowSoftInputMode="adjustResize" />
5657

5758
<activity
5859
android:name=".activities.SearchActivity"
@@ -93,17 +94,14 @@
9394
<action android:name="android.intent.action.SEND" />
9495
<category android:name="android.intent.category.DEFAULT" />
9596

96-
<data android:mimeType="text/plain" />
97-
<data android:mimeType="image/*" />
98-
<data android:mimeType="video/*" />
97+
<data android:mimeType="*/*" />
9998
</intent-filter>
10099

101100
<intent-filter>
102101
<action android:name="android.intent.action.SEND_MULTIPLE" />
103102
<category android:name="android.intent.category.DEFAULT" />
104103

105-
<data android:mimeType="image/*" />
106-
<data android:mimeType="video/*" />
104+
<data android:mimeType="*/*" />
107105
</intent-filter>
108106
</activity>
109107

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ class MainActivity : SimpleActivity() {
8787
override fun onResume() {
8888
super.onResume()
8989
setupToolbar(main_toolbar)
90+
9091
if (storedTextColor != getProperTextColor()) {
9192
(conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(getProperTextColor())
9293
}

0 commit comments

Comments
 (0)