Feature с добавленными датаклассами #22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,13 @@ android { | |
| kotlinOptions { | ||
| jvmTarget = '1.8' | ||
| } | ||
|
|
||
|
|
||
| buildFeatures { | ||
|
|
||
| viewBinding true | ||
|
|
||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| ## This file must *NOT* be checked into Version Control Systems, | ||
| # as it contains information specific to your local configuration. | ||
| # | ||
| # Location of the SDK. This is only used by Gradle. | ||
| # For customization when using a Version Control System, please read the | ||
| # header note. | ||
| #Fri May 28 20:01:59 MSK 2021 | ||
| sdk.dir=C\:\\Users\\Natalya\\AppData\\Local\\Android\\Sdk |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package ru.mail.fancywork.model.fancyLib | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
|
|
||
| enum class Difficulty { | ||
| UNDEFINED, EASY, MEDIUM, HARD, EXTREMELY_HARD | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package ru.mail.fancywork.model.fancyLib | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
|
|
||
| import android.graphics.Bitmap | ||
|
|
||
| data class FancyPicture( | ||
| val id: String, | ||
| val title: String, | ||
| val image: Bitmap, | ||
| val colors: List<List<String>> | ||
| ) { | ||
| // todo id generator | ||
| // todo difficulty definer | ||
|
|
||
| var author: String = "unknown" | ||
| var difficulty: Difficulty = Difficulty.UNDEFINED | ||
|
|
||
| constructor( | ||
| id: String, | ||
| title: String, | ||
| image: Bitmap, | ||
| colors: List<List<String>>, | ||
| author: String, | ||
| difficulty: Difficulty | ||
| ) : this(id, title, image, colors) { | ||
| this.author = author | ||
| this.difficulty = difficulty | ||
| } | ||
|
|
||
| fun getProportions(): Pair<Int, Int>? { | ||
| if (colors.isEmpty() || colors[0].isEmpty()) { | ||
| return null | ||
| } | ||
|
|
||
| return Pair(colors.size, colors[0].size) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,49 @@ | ||
| package ru.mail.fancywork.ui.primary | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
| import android.view.View | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.recyclerview.widget.LinearLayoutManager | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import ru.mail.fancywork.R | ||
| import ru.mail.fancywork.controller.Controller | ||
| import ru.mail.fancywork.ui.auth.AuthActivity | ||
|
|
||
| class MainActivity : AppCompatActivity() { | ||
|
|
||
| private val controller = Controller() | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContentView(R.layout.activity_main) | ||
|
|
||
| findViewById<androidx.appcompat.widget.Toolbar>(R.id.top_bar) | ||
| .setOnMenuItemClickListener { item -> | ||
| when (item.itemId) { | ||
| R.id.logout -> { | ||
| controller.logOut() | ||
| startActivity(Intent(this, AuthActivity::class.java)) | ||
| finish() | ||
| true | ||
| } | ||
| else -> false | ||
| } | ||
| } | ||
|
|
||
| var worksList: RecyclerView = findViewById(R.id.rv_works) | ||
| var ar: ArrayList<Int> = ArrayList() | ||
| ar.add(6) | ||
| ar.add(5) | ||
| ar.add(4) | ||
| var adapter = WorksListAdapter(ar) | ||
|
|
||
| worksList.adapter = adapter | ||
| worksList.layoutManager = LinearLayoutManager(this.applicationContext) | ||
| } | ||
|
|
||
| public fun add(view:View){ | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
| //todo открыть активити просмотра вышивки | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package ru.mail.fancywork.ui.primary | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
|
|
||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import ru.mail.fancywork.databinding.WorkItemInRvBinding | ||
|
|
||
| class WorksListAdapter( | ||
| private var worksList: List<Int>//dataclasses | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
| ) : RecyclerView.Adapter<WorksListAdapter.ViewHolder>() { | ||
|
|
||
| inner class ViewHolder(val binding: WorkItemInRvBinding) : RecyclerView.ViewHolder(binding.root) | ||
|
|
||
| override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { | ||
| val binding = | ||
| WorkItemInRvBinding.inflate(LayoutInflater.from(parent.context), parent, false) | ||
| return ViewHolder(binding) | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: ViewHolder, position: Int) { | ||
|
|
||
| with(holder) { | ||
| with(worksList[position]) { | ||
| binding.name.text = "ВЫЩЩЩИВКА" | ||
| binding.difficulty.rating = 4F | ||
| var str = "размер: " + worksList[position] + "x" + worksList[position] + "\nцветов: 5" | ||
|
There was a problem hiding this comment. [ktlint] reported by reviewdog 🐶 |
||
|
|
||
| binding.info.text = str | ||
|
|
||
| // binding.cardLayout.setOnClickListener { | ||
| // //todo открываем активити просмотра | ||
| // notifyDataSetChanged() | ||
| // } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun getItemCount(): Int { | ||
| return worksList.size | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <solid android:color="@color/lightBackground"/> | ||
|
|
||
| <stroke android:width="1.5dp" | ||
| android:color="@color/white" | ||
| /> | ||
|
|
||
| <padding android:left="1dp" | ||
| android:top="1dp" | ||
| android:right="1dp" | ||
| android:bottom="1dp" | ||
| /> | ||
|
|
||
| <corners android:bottomRightRadius="7dp" | ||
| android:bottomLeftRadius="7dp" | ||
| android:topLeftRadius="7dp" | ||
| android:topRightRadius="7dp"/> | ||
| </shape> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[ktlint] reported by reviewdog 🐶
Unnecessary semicolon