diff --git a/.idea/.name b/.idea/.name
index ab502a6..1b6f5c1 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Rehabilitation
\ No newline at end of file
+Реабилитация
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index de2c1e8..8f684dc 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -17,6 +17,5 @@
-
\ No newline at end of file
diff --git a/app/release/VMedA.Rehabilitation.apk b/app/release/VMedA.Rehabilitation.apk
new file mode 100644
index 0000000..5d0b732
Binary files /dev/null and b/app/release/VMedA.Rehabilitation.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644
index 0000000..e768bec
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "com.example.rehabilitation",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 1,
+ "versionName": "1.0",
+ "outputFile": "app-release.apk"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/MainSettingDoctorFragment.kt b/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/MainSettingDoctorFragment.kt
index d3a1273..085988b 100644
--- a/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/MainSettingDoctorFragment.kt
+++ b/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/MainSettingDoctorFragment.kt
@@ -193,7 +193,7 @@ class MainSettingDoctorFragment : Fragment() {
val edit = prefBlock?.edit()
edit?.clear()
edit?.apply()
- SportPlusCount = 0
+ Block = ""
}
fun savePauseDay(pd: String) {
val edit = prefPauseDay?.edit()
diff --git a/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/PatientSportFragment.kt b/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/PatientSportFragment.kt
index 81e4991..13c1f3b 100644
--- a/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/PatientSportFragment.kt
+++ b/app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/SettingDoctor/PatientSportFragment.kt
@@ -295,12 +295,29 @@ class PatientSportFragment : Fragment(), EditSportAdapter.Listener, EditSportAda
binding.btnAddCyrc1.setOnClickListener {
if(FIO !=""){
addSportCategoryDay()
+ binding.btnAddCyrc1.setCardBackgroundColor(Color.parseColor("#FD5ADC7B"))
+
}
else{
Toast(requireContext()).showCustomInfoToast("Создайте аккаунт пациенту", requireActivity())
}
}
+
+ if(SportUserTrue == 0){
+ binding.btnAddCyrc1.setCardBackgroundColor(Color.parseColor("#BFBFBF"))
+ }
+ else{
+ binding.btnAddCyrc1.setCardBackgroundColor(Color.parseColor("#FD5ADC7B"))
+ }
+
+ if(visibleListCyrs == true){
+ binding.cardViewLIstSportCurs.visibility = View.VISIBLE
+ }
+ else{
+ binding.cardViewLIstSportCurs.visibility = View.GONE
+ }
+
binding.btnAddListCyrc.setOnClickListener {
if (visibleListCyrs == false){
binding.cardViewLIstSportCurs.visibility = View.VISIBLE
@@ -335,6 +352,7 @@ class PatientSportFragment : Fragment(), EditSportAdapter.Listener, EditSportAda
clearSportMaxCount()
clearSportDateStart()
clearCursDayNumber()
+ binding.btnAddCyrc1.setCardBackgroundColor(Color.parseColor("#BFBFBF"))
Log.i("SportUserTrue","${SportUserTrue}")
Log.i("SportCursDay","${SportCursDay}")
Log.i("SportCursDayDangerBefore","${SportCursDayDangerBefore}")
@@ -447,7 +465,7 @@ class PatientSportFragment : Fragment(), EditSportAdapter.Listener, EditSportAda
val edit = prefBlock?.edit()
edit?.clear()
edit?.apply()
- SportPlusCount = 0
+ Block = ""
}
fun savePauseDay(pd: String) {
val edit = prefPauseDay?.edit()
diff --git a/app/src/main/java/com/example/rehabilitation/SettingActivity.kt b/app/src/main/java/com/example/rehabilitation/SettingActivity.kt
index 0f65ade..edaf587 100644
--- a/app/src/main/java/com/example/rehabilitation/SettingActivity.kt
+++ b/app/src/main/java/com/example/rehabilitation/SettingActivity.kt
@@ -28,8 +28,8 @@ class SettingActivity : AppCompatActivity() {
binding.btnExitSetting.setOnClickListener {
val intetn = Intent(this, MainActivity::class.java)
- finish()
startActivity(intetn)
+ finish()
}
binding.cvSettingUser.setOnClickListener{
@@ -68,8 +68,8 @@ class SettingActivity : AppCompatActivity() {
builder.setPositiveButton("Подтвердить") { dialogInterface, i ->
clearUserPatientToken()
val intetn = Intent(this, AuthorizationActivity::class.java)
- finish()
startActivity(intetn)
+ finish()
}
builder.show()
}
diff --git a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/ProgresFragment.kt b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/ProgresFragment.kt
index d98c21d..282188c 100644
--- a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/ProgresFragment.kt
+++ b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/ProgresFragment.kt
@@ -145,12 +145,12 @@ class ProgresFragment : Fragment(), ProgressAdapter.Listener {
Sport7Day = prefSport7Day?.getInt("s7d", 0)!!
- ActivityCompat.requestPermissions(
- requireActivity(), arrayOf(
- Manifest.permission.WRITE_EXTERNAL_STORAGE,
- Manifest.permission.READ_EXTERNAL_STORAGE
- ), PackageManager.PERMISSION_GRANTED
- )
+// ActivityCompat.requestPermissions(
+// requireActivity(), arrayOf(
+// Manifest.permission.WRITE_EXTERNAL_STORAGE,
+// Manifest.permission.READ_EXTERNAL_STORAGE
+// ), PackageManager.PERMISSION_GRANTED
+// )
liveDayListProgres()
@@ -215,7 +215,7 @@ class ProgresFragment : Fragment(), ProgressAdapter.Listener {
} else {
Toast(requireContext()).showCustomInfoToast(
- "Отчет можно отправлять при наличие 2 выполненных дней",
+ "Отчет можно отправить при наличие 2 выполненных дней",
requireActivity()
)
diff --git a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QAfterFragment.kt b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QAfterFragment.kt
index f655572..33c9edd 100644
--- a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QAfterFragment.kt
+++ b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QAfterFragment.kt
@@ -143,7 +143,7 @@ class QAfterFragment : Fragment() {
if(ten == "1"){
AlertDialog.Builder(requireContext())
.setTitle("Анкета")
- .setMessage("Вы уверенны в выбронных пунктах анкеты? Если вы нажмете 'Подтвердить' ваш курс временно заблакируется, чтобы вы не нанесли вред своему здоровью")
+ .setMessage("Уверены ли Вы в выбранных ответах на вопросы анкеты? Халатное отношение к вопросам анкеты приведет к блокировке комплекса")
.setNeutralButton("Подтвердить") { dialog, whichButton ->
addQuestionnaire()
}
diff --git a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QBeforeFragment.kt b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QBeforeFragment.kt
index 53bcf93..9727406 100644
--- a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QBeforeFragment.kt
+++ b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/QuestionnaireFragment/QBeforeFragment.kt
@@ -10,8 +10,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.asLiveData
import com.example.admin.Toast.showCustomInfoToast
import com.example.admin.Toast.showCustomNiceToast
import com.example.rehabilitation.Block
@@ -33,9 +31,7 @@ import com.example.rehabilitation.User.fragmentUser.SceduleFragment
import com.example.rehabilitation.databinding.FragmentQBeforeBinding
import com.example.rehabilitation.daySpoartOpen
import com.example.rehabilitation.daySpoartOpenKey
-import com.example.rehabilitation.model_adapter.Day.DayListModel
import com.example.rehabilitation.model_adapter.Questionnair.BeforeModel
-import com.example.rehabilitation.model_adapter.SportCategory.SportCategoryModel
import com.example.rehabilitation.prefBlock
import com.example.rehabilitation.prefCursDangerDayAfter
import com.example.rehabilitation.prefCursDangerDayBefore
@@ -50,15 +46,11 @@ import com.example.rehabilitation.prefSportPlusCount
import com.example.rehabilitation.questionnaire_after
//import com.example.rehabilitation.questionnaire
import com.example.rehabilitation.questionnaire_before
-import com.example.sqlitework.dip.MainViewModel
import java.time.LocalDate
class QBeforeFragment : Fragment() {
private lateinit var binding: FragmentQBeforeBinding
- private val model: MainViewModel by activityViewModels()//Инициализировали класс
-
-
var one = ""
var two = ""
var thee = ""
@@ -72,11 +64,8 @@ class QBeforeFragment : Fragment() {
var eleven = ""
var twelve = ""
- //Check для запуска считывания базы
- var CheckSportCategory = false
- //Количество упражнений
- var maxCountSC = 0
+
override fun onCreateView(
@@ -103,20 +92,17 @@ class QBeforeFragment : Fragment() {
SportCursDay = prefCursDay?.getInt("scd", 0)!!
//Какой сегодня курс
- prefSportCursDayNumber =
- activity?.getSharedPreferences("SportCursDayNumber", Context.MODE_PRIVATE)
+ prefSportCursDayNumber = activity?.getSharedPreferences("SportCursDayNumber", Context.MODE_PRIVATE)
SportCursDayNumber = prefSportCursDayNumber?.getInt("scdn", 0)!!
- prefCursDangerDayBefore =
- activity?.getSharedPreferences("CursDangerDayBefore", Context.MODE_PRIVATE)
+ prefCursDangerDayBefore = activity?.getSharedPreferences("CursDangerDayBefore", Context.MODE_PRIVATE)
SportCursDayDangerBefore = prefCursDangerDayBefore?.getInt("cddb", 0)!!
prefCursDayNull = activity?.getSharedPreferences("CursDayNull", Context.MODE_PRIVATE)
CursDayNull = prefCursDayNull?.getString("cdn", "")!!
- prefCursDangerDayAfter =
- activity?.getSharedPreferences("CursDangerDayAfter", Context.MODE_PRIVATE)
+ prefCursDangerDayAfter = activity?.getSharedPreferences("CursDangerDayAfter", Context.MODE_PRIVATE)
SportCursDayDangerAfter = prefCursDangerDayAfter?.getInt("cdda", 0)!!
//Для количества тренирвоок
@@ -128,7 +114,7 @@ class QBeforeFragment : Fragment() {
//Для пауз и блоков
prefPauseDay = activity?.getSharedPreferences("PauseDay", Context.MODE_PRIVATE)
- PauseDay = prefPauseDay?.getString("pd", "")!!
+ PauseDay= prefPauseDay?.getString("pd", "")!!
prefBlock = activity?.getSharedPreferences("Block", Context.MODE_PRIVATE)
Block = prefBlock?.getString("b", "")!!
@@ -148,16 +134,16 @@ class QBeforeFragment : Fragment() {
//Сохраняем результат
binding.btnSaveQuestionnaire.setOnClickListener {
- Log.d("lookDanger", "lookDanger")
- Log.d("SportCursDayDangerAfter", "${SportCursDayDangerAfter}")
- Log.d("SportCursDay", "${SportCursDay}")
- Log.d("SportCursDayDangerBefore", "${SportCursDayDangerBefore}")
- Log.d("btnSaveQuestionnaire", "btnSaveQuestionnaire")
+ Log.d("lookDanger","lookDanger")
+ Log.d("SportCursDayDangerAfter","${SportCursDayDangerAfter}")
+ Log.d("SportCursDay","${SportCursDay}")
+ Log.d("SportCursDayDangerBefore","${SportCursDayDangerBefore}")
+ Log.d("btnSaveQuestionnaire","btnSaveQuestionnaire")
if (one != "" && two != "" && thee != "" && four != "" && five != "" && six != "" && seven != "" && eight != "" && nine != "") {
- if (one >= "6") {
+ if(one >= "6") {
AlertDialog.Builder(requireContext())
.setTitle("Анкета")
- .setMessage("Вы уверенны в выбронных пунктах анкеты? Если вы нажмете 'Подтвердить' ваш курс временно заблакируется, чтобы вы не нанесли вред своему здоровью")
+ .setMessage("Уверены ли Вы в выбранных ответах на вопросы анкеты? Халатное отношение к вопросам анкеты приведет к блокировке комплекса")
.setNeutralButton("Подтвердить") { dialog, whichButton ->
addQuestionnaire()
}
@@ -165,7 +151,8 @@ class QBeforeFragment : Fragment() {
}
.show()
- } else {
+ }
+ else{
addQuestionnaire()
}
@@ -179,137 +166,165 @@ class QBeforeFragment : Fragment() {
}
- //Получение данных по курсу
- liveCountSportCategoryCurrent()
- liveSportCategoryAllArticleList()
+
}
//Функция
- fun addQuestionnaire() {
+ fun addQuestionnaire(){
visibleLoad()
clearSportPlusCount()
clearSportMaxCount()
- if (one >= "6") {
+ if(one >= "6"){
saveBlock(LocalDate.now().plusDays(3).toString())
saveSportCursDayDangerBefore(2)
addQuestianBefore()
- activity?.supportFragmentManager?.beginTransaction()
- ?.replace(R.id.placeHolderFragment, SceduleFragment.newInstance())?.commit()
- } else if (four == "1" || five == "1" || six == "1" || seven == "1" || nine == "1") {
+ activity?.supportFragmentManager?.beginTransaction()?.replace(R.id.placeHolderFragment, SceduleFragment.newInstance())?.commit()
+ }
+ else if (four == "1" || five == "1" || six == "1"|| seven == "1"||nine == "1") {
savePauseDay(LocalDate.now().plusDays(1).toString())
saveSportCursDayDangerBefore(1)
addQuestianBefore()
- activity?.supportFragmentManager?.beginTransaction()
- ?.replace(R.id.placeHolderFragment, SceduleFragment.newInstance())?.commit()
- } else {//Если все хорошо
- if (SportCursDayDangerBefore == 0 && SportCursDayDangerAfter == 0) {
- Log.i("SportCursDay", "${SportCursDay}")
- Log.i("SportCursDayNumber", "${SportCursDayNumber}")
+ activity?.supportFragmentManager?.beginTransaction()?.replace(R.id.placeHolderFragment, SceduleFragment.newInstance())?.commit()
+ }
+ else {//Если все хорошо
+ if(SportCursDayDangerBefore == 0 && SportCursDayDangerAfter == 0){
+ Log.i("SportCursDay","${SportCursDay}")
+ Log.i("SportCursDayNumber","${SportCursDayNumber}")
- saveCursDayNumber(SportCursDayNumber + 1)
- saveSportCursDay(SportCursDay + 1)
+ saveCursDayNumber(SportCursDayNumber+1)
+ saveSportCursDay(SportCursDay+1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayDangerBefore == 2 || SportCursDayDangerAfter == 2) {
- saveSportCursDay(SportCursDay + 1)
- Log.i("SportCursDay", "${SportCursDay}")
- Log.i("SportCursDayNumber", "${SportCursDayNumber}")
- if (SportCursDayNumber == 0) {
+ }
+ else if(SportCursDayDangerBefore == 2 || SportCursDayDangerAfter == 2 ){
+ saveSportCursDay(SportCursDay+1)
+ Log.i("SportCursDay","${SportCursDay}")
+ Log.i("SportCursDayNumber","${SportCursDayNumber}")
+ if(SportCursDayNumber == 0){
addDaySport(1)
- saveCursDayNumber(SportCursDayNumber + 1)
- } else if (SportCursDayNumber == 1) {
+ saveCursDayNumber(SportCursDayNumber+1)
+ }
+ else if(SportCursDayNumber==1){
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 2) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==2){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 3) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==3){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 4) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==4){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 5) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==5){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 6) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==6){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 7) {
- saveCursDayNumber(SportCursDayNumber - 1)
- addDaySport(6)
- } else if (SportCursDayNumber == 8) {
- saveCursDayNumber(SportCursDayNumber - 1)
- addDaySport(6)
- } else if (SportCursDayNumber == 9) {
- saveCursDayNumber(SportCursDayNumber - 1)
- addDaySport(6)
- } else if (SportCursDayNumber == 10) {
- saveCursDayNumber(SportCursDayNumber - 1)
- addDaySport(6)
- } else if (SportCursDayNumber == 11) {
- saveCursDayNumber(SportCursDayNumber - 1)
- addDaySport(6)
- } else if (SportCursDayNumber == 12) {
- saveCursDayNumber(SportCursDayNumber - 1)
- addDaySport(6)
- } else if (SportCursDayNumber == 13) {
- saveCursDayNumber(SportCursDayNumber - 1)
- addDaySport(6)
- } else if (SportCursDayNumber == 14) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==7){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
}
- } else if (SportCursDayDangerBefore == 1 || SportCursDayDangerAfter == 1) {
- Log.i("SportCursDayDangerBefore1", "${SportCursDayDangerBefore}")
- Log.i("SportCursDayDangerAfter1", "${SportCursDayDangerAfter}")
+ else if(SportCursDayNumber==8){
+ saveCursDayNumber(SportCursDayNumber-1)
+ addDaySport(6)
+ }
+ else if(SportCursDayNumber==9){
+ saveCursDayNumber(SportCursDayNumber-1)
+ addDaySport(6)
+ }
+ else if(SportCursDayNumber==10){
+ saveCursDayNumber(SportCursDayNumber-1)
+ addDaySport(6)
+ }
+ else if(SportCursDayNumber==11){
+ saveCursDayNumber(SportCursDayNumber-1)
+ addDaySport(6)
+ }
+ else if(SportCursDayNumber==12){
+ saveCursDayNumber(SportCursDayNumber-1)
+ addDaySport(6)
+ }
+ else if(SportCursDayNumber==13){
+ saveCursDayNumber(SportCursDayNumber-1)
+ addDaySport(6)
+ }
+ else if(SportCursDayNumber==14){
+ saveCursDayNumber(SportCursDayNumber-1)
+ addDaySport(6)
+ }
+ }
+ else if(SportCursDayDangerBefore == 1 || SportCursDayDangerAfter == 1 ){
+ Log.i("SportCursDayDangerBefore1","${SportCursDayDangerBefore}")
+ Log.i("SportCursDayDangerAfter1","${SportCursDayDangerAfter}")
- saveSportCursDay(SportCursDay + 1)
- Log.i("SportCursDay", "${SportCursDay}")
- Log.i("SportCursDayNumber", "${SportCursDayNumber}")
- if (SportCursDayNumber == 0) {
+ saveSportCursDay(SportCursDay+1)
+ Log.i("SportCursDay","${SportCursDay}")
+ Log.i("SportCursDayNumber","${SportCursDayNumber}")
+ if(SportCursDayNumber == 0){
addDaySport(1)
- saveCursDayNumber(SportCursDayNumber + 1)
- } else if (SportCursDayNumber == 1) {
+ saveCursDayNumber(SportCursDayNumber+1)
+ }
+ else if(SportCursDayNumber==1){
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 2) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==2){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 3) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==3){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 4) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==4){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 5) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==5){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 6) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==6){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(SportCursDayNumber)
- } else if (SportCursDayNumber == 7) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==7){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
- } else if (SportCursDayNumber == 8) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==8){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
- } else if (SportCursDayNumber == 9) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==9){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
- } else if (SportCursDayNumber == 10) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==10){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
- } else if (SportCursDayNumber == 11) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==11){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
- } else if (SportCursDayNumber == 12) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==12){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
- } else if (SportCursDayNumber == 13) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==13){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
- } else if (SportCursDayNumber == 14) {
- saveCursDayNumber(SportCursDayNumber - 1)
+ }
+ else if(SportCursDayNumber==14){
+ saveCursDayNumber(SportCursDayNumber-1)
addDaySport(6)
}
@@ -320,17 +335,17 @@ class QBeforeFragment : Fragment() {
}
- fun visibleLoad() {
+ fun visibleLoad(){
binding.CLMainBefore.visibility = View.GONE
binding.CLLoad.visibility = View.VISIBLE
}
-
- fun visibleBefore() {
+ fun visibleBefore(){
binding.CLMainBefore.visibility = View.VISIBLE
binding.CLLoad.visibility = View.GONE
}
- fun lookDanger() {
+ fun lookDanger(){
+
if (SportCursDayDangerBefore == 1) {
@@ -341,9 +356,11 @@ class QBeforeFragment : Fragment() {
} else if (SportCursDay in 8..15) {
addDaySport(6)
}
- } else if (SportCursDayDangerAfter == 0 && SportCursDayDangerBefore == 0) {
+ }
+ else if(SportCursDayDangerAfter == 0 && SportCursDayDangerBefore == 0) {
addDaySport(SportCursDay)
- } else if (SportCursDayDangerAfter == 2) {
+ }
+ else if (SportCursDayDangerAfter == 2) {
Toast(requireContext()).showCustomInfoToast("Обратитесь к врачу", requireActivity())
addQuestianBefore()
}
@@ -351,593 +368,203 @@ class QBeforeFragment : Fragment() {
}
+
//Вызываем нужное заполнение данных
- fun addDaySport(DaySport: Int) {
- Log.d("addDaySport", "${DaySport}")
- when (DaySport) {
- 1 -> addSportCyrs1()
- 2 -> addSportCyrs2()
- 3 -> addSportCyrs3()
- 4 -> addSportCyrs4()
- 5 -> addSportCyrs5()
- 6 -> addSportCyrs6()
- 7 -> addSportCyrs7()
- 8 -> addSportCyrs7()
- 9 -> addSportCyrs7()
- 10 -> addSportCyrs7()
- 11 -> addSportCyrs7()
- 12 -> addSportCyrs7()
- 13 -> addSportCyrs7()
- 14 -> addSportCyrs7()
- 15 -> addSportCyrs7()
- }
- }
-
- //Вывод прогресса на один день
- private fun liveCountSportCategoryCurrent() = with(binding) {
- if (CheckSportCategory == true) {
- model.liveCountSportCategoryCurrent.observe(viewLifecycleOwner) {//viewLifecycleOwner - следит за циклом жизни fragment
- maxCountSC = it.name.toInt()//КОличество активированных упражнений
-
- val db = MainDB.getDB(requireContext())
- val list = ArrayList()
- db.getDaoSportCategory().getCountSportCategory(it.article).asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- list.add(itemSportCategory)//Передали заполненый список
-
- }
- model.liveSportCategoryAllArticleList.value = list
- Log.d("sadas", list.toString())
- }
-
- }
- }
- }
-
- //Вывод прогресса на один день
- private fun liveSportCategoryAllArticleList() = with(binding) {
- val db = MainDB.getDB(requireContext())
- if (CheckSportCategory == true) {
- model.liveSportCategoryAllArticleList.observe(viewLifecycleOwner) {//viewLifecycleOwner - следит за циклом жизни fragment
- for (j in 0..maxCountSC-1) {
- val item = ItemDaySport(
- null,
- LocalDate.now().toString(),
- it[j].category,
- 0,
- 1
- )
- Thread {
- db.getDaoDaySport().insertItemDaySport(item)
- }.start()
- }
- saveCursDayNull(LocalDate.now().toString())
- saveSportPlusCount(0)
- saveSportMaxCount(maxCountSC)
- clearDayAfter()
- clearSportCursDayDangerBefore()
- clearSportCursDayDangerAfter()
- addQuestianBefore()
- CheckSportCategory = false
- }
+ fun addDaySport(DaySport:Int) {
+ Log.d("addDaySport","${DaySport}")
+ when(DaySport) {
+ 1->addSportCyrs1()
+ 2->addSportCyrs2()
+ 3->addSportCyrs3()
+ 4->addSportCyrs4()
+ 5->addSportCyrs5()
+ 6->addSportCyrs6()
+ 7->addSportCyrs7()
+ 8->addSportCyrs7()
+ 9->addSportCyrs7()
+ 10->addSportCyrs7()
+ 11->addSportCyrs7()
+ 12->addSportCyrs7()
+ 13->addSportCyrs7()
+ 14->addSportCyrs7()
+ 15->addSportCyrs7()
}
}
private fun addSportCyrs1() {
- CheckSportCategory = true //Активируем получение данных
- Log.d("addSportCyrs1", "addSportCyrs1")
+ Log.d("addSportCyrs1","addSportCyrs1")
val db = MainDB.getDB(requireContext())
- db.getDaoSportCategory().getCountSportCategory("1cbjSport07082003").asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- model.liveCountSportCategoryCurrent.value = itemSportCategory
- }
-
- }
-
-// val arr1 = arrayOf("c1","c2","c3","c4","c8","c10","c14","c16","c15","c7","b1","b2","b3","j1","j2","j4","j3","j5","j6","j8")
-// val max = 19
-// for (j in 0..max) {
-// val item = ItemDaySport(
-// null,
-// LocalDate.now().toString(),
-// arr1[j],
-// 0,
-// 1
-// )
-// Thread {
-// db.getDaoDaySport().insertItemDaySport(item)
-// }.start()
-// }
-// saveCursDayNull(LocalDate.now().toString())
-// saveSportPlusCount(0)
-// saveSportMaxCount(max+1)
-// clearDayAfter()
-// clearSportCursDayDangerBefore()
-// clearSportCursDayDangerAfter()
-// addQuestianBefore()
+ val arr1 = arrayOf("c1","c2","c3","c4","c8","c10","c14","c16","c15","c7","b1","b2","b3","j1","j2","j4","j3","j5","j6","j8")
+ val max = 19
+ for (j in 0..max) {
+ val item = ItemDaySport(
+ null,
+ LocalDate.now().toString(),
+ arr1[j],
+ 0,
+ 1
+ )
+ Thread {
+ db.getDaoDaySport().insertItemDaySport(item)
+ }.start()
+ }
+ saveCursDayNull(LocalDate.now().toString())
+ saveSportPlusCount(0)
+ saveSportMaxCount(max+1)
+ clearDayAfter()
+ clearSportCursDayDangerBefore()
+ clearSportCursDayDangerAfter()
+ addQuestianBefore()
}
-
private fun addSportCyrs2() {
- CheckSportCategory = true //Активируем получение данных
- Log.d("addSportCyrs2", "addSportCyrs2")
val db = MainDB.getDB(requireContext())
- db.getDaoSportCategory().getCountSportCategory("2cbjSport07082003").asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- model.liveCountSportCategoryCurrent.value = itemSportCategory
- }
- }
-// val db = MainDB.getDB(requireContext())
-//
-// val arr2 = arrayOf(
-// "c1",
-// "c2",
-// "c3",
-// "c4",
-// "c8",
-// "c9",
-// "c5",
-// "c10",
-// "c14",
-// "c16",
-// "c15",
-// "c12",
-// "c7",
-// "b1",
-// "b2",
-// "b3",
-// "j1",
-// "j2",
-// "j4",
-// "j3",
-// "j5",
-// "j6",
-// "j8"
-// )
-// val max = 22
-// for (j in 0..max) {
-// val item = ItemDaySport(
-// null,
-// LocalDate.now().toString(),
-// arr2[j],
-// 0,
-// 1
-// )
-// Thread {
-// db.getDaoDaySport().insertItemDaySport(item)
-// }.start()
-// }
-// saveCursDayNull(LocalDate.now().toString())
-// saveSportPlusCount(0)
-// saveSportMaxCount(max + 1)
-// clearDayAfter()
-// clearSportCursDayDangerBefore()
-// clearSportCursDayDangerAfter()
-// addQuestianBefore()
+ val arr2 = arrayOf("c1","c2","c3","c4","c8","c9","c5","c10","c14","c16","c15","c12","c7","b1","b2","b3","j1","j2","j4","j3","j5","j6","j8")
+ val max = 22
+ for (j in 0..max) {
+ val item = ItemDaySport(
+ null,
+ LocalDate.now().toString(),
+ arr2[j],
+ 0,
+ 1
+ )
+ Thread {
+ db.getDaoDaySport().insertItemDaySport(item)
+ }.start()
+ }
+ saveCursDayNull(LocalDate.now().toString())
+ saveSportPlusCount(0)
+ saveSportMaxCount(max+1)
+ clearDayAfter()
+ clearSportCursDayDangerBefore()
+ clearSportCursDayDangerAfter()
+ addQuestianBefore()
}
private fun addSportCyrs3() {
- CheckSportCategory = true //Активируем получение данных
- Log.d("addSportCyrs3", "addSportCyrs3")
val db = MainDB.getDB(requireContext())
- db.getDaoSportCategory().getCountSportCategory("3cbjSport07082003").asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- model.liveCountSportCategoryCurrent.value = itemSportCategory
- }
-
- }
-// val db = MainDB.getDB(requireContext())
-// val arr3 = arrayOf(
-// "c1",
-// "c2",
-// "c3",
-// "c4",
-// "c8",
-// "c9",
-// "c5",
-// "c6",
-// "c14",
-// "c16",
-// "c15",
-// "c12",
-// "c13",
-// "c10",
-// "c7",
-// "b1",
-// "b2",
-// "b3",
-// "j1",
-// "j2",
-// "j4",
-// "j3",
-// "j5",
-// "j6",
-// "j8"
-// )
-// val max = 24
-// for (j in 0..max) {
-// val item = ItemDaySport(
-// null,
-// LocalDate.now().toString(),
-// arr3[j],
-// 0,
-// 1
-// )
-// Thread {
-// db.getDaoDaySport().insertItemDaySport(item)
-// }.start()
-// }
-// saveCursDayNull(LocalDate.now().toString())
-// saveSportPlusCount(0)
-// saveSportMaxCount(max + 1)
-// clearDayAfter()
-// clearSportCursDayDangerBefore()
-// clearSportCursDayDangerAfter()
-// addQuestianBefore()
+ val arr3 = arrayOf("c1","c2","c3","c4","c8","c9","c5","c6","c14","c16","c15","c12","c13","c10","c7","b1","b2","b3","j1","j2","j4","j3","j5","j6","j8")
+ val max = 24
+ for (j in 0..max) {
+ val item = ItemDaySport(
+ null,
+ LocalDate.now().toString(),
+ arr3[j],
+ 0,
+ 1
+ )
+ Thread {
+ db.getDaoDaySport().insertItemDaySport(item)
+ }.start()
+ }
+ saveCursDayNull(LocalDate.now().toString())
+ saveSportPlusCount(0)
+ saveSportMaxCount(max+1)
+ clearDayAfter()
+ clearSportCursDayDangerBefore()
+ clearSportCursDayDangerAfter()
+ addQuestianBefore()
}
private fun addSportCyrs4() {
- CheckSportCategory = true //Активируем получение данных
- Log.d("addSportCyrs4", "addSportCyrs4")
val db = MainDB.getDB(requireContext())
- db.getDaoSportCategory().getCountSportCategory("4cbjSport07082003").asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- model.liveCountSportCategoryCurrent.value = itemSportCategory
- }
-
- }
-// val db = MainDB.getDB(requireContext())
-// val arr4 = arrayOf(
-// "c1",
-// "c2",
-// "c3",
-// "c4",
-// "c8",
-// "c9",
-// "c5",
-// "c6",
-// "c14",
-// "c16",
-// "c17",
-// "c18",
-// "c15",
-// "c12",
-// "c13",
-// "c10",
-// "c7",
-// "b1",
-// "b2",
-// "b3",
-// "j1",
-// "j2",
-// "j4",
-// "j3",
-// "j5",
-// "j6",
-// "j8"
-// )
-// val max = 26
-// for (j in 0..max) {
-// val item = ItemDaySport(
-// null,
-// LocalDate.now().toString(),
-// arr4[j],
-// 0,
-// 1
-// )
-// Thread {
-// db.getDaoDaySport().insertItemDaySport(item)
-// }.start()
-// }
-// saveCursDayNull(LocalDate.now().toString())
-// saveSportPlusCount(0)
-// saveSportMaxCount(max + 1)
-// clearDayAfter()
-// clearSportCursDayDangerBefore()
-// clearSportCursDayDangerAfter()
-// addQuestianBefore()
+ val arr4 = arrayOf("c1","c2","c3","c4","c8","c9","c5","c6","c14","c16","c17","c18","c15","c12","c13","c10","c7","b1","b2","b3","j1","j2","j4","j3","j5","j6","j8")
+ val max = 26
+ for (j in 0..max) {
+ val item = ItemDaySport(
+ null,
+ LocalDate.now().toString(),
+ arr4[j],
+ 0,
+ 1
+ )
+ Thread {
+ db.getDaoDaySport().insertItemDaySport(item)
+ }.start()
+ }
+ saveCursDayNull(LocalDate.now().toString())
+ saveSportPlusCount(0)
+ saveSportMaxCount(max+1)
+ clearDayAfter()
+ clearSportCursDayDangerBefore()
+ clearSportCursDayDangerAfter()
+ addQuestianBefore()
}
private fun addSportCyrs5() {
- CheckSportCategory = true //Активируем получение данных
- Log.d("addSportCyrs5", "addSportCyrs5")
val db = MainDB.getDB(requireContext())
- db.getDaoSportCategory().getCountSportCategory("5cbjSport07082003").asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- model.liveCountSportCategoryCurrent.value = itemSportCategory
- }
-
- }
-// val db = MainDB.getDB(requireContext())
-// val arr5 = arrayOf(
-// "c1",
-// "c2",
-// "c3",
-// "c4",
-// "c8",
-// "c9",
-// "c5",
-// "c6",
-// "c14",
-// "c16",
-// "c17",
-// "c18",
-// "c15",
-// "c12",
-// "c13",
-// "c10",
-// "c7",
-// "b1",
-// "b2",
-// "b3",
-// "b4",
-// "j1",
-// "j2",
-// "j4",
-// "j3",
-// "j5",
-// "j6",
-// "j8",
-// "j9"
-// )
-// val max = 28
-// for (j in 0..max) {
-// val item = ItemDaySport(
-// null,
-// LocalDate.now().toString(),
-// arr5[j],
-// 0,
-// 1
-// )
-// Thread {
-// db.getDaoDaySport().insertItemDaySport(item)
-// }.start()
-// }
-// saveCursDayNull(LocalDate.now().toString())
-// saveSportPlusCount(0)
-// saveSportMaxCount(max + 1)
-// clearDayAfter()
-// clearSportCursDayDangerBefore()
-// clearSportCursDayDangerAfter()
-// addQuestianBefore()
+ val arr5 = arrayOf("c1","c2","c3","c4","c8","c9","c5","c6","c14","c16","c17","c18","c15","c12","c13","c10","c7","b1","b2","b3","b4","j1","j2","j4","j3","j5","j6","j8","j9")
+ val max = 28
+ for (j in 0..max) {
+ val item = ItemDaySport(
+ null,
+ LocalDate.now().toString(),
+ arr5[j],
+ 0,
+ 1
+ )
+ Thread {
+ db.getDaoDaySport().insertItemDaySport(item)
+ }.start()
+ }
+ saveCursDayNull(LocalDate.now().toString())
+ saveSportPlusCount(0)
+ saveSportMaxCount(max+1)
+ clearDayAfter()
+ clearSportCursDayDangerBefore()
+ clearSportCursDayDangerAfter()
+ addQuestianBefore()
}
private fun addSportCyrs6() {
- CheckSportCategory = true //Активируем получение данных
- Log.d("addSportCyrs6", "addSportCyrs6")
val db = MainDB.getDB(requireContext())
- db.getDaoSportCategory().getCountSportCategory("6cbjSport07082003").asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- model.liveCountSportCategoryCurrent.value = itemSportCategory
- }
-
- }
-// val db = MainDB.getDB(requireContext())
-// val arr6 = arrayOf(
-// "c1",
-// "c2",
-// "c3",
-// "c4",
-// "c8",
-// "c9",
-// "c5",
-// "c6",
-// "c14",
-// "c16",
-// "c17",
-// "c18",
-// "c15",
-// "c12",
-// "c13",
-// "c10",
-// "c7",
-// "b1",
-// "b2",
-// "b3",
-// "b4",
-// "j1",
-// "j2",
-// "j4",
-// "j3",
-// "j5",
-// "j6",
-// "j8",
-// "j10",
-// "j9"
-// )
-// val max = 29
-// for (j in 0..max) {
-// val item = ItemDaySport(
-// null,
-// LocalDate.now().toString(),
-// arr6[j],
-// 0,
-// 1
-// )
-// Thread {
-// db.getDaoDaySport().insertItemDaySport(item)
-// }.start()
-// }
-// saveCursDayNull(LocalDate.now().toString())
-// saveSportPlusCount(0)
-// saveSportMaxCount(max + 1)
-// clearDayAfter()
-// clearSportCursDayDangerBefore()
-// clearSportCursDayDangerAfter()
-// addQuestianBefore()
+ val arr6 = arrayOf("c1","c2","c3","c4","c8","c9","c5","c6","c14","c16","c17","c18","c15","c12","c13","c10","c7","b1","b2","b3","b4","j1","j2","j4","j3","j5","j6","j8","j10","j9")
+ val max = 29
+ for (j in 0..max) {
+ val item = ItemDaySport(
+ null,
+ LocalDate.now().toString(),
+ arr6[j],
+ 0,
+ 1
+ )
+ Thread {
+ db.getDaoDaySport().insertItemDaySport(item)
+ }.start()
+ }
+ saveCursDayNull(LocalDate.now().toString())
+ saveSportPlusCount(0)
+ saveSportMaxCount(max+1)
+ clearDayAfter()
+ clearSportCursDayDangerBefore()
+ clearSportCursDayDangerAfter()
+ addQuestianBefore()
}
private fun addSportCyrs7() {
- CheckSportCategory = true //Активируем получение данных
- Log.d("addSportCyrs7", "addSportCyrs7")
val db = MainDB.getDB(requireContext())
- db.getDaoSportCategory().getCountSportCategory("7cbjSport07082003").asLiveData()
- .observe(requireActivity()) { itList ->
- var number = 1;
- itList.forEach {
- Log.d("123", it.category)
- val itemSportCategory = SportCategoryModel(
- it.id.toString(),
- it.name,
- it.desc,
- it.count,
- it.image,
- it.category,
- it.article,
- it.check
- )
- model.liveCountSportCategoryCurrent.value = itemSportCategory
- }
-
- }
-// val db = MainDB.getDB(requireContext())
-//
-//
-// val arr7 = arrayOf(
-// "c1",
-// "c2",
-// "c3",
-// "c4",
-// "c8",
-// "c9",
-// "c5",
-// "c6",
-// "c7",
-// "c10",
-// "c14",
-// "c16",
-// "c17",
-// "c18",
-// "c15",
-// "c12",
-// "c13",
-// "c11",
-// "b1",
-// "b2",
-// "b3",
-// "b4",
-// "j1",
-// "j2",
-// "j4",
-// "j3",
-// "j5",
-// "j6",
-// "j7",
-// "j8",
-// "j10",
-// "j9"
-// )
-// val max = 31
-// for (j in 0..max) {
-// val item = ItemDaySport(
-// null,
-// LocalDate.now().toString(),
-// arr7[j],
-// 0,
-// 1
-// )
-// Thread {
-// db.getDaoDaySport().insertItemDaySport(item)
-// }.start()
-// }
-// saveCursDayNull(LocalDate.now().toString())
-// saveSportPlusCount(0)
-// saveSportMaxCount(max + 1)
-// clearDayAfter()
-// clearSportCursDayDangerBefore()
-// clearSportCursDayDangerAfter()
-// addQuestianBefore()
+ val arr7 = arrayOf("c1","c2","c3","c4","c8","c9","c5","c6","c7","c10","c14","c16","c17","c18","c15","c12","c13","c11","b1","b2","b3","b4","j1","j2","j4","j3","j5","j6","j7","j8","j10","j9")
+ val max = 31
+ for (j in 0..max) {
+ val item = ItemDaySport(
+ null,
+ LocalDate.now().toString(),
+ arr7[j],
+ 0,
+ 1
+ )
+ Thread {
+ db.getDaoDaySport().insertItemDaySport(item)
+ }.start()
+ }
+ saveCursDayNull(LocalDate.now().toString())
+ saveSportPlusCount(0)
+ saveSportMaxCount(max+1)
+ clearDayAfter()
+ clearSportCursDayDangerBefore()
+ clearSportCursDayDangerAfter()
+ addQuestianBefore()
}
fun saveCursDayNull(cdn: String) {
@@ -946,7 +573,6 @@ class QBeforeFragment : Fragment() {
edit?.apply()
CursDayNull = cdn
}
-
fun clearCursDayNull() {
val edit = prefCursDayNull?.edit()
edit?.clear()
@@ -954,7 +580,7 @@ class QBeforeFragment : Fragment() {
CursDayNull = ""
}
- fun addQuestianBefore() {
+ fun addQuestianBefore(){
val db = MainDB.getDB(requireContext())
val item = ItemBeforeQuestionnaire(
@@ -988,7 +614,6 @@ class QBeforeFragment : Fragment() {
edit?.apply()
SportCursDayNumber = scdn
}
-
fun clearCursDayNumber() {
val edit = prefSportCursDayNumber?.edit()
edit?.clear()
@@ -1002,7 +627,6 @@ class QBeforeFragment : Fragment() {
edit?.apply()
DayBefore = db
}
-
fun clearDayBefore() {
val edit = prefDayBefore?.edit()
edit?.clear()
@@ -1016,7 +640,6 @@ class QBeforeFragment : Fragment() {
edit?.apply()
DayAfter = da
}
-
fun clearDayAfter() {
val edit = prefDayAfter?.edit()
edit?.clear()
@@ -1030,7 +653,6 @@ class QBeforeFragment : Fragment() {
edit?.apply()
PauseDay = pd
}
-
fun clearPauseDay() {
val edit = prefPauseDay?.edit()
edit?.clear()
@@ -1044,7 +666,6 @@ class QBeforeFragment : Fragment() {
edit?.apply()
Block = b
}
-
fun clearBlock() {
val edit = prefBlock?.edit()
edit?.clear()
@@ -1059,7 +680,6 @@ class QBeforeFragment : Fragment() {
edit?.apply()
SportPlusCount = spc
}
-
fun clearSportPlusCount() {
val edit = prefSportPlusCount?.edit()
edit?.clear()
@@ -1083,6 +703,8 @@ class QBeforeFragment : Fragment() {
}
+
+
fun saveSportCursDay(scd: Int) {
val edit = prefCursDay?.edit()
edit?.putInt("scd", scd)
diff --git a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/SceduleFragment.kt b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/SceduleFragment.kt
index dae294f..acc5314 100644
--- a/app/src/main/java/com/example/rehabilitation/User/fragmentUser/SceduleFragment.kt
+++ b/app/src/main/java/com/example/rehabilitation/User/fragmentUser/SceduleFragment.kt
@@ -452,8 +452,8 @@ class SceduleFragment(/*var taskItem: TaskItem?*/) : Fragment()/*, MonthAdapter.
Log.i("time","${time}")
//Если это сегодняшнее упражнение
if((item.number.toInt() == (SportPlusCount+1))|| (item.number.toInt() < (SportPlusCount+1))) {
- times = time.toInt()
- if(times ==0 || times == 1000){
+// times = time.toInt()
+// if(times ==0 || times == 1000){
binding.LoadImage.visibility = View.VISIBLE
liveReadOrderDayCurrent()
@@ -481,10 +481,10 @@ class SceduleFragment(/*var taskItem: TaskItem?*/) : Fragment()/*, MonthAdapter.
Toast(requireContext()).showCustomInfoToast("Пауза в 1 минуту", requireActivity())
}
- }
- else{
- Toast(requireContext()).showCustomInfoToast("Сначало выполните ${SportPlusCount+1} упражнение", requireActivity())
- }
+// }
+// else{
+// Toast(requireContext()).showCustomInfoToast("Сначало выполните ${SportPlusCount+1} упражнение", requireActivity())
+// }
}
@@ -532,17 +532,17 @@ class SceduleFragment(/*var taskItem: TaskItem?*/) : Fragment()/*, MonthAdapter.
Log.i("SportPlusCount","${SportPlusCount}")
Log.i("SportMaxCount","${SportMaxCount}")
Log.i("SportCursDay","${SportCursDay}")
- val timer = object: CountDownTimer(60000, 1000) {
- override fun onTick(millisUntilFinished: Long) {
- time = millisUntilFinished
- Log.i("asad3444a","${time}")
- }
-
- override fun onFinish() {
- time = 0
- }
- }
- timer.start()
+// val timer = object: CountDownTimer(60000, 1000) {
+// override fun onTick(millisUntilFinished: Long) {
+// time = millisUntilFinished
+// Log.i("asad3444a","${time}")
+// }
+//
+// override fun onFinish() {
+// time = 0
+// }
+// }
+// timer.start()
}
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index 1f8ff74..b6f5bac 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -23,7 +23,8 @@
app:layout_constraintBottom_toTopOf="@+id/textView34"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textView32">
+ app:layout_constraintTop_toBottomOf="@+id/textView32"
+ tools:ignore="NotSibling">
@@ -191,14 +191,14 @@
@@ -388,6 +390,16 @@
+
+
@@ -404,7 +416,8 @@
app:cardMaxElevation="20dp"
app:layout_constraintEnd_toEndOf="@+id/btnPatient"
app:layout_constraintStart_toStartOf="@+id/btnPatient"
- app:layout_constraintTop_toBottomOf="@+id/btnPatient">
+ app:layout_constraintTop_toBottomOf="@+id/btnPatient"
+ tools:ignore="NotSibling">
+ app:layout_constraintTop_toBottomOf="@+id/textView22"
+ tools:ignore="NotSibling">
+ android:layout_height="wrap_content"
+ tools:ignore="MissingConstraints" />
@@ -375,7 +375,7 @@
android:gravity="center"
android:text="00.00.0000"
android:textColor="#000000"
- android:textSize="20sp"
+ android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7c1978..511597f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
- Rehabilitation
+ ВМедA.Реабилитация
Hello blank fragment
Заголовок
Пока тут пусто
diff --git a/settings.gradle b/settings.gradle
index aba2565..eca12d4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,5 +17,5 @@ dependencyResolutionManagement {
}
}
-rootProject.name = "Rehabilitation"
+rootProject.name = "Реабилитация"
include ':app'