Merge pull request #124 from stdimensiy/develop

Изм 2.1.0 Complex redesign APP

Author: stdimensiy

app/build.gradle

@@ -34,6 +34,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'ru.vdv.myapp.myreadersdiary'
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="ru.vdv.myapp.myreadersdiary">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/ru/vdv/myapp/myreadersdiary/model/repository/Repository.kt

@@ -8,7 +8,9 @@ interface Repository {
     fun getClearSummaryEventData(startData: Date, callBack: CallBack<List<WeekEvent>>)
     fun getRandomSummaryEventData(startData: Date, callBack: CallBack<List<WeekEvent>>)
     fun getListOfBooks(callBack: CallBack<List<Book>>)
+    //модуль USER
     fun getUserInfo(userLogin: String, callBack: CallBack<User>)
+
     fun postBook(callBack: CallBack<Any>)
     fun patchBook(callBack: CallBack<Any>)
     fun deleteBook(callBack: CallBack<Any>)

app/src/main/java/ru/vdv/myapp/myreadersdiary/ui/main/MainFragment.kt

@@ -64,7 +64,8 @@ class MainFragment : BaseFragment<MainFragmentBinding>() {
         viewModel.currentUser.observe(viewLifecycleOwner, Observer {
             if (it == null) {
                 Log.d(TAG, "Пользователь НЕ определен!")
-                bottomAppBar.replaceMenu(R.menu.bottom_app_bar_main_for_user_not_authorized)
+                //bottomAppBar.replaceMenu(R.menu.bottom_app_bar_main_for_user_not_authorized)
+                bottomAppBar.replaceMenu(R.menu.bottom_app_bar_main)
             } else {
                 bottomAppBar.replaceMenu(R.menu.bottom_app_bar_main)
                 Log.d(TAG, "Пользователь определен: ${it.name}")

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
+        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -18,4 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Oct 23 21:44:59 MSK 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME