Skip to content

Commit 84a59d6

Browse files
tibbitibbi
committed
updating commons with some style improvements
1 parent 97acb89 commit 84a59d6

17 files changed

+866
-753
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:ab6a89e3b9'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:4f9c2f94ff'
6767
implementation 'org.greenrobot:eventbus:3.3.1'
6868
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
6969
implementation 'com.github.tibbi:android-smsmms:1012d20ab9'

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

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import android.graphics.drawable.LayerDrawable
1212
import android.net.Uri
1313
import android.os.Bundle
1414
import android.provider.Telephony
15-
import android.view.Menu
16-
import android.view.MenuItem
1715
import android.widget.Toast
1816
import com.simplemobiletools.commons.dialogs.FilePickerDialog
1917
import com.simplemobiletools.commons.extensions.*
@@ -55,6 +53,7 @@ class MainActivity : SimpleActivity() {
5553
super.onCreate(savedInstanceState)
5654
setContentView(R.layout.activity_main)
5755
appLaunched(BuildConfig.APPLICATION_ID)
56+
setupOptionsMenu()
5857

5958
if (checkAppSideloading()) {
6059
return
@@ -88,6 +87,7 @@ class MainActivity : SimpleActivity() {
8887

8988
override fun onResume() {
9089
super.onResume()
90+
setupToolbar(main_toolbar)
9191
if (storedTextColor != getProperTextColor()) {
9292
(conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(getProperTextColor())
9393
}
@@ -116,22 +116,18 @@ class MainActivity : SimpleActivity() {
116116
bus?.unregister(this)
117117
}
118118

119-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
120-
menuInflater.inflate(R.menu.menu_main, menu)
121-
updateMenuItemColors(menu)
122-
return true
123-
}
124-
125-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
126-
when (item.itemId) {
127-
R.id.search -> launchSearch()
128-
R.id.settings -> launchSettings()
129-
R.id.export_messages -> tryToExportMessages()
130-
R.id.import_messages -> tryImportMessages()
131-
R.id.about -> launchAbout()
132-
else -> return super.onOptionsItemSelected(item)
119+
private fun setupOptionsMenu() {
120+
main_toolbar.setOnMenuItemClickListener { menuItem ->
121+
when (menuItem.itemId) {
122+
R.id.search -> launchSearch()
123+
R.id.settings -> launchSettings()
124+
R.id.export_messages -> tryToExportMessages()
125+
R.id.import_messages -> tryImportMessages()
126+
R.id.about -> launchAbout()
127+
else -> return@setOnMenuItemClickListener false
128+
}
129+
return@setOnMenuItemClickListener true
133130
}
134-
return true
135131
}
136132

137133
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {

‎app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@ package com.simplemobiletools.smsmessenger.activities
33
import android.content.Intent
44
import android.net.Uri
55
import android.os.Bundle
6-
import android.view.Menu
76
import android.view.WindowManager
87
import com.google.gson.Gson
98
import com.reddit.indicatorfastscroll.FastScrollItemIndicator
109
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
1110
import com.simplemobiletools.commons.extensions.*
12-
import com.simplemobiletools.commons.helpers.MyContactsContentProvider
13-
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
14-
import com.simplemobiletools.commons.helpers.SimpleContactsHelper
15-
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
11+
import com.simplemobiletools.commons.helpers.*
1612
import com.simplemobiletools.commons.models.RadioItem
1713
import com.simplemobiletools.commons.models.SimpleContact
1814
import com.simplemobiletools.smsmessenger.R
@@ -46,15 +42,11 @@ class NewConversationActivity : SimpleActivity() {
4642

4743
override fun onResume() {
4844
super.onResume()
45+
setupToolbar(new_conversation_toolbar, NavigationIcon.Arrow)
4946
no_contacts_placeholder_2.setTextColor(getProperPrimaryColor())
5047
no_contacts_placeholder_2.underlineText()
5148
}
5249

53-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
54-
updateMenuItemColors(menu)
55-
return super.onCreateOptionsMenu(menu)
56-
}
57-
5850
private fun initContacts() {
5951
if (isThirdPartyIntent()) {
6052
return

‎app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ class SearchActivity : SimpleActivity() {
3737
updateTextColors(search_holder)
3838
search_placeholder.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
3939
search_placeholder_2.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
40+
setupSearch(search_toolbar.menu)
4041
}
4142

42-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
43-
menuInflater.inflate(R.menu.menu_search, menu)
44-
setupSearch(menu)
45-
return true
43+
override fun onResume() {
44+
super.onResume()
45+
setupToolbar(search_toolbar, searchMenuItem = mSearchMenuItem)
4646
}
4747

4848
private fun setupSearch(menu: Menu) {

‎app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.annotation.TargetApi
44
import android.content.Intent
55
import android.os.Build
66
import android.os.Bundle
7-
import android.view.Menu
87
import com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity
98
import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog
109
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
@@ -27,6 +26,7 @@ class SettingsActivity : SimpleActivity() {
2726

2827
override fun onResume() {
2928
super.onResume()
29+
setupToolbar(settings_toolbar, NavigationIcon.Arrow)
3030

3131
setupPurchaseThankYou()
3232
setupCustomizeColors()
@@ -42,7 +42,7 @@ class SettingsActivity : SimpleActivity() {
4242
setupGroupMessageAsMMS()
4343
setupLockScreenVisibility()
4444
setupMMSFileSizeLimit()
45-
updateTextColors(settings_scrollview)
45+
updateTextColors(settings_nested_scrollview)
4646

4747
if (blockedNumbersAtPause != -1 && blockedNumbersAtPause != getBlockedNumbers().hashCode()) {
4848
refreshMessages()
@@ -67,11 +67,6 @@ class SettingsActivity : SimpleActivity() {
6767
blockedNumbersAtPause = getBlockedNumbers().hashCode()
6868
}
6969

70-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
71-
updateMenuItemColors(menu)
72-
return super.onCreateOptionsMenu(menu)
73-
}
74-
7570
private fun setupPurchaseThankYou() {
7671
settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled())
7772

‎app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ import android.telephony.SmsMessage
1616
import android.telephony.SubscriptionManager
1717
import android.text.TextUtils
1818
import android.util.TypedValue
19-
import android.view.*
19+
import android.view.Gravity
20+
import android.view.View
21+
import android.view.WindowManager
2022
import android.view.inputmethod.EditorInfo
2123
import android.widget.LinearLayout
2224
import android.widget.LinearLayout.LayoutParams
@@ -84,6 +86,8 @@ class ThreadActivity : SimpleActivity() {
8486
override fun onCreate(savedInstanceState: Bundle?) {
8587
super.onCreate(savedInstanceState)
8688
setContentView(R.layout.activity_thread)
89+
setupOptionsMenu()
90+
refreshMenuItems()
8791

8892
val extras = intent.extras
8993
if (extras == null) {
@@ -95,7 +99,7 @@ class ThreadActivity : SimpleActivity() {
9599
clearAllMessagesIfNeeded()
96100
threadId = intent.getLongExtra(THREAD_ID, 0L)
97101
intent.getStringExtra(THREAD_TITLE)?.let {
98-
supportActionBar?.title = it
102+
thread_toolbar.title = it
99103
}
100104

101105
bus = EventBus.getDefault()
@@ -123,6 +127,7 @@ class ThreadActivity : SimpleActivity() {
123127

124128
override fun onResume() {
125129
super.onResume()
130+
setupToolbar(thread_toolbar, NavigationIcon.Arrow)
126131

127132
val smsDraft = getSmsDraft(threadId)
128133
if (smsDraft != null) {
@@ -150,10 +155,9 @@ class ThreadActivity : SimpleActivity() {
150155
bus?.unregister(this)
151156
}
152157

153-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
154-
menuInflater.inflate(R.menu.menu_thread, menu)
158+
private fun refreshMenuItems() {
155159
val firstPhoneNumber = participants.firstOrNull()?.phoneNumbers?.firstOrNull()?.value
156-
menu.apply {
160+
thread_toolbar.menu.apply {
157161
findItem(R.id.delete).isVisible = threadItems.isNotEmpty()
158162
findItem(R.id.block_number).isVisible = isNougatPlus()
159163
findItem(R.id.dial_number).isVisible = participants.size == 1
@@ -164,27 +168,25 @@ class ThreadActivity : SimpleActivity() {
164168
it.isDigit()
165169
}
166170
}
167-
168-
updateMenuItemColors(menu)
169-
return true
170171
}
171172

172-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
173-
if (participants.isEmpty()) {
174-
return true
175-
}
173+
private fun setupOptionsMenu() {
174+
thread_toolbar.setOnMenuItemClickListener { menuItem ->
175+
if (participants.isEmpty()) {
176+
return@setOnMenuItemClickListener true
177+
}
176178

177-
when (item.itemId) {
178-
R.id.block_number -> blockNumber()
179-
R.id.delete -> askConfirmDelete()
180-
R.id.add_number_to_contact -> addNumberToContact()
181-
R.id.dial_number -> dialNumber()
182-
R.id.manage_people -> managePeople()
183-
R.id.mark_as_unread -> markAsUnread()
184-
android.R.id.home -> onHomePressed()
185-
else -> return super.onOptionsItemSelected(item)
179+
when (menuItem.itemId) {
180+
R.id.block_number -> blockNumber()
181+
R.id.delete -> askConfirmDelete()
182+
R.id.add_number_to_contact -> addNumberToContact()
183+
R.id.dial_number -> dialNumber()
184+
R.id.manage_people -> managePeople()
185+
R.id.mark_as_unread -> markAsUnread()
186+
else -> return@setOnMenuItemClickListener false
187+
}
188+
return@setOnMenuItemClickListener true
186189
}
187-
return true
188190
}
189191

190192
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
@@ -320,9 +322,10 @@ class ThreadActivity : SimpleActivity() {
320322

321323
private fun setupAdapter() {
322324
threadItems = getThreadItems()
323-
invalidateOptionsMenu()
324325

325326
runOnUiThread {
327+
refreshMenuItems()
328+
326329
val currAdapter = thread_messages_list.adapter
327330
if (currAdapter == null) {
328331
ThreadAdapter(this, threadItems, thread_messages_list) {
@@ -514,7 +517,7 @@ class ThreadActivity : SimpleActivity() {
514517
private fun setupThreadTitle() {
515518
val threadTitle = participants.getThreadTitle()
516519
if (threadTitle.isNotEmpty()) {
517-
supportActionBar?.title = participants.getThreadTitle()
520+
thread_toolbar.title = participants.getThreadTitle()
518521
}
519522
}
520523

@@ -831,7 +834,7 @@ class ThreadActivity : SimpleActivity() {
831834
}
832835

833836
private fun checkSendMessageAvailability() {
834-
if (thread_type_message.text.isNotEmpty() || (attachmentSelections.isNotEmpty() && !attachmentSelections.values.any { it.isPending })) {
837+
if (thread_type_message.text!!.isNotEmpty() || (attachmentSelections.isNotEmpty() && !attachmentSelections.values.any { it.isPending })) {
835838
thread_send_message.isClickable = true
836839
thread_send_message.alpha = 0.9f
837840
} else {

‎app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,30 @@ class ExportMessagesDialog(
2222

2323
init {
2424
val view = (activity.layoutInflater.inflate(R.layout.dialog_export_messages, null) as ViewGroup).apply {
25-
export_messages_folder.text = activity.humanizePath(realPath)
25+
export_messages_folder.setText(activity.humanizePath(realPath))
2626
export_messages_filename.setText("${activity.getString(R.string.messages)}_${activity.getCurrentFormattedDateTime()}")
2727
export_sms_checkbox.isChecked = config.exportSms
2828
export_mms_checkbox.isChecked = config.exportMms
2929

3030
if (hidePath) {
31-
export_messages_folder_label.beGone()
32-
export_messages_folder.beGone()
31+
export_messages_folder_hint.beGone()
3332
} else {
3433
export_messages_folder.setOnClickListener {
3534
activity.hideKeyboard(export_messages_filename)
3635
FilePickerDialog(activity, realPath, false, showFAB = true) {
37-
export_messages_folder.text = activity.humanizePath(it)
36+
export_messages_folder.setText(activity.humanizePath(it))
3837
realPath = it
3938
}
4039
}
4140
}
4241
}
4342

44-
AlertDialog.Builder(activity)
43+
activity.getAlertDialogBuilder()
4544
.setPositiveButton(R.string.ok, null)
4645
.setNegativeButton(R.string.cancel, null)
47-
.create().apply {
48-
activity.setupDialogStuff(view, this, R.string.export_messages) {
49-
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
46+
.apply {
47+
activity.setupDialogStuff(view, this, R.string.export_messages) { alertDialog ->
48+
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
5049
val filename = view.export_messages_filename.value
5150
when {
5251
filename.isEmpty() -> activity.toast(R.string.empty_name)
@@ -66,7 +65,7 @@ class ExportMessagesDialog(
6665
config.exportMms = view.export_mms_checkbox.isChecked
6766
config.lastExportPath = file.absolutePath.getParentPath()
6867
callback(file)
69-
dismiss()
68+
alertDialog.dismiss()
7069
}
7170
else -> activity.toast(R.string.invalid_name)
7271
}

‎app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.simplemobiletools.smsmessenger.dialogs
22

33
import android.view.ViewGroup
44
import androidx.appcompat.app.AlertDialog
5+
import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
56
import com.simplemobiletools.commons.extensions.setupDialogStuff
67
import com.simplemobiletools.commons.extensions.toast
78
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@@ -27,12 +28,12 @@ class ImportMessagesDialog(
2728
import_mms_checkbox.isChecked = config.importMms
2829
}
2930

30-
AlertDialog.Builder(activity)
31+
activity.getAlertDialogBuilder()
3132
.setPositiveButton(R.string.ok, null)
3233
.setNegativeButton(R.string.cancel, null)
33-
.create().apply {
34-
activity.setupDialogStuff(view, this, R.string.import_messages) {
35-
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
34+
.apply {
35+
activity.setupDialogStuff(view, this, R.string.import_messages) { alertDialog ->
36+
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
3637
if (ignoreClicks) {
3738
return@setOnClickListener
3839
}
@@ -49,7 +50,7 @@ class ImportMessagesDialog(
4950
ensureBackgroundThread {
5051
MessagesImporter(activity).importMessages(path) {
5152
handleParseResult(it)
52-
dismiss()
53+
alertDialog.dismiss()
5354
}
5455
}
5556
}

‎app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.simplemobiletools.smsmessenger.dialogs
22

3-
import androidx.appcompat.app.AlertDialog
43
import com.simplemobiletools.commons.activities.BaseSimpleActivity
4+
import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
55
import com.simplemobiletools.commons.extensions.setupDialogStuff
66
import com.simplemobiletools.smsmessenger.R
77
import kotlinx.android.synthetic.main.dialog_select_text.view.*
@@ -13,9 +13,9 @@ class SelectTextDialog(val activity: BaseSimpleActivity, val text: String) {
1313
dialog_select_text_value.text = text
1414
}
1515

16-
AlertDialog.Builder(activity)
16+
activity.getAlertDialogBuilder()
1717
.setPositiveButton(R.string.ok) { dialog, which -> { } }
18-
.create().apply {
18+
.apply {
1919
activity.setupDialogStuff(view, this)
2020
}
2121
}

‎app/src/main/res/drawable/item_selected_contact_background.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
33
<item android:id="@+id/selected_contact_bg">
44
<shape android:shape="rectangle">
5-
6-
<corners android:radius="@dimen/normal_margin" />
7-
5+
<corners android:radius="@dimen/material_button_corner_radius" />
86
<solid android:color="@color/md_grey_white" />
9-
107
</shape>
118
</item>
129
</layer-list>

0 commit comments

Comments
 (0)