Skip to content

Commit 203bd83

Browse files
u4i-sadrau4i-sadra
committed
Remove SMS feature and add from Contact
1 parent dc062ae commit 203bd83

23 files changed

+790
-986
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
applicationId "org.nahoft.nahoft"
2626
minSdkVersion 26
2727
targetSdkVersion 33
28-
versionCode 9
29-
versionName "2.0.5"
28+
versionCode 11
29+
versionName "2.1.0"
3030

3131
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3232
}

‎app/release/output-metadata.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 8,
15-
"versionName": "2.0.4",
14+
"versionCode": 11,
15+
"versionName": "2.1.0",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
1313
android:maxSdkVersion="28" />
1414
<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
15-
<uses-permission android:name="android.permission.SEND_SMS" />
16-
<uses-permission android:name="android.permission.RECEIVE_SMS" />
17-
<uses-permission android:name="android.permission.READ_CONTACTS" />
1815
<uses-permission
1916
android:name="com.google.android.gms.permission.AD_ID"
2017
tools:node="remove" />
@@ -92,20 +89,7 @@
9289
android:excludeFromRecents="true"
9390
android:screenOrientation="portrait"
9491
tools:ignore="LockedOrientationActivity" />
95-
<activity
96-
android:name=".activities.ContactListActivity"
97-
android:excludeFromRecents="true"
98-
android:exported="false"
99-
android:screenOrientation="portrait"
100-
tools:ignore="LockedOrientationActivity" />
10192

102-
<receiver
103-
android:name=".SmsReceiver"
104-
android:exported="true">
105-
<intent-filter>
106-
<action android:name="android.provider.Telephony.SMS_RECEIVED" />
107-
</intent-filter>
108-
</receiver>
10993
<receiver
11094
android:name=".TimeChangeReceiver"
11195
android:exported="true">

‎app/src/main/java/org/nahoft/Nahoft/Contact.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
package org.nahoft.nahoft
2-
3-
data class Contact(val name : String, val number : String)
1+
//package org.nahoft.nahoft
2+
//
3+
//data class Contact(val name : String, val number : String)

‎app/src/main/java/org/nahoft/Nahoft/ContactsRecyclerAdapter.kt‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
package org.nahoft.nahoft
2-
3-
import android.view.View
4-
import android.view.ViewGroup
5-
import androidx.recyclerview.widget.RecyclerView
6-
import kotlinx.android.synthetic.main.contact_recyclerview_item_row.view.*
7-
import org.nahoft.util.inflate
8-
9-
class ContactsRecyclerAdapter(private val contacts: ArrayList<Contact>) : RecyclerView.Adapter<ContactsRecyclerAdapter.ContactViewHolder>()
10-
{
11-
var onItemClick: ((Contact) -> Unit)? = null
12-
13-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ContactViewHolder
14-
{
15-
val inflatedView = parent.inflate(R.layout.contact_recyclerview_item_row, false)
16-
return ContactViewHolder(inflatedView)
17-
}
18-
19-
override fun onBindViewHolder(holder: ContactViewHolder, position: Int)
20-
{
21-
val itemContact = contacts[position]
22-
holder.bindContact(itemContact)
23-
holder.itemView.setOnClickListener {
24-
onItemClick?.invoke(itemContact)
25-
}
26-
}
27-
28-
override fun getItemCount() = contacts.size
29-
30-
fun cleanup()
31-
{
32-
contacts.clear()
33-
}
34-
35-
inner class ContactViewHolder(v: View) : RecyclerView.ViewHolder(v)
36-
{
37-
private var contact: Contact? = null
38-
private var view: View = v
39-
40-
init
41-
{
42-
v.setOnClickListener {
43-
contact?.let { contact ->
44-
onItemClick?.invoke(contact)
45-
}
46-
}
47-
}
48-
49-
fun bindContact(newContact: Contact)
50-
{
51-
this.contact = newContact
52-
this.view.contact_name_text_view.text = newContact.name
53-
this.view.phone_number_text_view.text = newContact.number
54-
this.view.friend_picture.text = newContact.name.substring(0, 1)
55-
}
56-
}
57-
}
1+
//package org.nahoft.nahoft
2+
//
3+
//import android.view.View
4+
//import android.view.ViewGroup
5+
//import androidx.recyclerview.widget.RecyclerView
6+
//import kotlinx.android.synthetic.main.contact_recyclerview_item_row.view.*
7+
//import org.nahoft.util.inflate
8+
//
9+
//class ContactsRecyclerAdapter(private val contacts: ArrayList<Contact>) : RecyclerView.Adapter<ContactsRecyclerAdapter.ContactViewHolder>()
10+
//{
11+
// var onItemClick: ((Contact) -> Unit)? = null
12+
//
13+
// override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ContactViewHolder
14+
// {
15+
// val inflatedView = parent.inflate(R.layout.contact_recyclerview_item_row, false)
16+
// return ContactViewHolder(inflatedView)
17+
// }
18+
//
19+
// override fun onBindViewHolder(holder: ContactViewHolder, position: Int)
20+
// {
21+
// val itemContact = contacts[position]
22+
// holder.bindContact(itemContact)
23+
// holder.itemView.setOnClickListener {
24+
// onItemClick?.invoke(itemContact)
25+
// }
26+
// }
27+
//
28+
// override fun getItemCount() = contacts.size
29+
//
30+
// fun cleanup()
31+
// {
32+
// contacts.clear()
33+
// }
34+
//
35+
// inner class ContactViewHolder(v: View) : RecyclerView.ViewHolder(v)
36+
// {
37+
// private var contact: Contact? = null
38+
// private var view: View = v
39+
//
40+
// init
41+
// {
42+
// v.setOnClickListener {
43+
// contact?.let { contact ->
44+
// onItemClick?.invoke(contact)
45+
// }
46+
// }
47+
// }
48+
//
49+
// fun bindContact(newContact: Contact)
50+
// {
51+
// this.contact = newContact
52+
// this.view.contact_name_text_view.text = newContact.name
53+
// this.view.phone_number_text_view.text = newContact.number
54+
// this.view.friend_picture.text = newContact.name.substring(0, 1)
55+
// }
56+
// }
57+
//}

