Skip to content

Commit 2742796

Browse files
author
bialger
committed
Migration to ViewBinding part 2 (all errors fixed)
1 parent d971863 commit 2742796

15 files changed

+205
-166
lines changed

‎app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ android {
1515

1616
buildFeatures {
1717
viewBinding true
18+
dataBinding true
1819
}
1920

2021
defaultConfig {

‎app/src/main/java/com/bigri239/easymusic/AddingfilesActivity.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
1515
import androidx.recyclerview.widget.RecyclerView
1616
import com.bigri239.easymusic.adapter.CustomAdapter
1717
import com.bigri239.easymusic.adapter.CustomConnector
18+
import com.bigri239.easymusic.databinding.ActivityAddfilesBinding
1819
import java.io.*
1920
import kotlin.math.abs
2021

@@ -43,7 +44,7 @@ class AddingfilesActivity : AppCompatActivity() {
4344
private val customList = arrayListOf<String>()
4445
private lateinit var defaultAdapter: CustomAdapter
4546
private lateinit var customAdapter: CustomAdapter
46-
private lateinit var binding: AddingfilesActivityBinding
47+
private lateinit var binding: ActivityAddfilesBinding
4748

4849
private val connectorSound = object : CustomConnector {
4950
override fun function(string: String) {
@@ -53,11 +54,10 @@ class AddingfilesActivity : AppCompatActivity() {
5354

5455
override fun onCreate(savedInstanceState: Bundle?) {
5556
super.onCreate(savedInstanceState)
56-
binding = AddingfilesActivityBinding.inflate(layoutInflater)
57+
binding = ActivityAddfilesBinding.inflate(layoutInflater)
5758
val view = binding.root.also {
5859
setContentView(it)
5960
}
60-
setContentView(R.layout.activity_addfiles)
6161
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
6262
val path = filesDir
6363
val file = File(path, "sounds.conf")
@@ -68,13 +68,13 @@ class AddingfilesActivity : AppCompatActivity() {
6868
}
6969
else FileOutputStream(file).write("".toByteArray())
7070

71-
val recyclerView: RecyclerView = recyclerView111
71+
val recyclerView: RecyclerView = binding.recyclerView111
7272
defaultAdapter = CustomAdapter(defaultList, connectorSound)
7373
recyclerView.layoutManager = LinearLayoutManager(applicationContext)
7474
recyclerView.adapter = defaultAdapter
7575
recyclerView.layoutParams = getLayoutParametersRelativeWidth()
7676

77-
val recyclerView1: RecyclerView = recyclerView222
77+
val recyclerView1: RecyclerView = binding.recyclerView222
7878
customAdapter = CustomAdapter(customList, connectorSound)
7979
recyclerView1.layoutManager = LinearLayoutManager(applicationContext)
8080
recyclerView1.adapter = customAdapter
@@ -85,7 +85,7 @@ class AddingfilesActivity : AppCompatActivity() {
8585
super.onStart()
8686
val intent = Intent(this, MainActivity::class.java)
8787
findViewById<TextView>(R.id.back_A).setOnClickListener {
88-
back_A.isClickable = false
88+
binding.backA.isClickable = false
8989
startActivity(intent)
9090
}
9191
}
@@ -167,8 +167,8 @@ class AddingfilesActivity : AppCompatActivity() {
167167
private fun playSound (soundName : String) {
168168
len = getSoundLength(soundName)
169169
if (len != 0.toLong()) {
170-
name.text = "Sound name: $soundName"
171-
length.text = "Sound length: $len"
170+
binding.name.text = "Sound name: $soundName"
171+
binding.length.text = "Sound length: $len"
172172
track.release()
173173
track = SoundPool(1, AudioManager.STREAM_MUSIC, 0)
174174
id = if (defaultList.contains(soundName)) track.load(

‎app/src/main/java/com/bigri239/easymusic/AuthorsActivity.kt

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,25 @@ package com.bigri239.easymusic
33
import android.content.Intent
44
import android.os.Bundle
55
import androidx.appcompat.app.AppCompatActivity
6-
import kotlinx.android.synthetic.main.activity_authors.*
6+
import com.bigri239.easymusic.databinding.ActivityAuthorsBinding
77

88
@Suppress("DEPRECATION")
99
class AuthorsActivity : AppCompatActivity() {
10+
private lateinit var binding: ActivityAuthorsBinding
1011

1112
override fun onCreate(savedInstanceState: Bundle?) {
1213
super.onCreate(savedInstanceState)
13-
setContentView(R.layout.activity_authors)
14+
binding = ActivityAuthorsBinding.inflate(layoutInflater)
15+
val view = binding.root.also {
16+
setContentView(it)
17+
}
1418
}
1519

1620
override fun onStart() {
1721
super.onStart()
1822
val intent = Intent(this, HelpActivity::class.java)
19-
backauth.setOnClickListener {
20-
backauth.isClickable = false
23+
binding.backauth.setOnClickListener {
24+
binding.backauth.isClickable = false
2125
startActivity(intent)
2226
}
2327
}

‎app/src/main/java/com/bigri239/easymusic/FaqActivity.kt

+11-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ import android.content.Intent
44
import android.os.Bundle
55
import android.os.StrictMode
66
import androidx.appcompat.app.AppCompatActivity
7+
import com.bigri239.easymusic.databinding.ActivityFaqBinding
78
import com.bigri239.easymusic.net.WebRequester
8-
import kotlinx.android.synthetic.main.activity_faq.*
99

1010
@Suppress("DEPRECATION")
1111
class FaqActivity : AppCompatActivity() {
12+
private lateinit var binding: ActivityFaqBinding
1213
override fun onCreate(savedInstanceState: Bundle?) {
1314
super.onCreate(savedInstanceState)
14-
setContentView(R.layout.activity_faq)
15+
binding = ActivityFaqBinding.inflate(layoutInflater)
16+
val view = binding.root.also {
17+
setContentView(it)
18+
}
1519
}
1620

1721
override fun onStart() {
@@ -21,13 +25,13 @@ class FaqActivity : AppCompatActivity() {
2125
val webRequester = WebRequester(this@FaqActivity)
2226

2327
val intent = Intent(this, HelpActivity::class.java)
24-
backfaq.setOnClickListener {
25-
backfaq.isClickable = false
28+
binding.backfaq.setOnClickListener {
29+
binding.backfaq.isClickable = false
2630
startActivity(intent)
2731
}
2832

2933
val faqText = webRequester.getTextResource("faq")
30-
text_view.text = if (faqText != "0") faqText
34+
binding.textView0.text = if (faqText != "0") faqText
3135
else {
3236
"1. Q: Is it possible to save the sound to the device in mp3 or other audio format? \n" +
3337
"A: Unfortunately, no, the application was created for educational purposes and aims to explain in simple terms the principle of creating music from sounds and understand if you want to do it. However, you can share music with your friends inside the app by uploading projects to your account. Or, if desired, record music using the built-in screen recording application on your phone, and then extract the audio track from the video in the online service. \n\n" +
@@ -42,7 +46,7 @@ class FaqActivity : AppCompatActivity() {
4246
val pixelsWidth = (displayMetrics.widthPixels * 0.95F).toInt()
4347
val pixelsHeight = (displayMetrics.heightPixels * 0.95F - 100 * scale + 0.5f).toInt()
4448

45-
scroll.layoutParams.height = pixelsHeight
46-
scroll.layoutParams.width = pixelsWidth
49+
binding.scroll.layoutParams.height = pixelsHeight
50+
binding.scroll.layoutParams.width = pixelsWidth
4751
}
4852
}

‎app/src/main/java/com/bigri239/easymusic/FriendActivity.kt

+16-11
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import androidx.appcompat.app.AppCompatActivity
99
import androidx.appcompat.app.AppCompatDelegate
1010
import androidx.recyclerview.widget.LinearLayoutManager
1111
import com.bigri239.easymusic.adapter.*
12+
import com.bigri239.easymusic.databinding.ActivityFriendBinding
1213
import com.bigri239.easymusic.net.WebRequester
13-
import kotlinx.android.synthetic.main.activity_friend.*
1414

1515
@Suppress("DEPRECATION")
1616
class FriendActivity : AppCompatActivity() {
@@ -21,6 +21,7 @@ class FriendActivity : AppCompatActivity() {
2121
private lateinit var webRequester : WebRequester
2222
private lateinit var soundsAdapter: CustomAdapter
2323
private lateinit var projectsAdapter: CustomAdapter
24+
private lateinit var binding: ActivityFriendBinding
2425
private val connectorProject = object : CustomConnector {
2526
override fun function(string: String) {
2627
loadProject(string)
@@ -33,6 +34,10 @@ class FriendActivity : AppCompatActivity() {
3334

3435
override fun onCreate(savedInstanceState: Bundle?) {
3536
super.onCreate(savedInstanceState)
37+
binding = ActivityFriendBinding.inflate(layoutInflater)
38+
val view = binding.root.also {
39+
setContentView(it)
40+
}
3641
setContentView(R.layout.activity_friend)
3742
email = intent.getStringExtra("owner").toString()
3843
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
@@ -45,8 +50,8 @@ class FriendActivity : AppCompatActivity() {
4550
super.onStart()
4651
val info = email.let { webRequester.getFriendInfo(it) }
4752
if (!info.contentEquals(Array (5) {arrayOf("")})) {
48-
username.text = "Username: " + info[0][0]
49-
aboutme.text = "About me: " + info[1][0]
53+
binding.username.text = "Username: " + info[0][0]
54+
binding.aboutme.text = "About me: " + info[1][0]
5055
soundsList = info[3]
5156
projectsList = info[4]
5257
if (soundsList == arrayListOf("")) soundsList = arrayListOf()
@@ -58,20 +63,20 @@ class FriendActivity : AppCompatActivity() {
5863
}
5964

6065
val intent = Intent(this, RecoveryActivity::class.java)
61-
backrec.setOnClickListener {
62-
backrec.isClickable = false
66+
binding.backrec.setOnClickListener {
67+
binding.backrec.isClickable = false
6368
startActivity(intent)
6469
}
6570

6671
soundsAdapter = CustomAdapter(soundsList, connectorSound)
67-
recyclerView2.layoutManager = LinearLayoutManager(applicationContext)
68-
recyclerView2.adapter = soundsAdapter
69-
recyclerView2.layoutParams = getLayoutParametersRelativeWidth()
72+
binding.recyclerView2.layoutManager = LinearLayoutManager(applicationContext)
73+
binding.recyclerView2.adapter = soundsAdapter
74+
binding.recyclerView2.layoutParams = getLayoutParametersRelativeWidth()
7075

7176
projectsAdapter = CustomAdapter(projectsList, connectorProject)
72-
recyclerView3.layoutManager = LinearLayoutManager(applicationContext)
73-
recyclerView3.adapter = projectsAdapter
74-
recyclerView3.layoutParams = getLayoutParametersRelativeWidth()
77+
binding.recyclerView3.layoutManager = LinearLayoutManager(applicationContext)
78+
binding.recyclerView3.adapter = projectsAdapter
79+
binding.recyclerView3.layoutParams = getLayoutParametersRelativeWidth()
7580
}
7681

7782
private fun getLayoutParametersRelativeWidth (): LinearLayout.LayoutParams {

‎app/src/main/java/com/bigri239/easymusic/HelpActivity.kt

+14-10
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,43 @@ package com.bigri239.easymusic
33
import android.content.Intent
44
import android.os.Bundle
55
import androidx.appcompat.app.AppCompatActivity
6-
import kotlinx.android.synthetic.main.activity_help.*
6+
import com.bigri239.easymusic.databinding.ActivityHelpBinding
77

88
@Suppress("DEPRECATION")
99
class HelpActivity : AppCompatActivity() {
10+
private lateinit var binding: ActivityHelpBinding
1011
override fun onCreate(savedInstanceState: Bundle?) {
1112
super.onCreate(savedInstanceState)
12-
setContentView(R.layout.activity_help)
13+
binding = ActivityHelpBinding.inflate(layoutInflater)
14+
val view = binding.root.also {
15+
setContentView(it)
16+
}
1317
}
1418

1519
override fun onStart() {
1620
super.onStart()
1721

1822
val intent = Intent(this, MainActivity::class.java)
19-
back_H.setOnClickListener {
20-
back_H.isClickable = false
23+
binding.backH.setOnClickListener {
24+
binding.backH.isClickable = false
2125
startActivity(intent)
2226
}
2327

2428
val intent11 = Intent(this, AuthorsActivity::class.java)
25-
authors.setOnClickListener {
26-
authors.isClickable = false
29+
binding.authors.setOnClickListener {
30+
binding.authors.isClickable = false
2731
startActivity(intent11)
2832
}
2933

3034
val intent12 = Intent(this, FaqActivity::class.java)
31-
frequently.setOnClickListener {
32-
terms.isClickable = false
35+
binding.frequently.setOnClickListener {
36+
binding.frequently.isClickable = false
3337
startActivity(intent12)
3438
}
3539

3640
val intent13 = Intent(this, TermsActivity::class.java)
37-
terms.setOnClickListener {
38-
terms.isClickable = false
41+
binding.terms.setOnClickListener {
42+
binding.terms.isClickable = false
3943
intent13.putExtra("isStart", "false")
4044
startActivity(intent13)
4145
}

0 commit comments

Comments
 (0)