‎app/src/main/java/org/nahoft/Nahoft/Slide.kt‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ fun getSettingSlides(context: Context): ArrayList<Slide> {
7676
skipButtonText = context.getString(R.string.close)
7777
)
7878
)
79-
arrayList.add(
80-
Slide(
81-
image = R.drawable.ic_nahoft_intro_message_bubble,
82-
title = context.getString(R.string.use_sms_as_default),
83-
description = context.getString(R.string.use_sms_as_default_description),
84-
skipButtonText = context.getString(R.string.close),
85-
fullDescription = context.getString(R.string.use_sms_as_default_full_description)
86-
)
87-
)
79+
// arrayList.add(
80+
// Slide(
81+
// image = R.drawable.ic_nahoft_intro_message_bubble,
82+
// title = context.getString(R.string.use_sms_as_default),
83+
// description = context.getString(R.string.use_sms_as_default_description),
84+
// skipButtonText = context.getString(R.string.close),
85+
// fullDescription = context.getString(R.string.use_sms_as_default_full_description)
86+
// )
87+
// )
8888
arrayList.add(
8989
Slide(
9090
image = R.drawable.ic_nahoft_intro_key,
@@ -139,7 +139,6 @@ fun getAboutAndFriendsSlides(context: Context): ArrayList<Slide> {
139139
image = R.drawable.ic_nahoft_intro_add_user,
140140
title = context.getString(R.string.add_new_contact),
141141
description = context.getString(R.string.add_new_friend_description),
142-
fullDescription = context.getString(R.string.add_new_friend_full_description),
143142
skipButtonText = context.getString(R.string.close)
144143
)
145144
)
@@ -204,19 +203,19 @@ fun getAboutAndFriendsSlides(context: Context): ArrayList<Slide> {
204203
return arrayList
205204
}
206205

207-
fun getContactSlides(context: Context): ArrayList<Slide> {
208-
val arrayList: ArrayList<Slide> = ArrayList()
209-
arrayList.add(
210-
Slide(
211-
image = R.drawable.ic_nahoft_icons_contact_help,
212-
title = context.getString(R.string.contact_list),
213-
description = context.getString(R.string.contact_list_description),
214-
skipButtonText = context.getString(R.string.close)
215-
)
216-
)
217-
218-
return arrayList
219-
}
206+
//fun getContactSlides(context: Context): ArrayList<Slide> {
207+
// val arrayList: ArrayList<Slide> = ArrayList()
208+
// arrayList.add(
209+
// Slide(
210+
// image = R.drawable.ic_nahoft_icons_contact_help,
211+
// title = context.getString(R.string.contact_list),
212+
// description = context.getString(R.string.contact_list_description),
213+
// skipButtonText = context.getString(R.string.close)
214+
// )
215+
// )
216+
//
217+
// return arrayList
218+
//}
220219

221220
fun getChatSlides(context: Context): ArrayList<Slide> {
222221
val arrayList: ArrayList<Slide> = ArrayList()
@@ -238,15 +237,15 @@ fun getChatSlides(context: Context): ArrayList<Slide> {
238237
fullDescription = context.getString(R.string.manually_import_text_full_description)
239238
)
240239
)
241-
arrayList.add(
242-
Slide(
243-
image = R.drawable.ic_nahoft_icons_auto_import_send,
244-
title = context.getString(R.string.automatically_import_send_text),
245-
description = context.getString(R.string.automatically_import_send_text_description),
246-
skipButtonText = context.getString(R.string.close),
247-
fullDescription = context.getString(R.string.automatically_import_send_text_full_description)
248-
)
249-
)
240+
// arrayList.add(
241+
// Slide(
242+
// image = R.drawable.ic_nahoft_icons_auto_import_send,
243+
// title = context.getString(R.string.automatically_import_send_text),
244+
// description = context.getString(R.string.automatically_import_send_text_description),
245+
// skipButtonText = context.getString(R.string.close),
246+
// fullDescription = context.getString(R.string.automatically_import_send_text_full_description)
247+
// )
248+
// )
250249
arrayList.add(
251250
Slide(
252251
image = R.drawable.ic_nahoft_icons_share_image_help,

0 commit comments

Comments
 (0)