diff --git a/.idea/misc.xml b/.idea/misc.xml
index 75ced089ede07afcea1139e518741714ef0bf4aa..f9bd7ec84cacbcdf6958f210d1d8e751afeb4028 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -47,7 +47,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 85657228863064bd8cc5ea3fa4ddc174efc91292..51dd3c295d8f677781cf066465b568c11e449030 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,17 +1,16 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'androidx.navigation.safeargs'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "jp.atled.agileworks"
         minSdkVersion 24
-        targetSdk 33
+        targetSdk 34
         versionCode 3
         versionName "1.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,19 +24,22 @@ android {
     }
     buildFeatures {
         dataBinding = true
+        viewBinding = true
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
-    buildToolsVersion = '29.0.2'
+    buildToolsVersion = '34.0.0'
 
     dataBinding {
         enabled = true
     }
+
+    namespace "jp.atled.agileworks"
 }
 
 dependencies {
@@ -47,6 +49,10 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
 
+    def lifecycle_version = "2.4.0" 
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
@@ -81,7 +87,7 @@ dependencies {
 
     implementation "com.squareup.moshi:moshi:$moshi_version"
     implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
+    annotationProcessor "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
 
     implementation "net.openid:appauth:0.7.1"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ee3cb7c7d2a65c4eb38a486f1b5a6f6ac5af4063..1f6cbec0fd5d735842a5ad99ed3427a7254a30ec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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="jp.atled.agileworks">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt b/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
index 837822514964fe6c28144df6c6e8952f08de6d0b..d4326e25db18cb0ae7d277354818f22201e508bb 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
@@ -14,21 +14,20 @@ import jp.atled.agileworks.view.base.BaseActivity
 import jp.atled.agileworks.view.ui.documentweb.DocumentWebFragment
 import jp.atled.agileworks.view.utils.putExtraNonNullString
 import jp.atled.agileworks.view.utils.putNonNullStingFromExtra
-import kotlinx.android.synthetic.main.activity_main.*
 import android.view.KeyEvent
 import android.view.View
 import android.widget.Button
 import jp.atled.agileworks.model.LoginRepository
 import jp.atled.agileworks.model.ServerRepository
-import kotlinx.android.synthetic.main.activity_main.app_ver_label
-import kotlinx.android.synthetic.main.activity_main.toolbar
-import kotlinx.android.synthetic.main.fragment_login.*
+import jp.atled.agileworks.databinding.ActivityDirectOpenDocumentBinding
 
 class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
     private val TAG = "DirectOpenDocumentActivity"
 
     private lateinit var directOpenControl: DirectOpenControl
 
+    private lateinit var binding: ActivityDirectOpenDocumentBinding
+
     var tapServer = 0
     var firstServer= 0
 
@@ -47,9 +46,10 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
 
         directOpenControl = DirectOpenControl(this)
 
-        setContentView(R.layout.activity_direct_open_document)
-        toolbar.title = title()
-        setSupportActionBar(toolbar)
+        binding = ActivityDirectOpenDocumentBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        binding.toolbar.title = title()
+        setSupportActionBar(binding.toolbar)
         setupDrawerMenu()
         findViewById<Button>(R.id.close_btn).setOnClickListener(this);
 
@@ -116,10 +116,10 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
     }
 
     private fun setupDrawerMenu() {
-        DrawerMenu.setup(this, drawer_layout, navigation_drawer)
-        app_ver_label.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
-        val actionBarDrawerToggle = ActionBarDrawerToggle(this, drawer_layout, toolbar, R.string.drawer_open_desc, R.string.drawer_close_desc)
-        drawer_layout.addDrawerListener(actionBarDrawerToggle)
+        DrawerMenu.setup(this, binding.drawerLayout, binding.navigationDrawer)
+        binding.appVerLabel.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
+        val actionBarDrawerToggle = ActionBarDrawerToggle(this, binding.drawerLayout, binding.toolbar, R.string.drawer_open_desc, R.string.drawer_close_desc)
+        binding.drawerLayout.addDrawerListener(actionBarDrawerToggle)
         actionBarDrawerToggle.syncState()
     }
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt b/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
index dfea07bc0a2398dd36a6a800fb9ca0a45994d1db..d6856f433370d7677e89e7e20c6db730d18a168a 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
@@ -27,12 +27,13 @@ import androidx.navigation.ui.setupActionBarWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import jp.atled.agileworks.BuildConfig
 import jp.atled.agileworks.R
+import jp.atled.agileworks.databinding.ActivityDirectOpenDocumentBinding
 import jp.atled.agileworks.model.AppRepository
 import jp.atled.agileworks.view.base.BaseActivity
 import jp.atled.agileworks.view.base.BaseViewModel
 import jp.atled.agileworks.view.ui.login.LoginUtil
 import jp.atled.agileworks.view.utils.putNonNullStingFromExtra
-import kotlinx.android.synthetic.main.activity_main.*
+import jp.atled.agileworks.databinding.ActivityMainBinding
 
 class MainActivity : BaseActivity() {
     private val TAG = "MainActivity"
@@ -42,17 +43,20 @@ class MainActivity : BaseActivity() {
     private val viewModel by viewModels<BaseViewModel>()
     private lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
 
+    private lateinit var binding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.d(TAG, "call onCreate, url = ${intent?.getStringExtra("url")}, title = ${intent?.getStringExtra("title")}")
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
         if (savedInstanceState == null) {
             setupBottomNavigationBar()
         } // Else, need to wait for onRestoreInstanceState
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM)
-        DrawerMenu.setup(this, drawer_layout, navigation_drawer)
-        app_ver_label.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
+        DrawerMenu.setup(this, binding.drawerLayout, binding.navigationDrawer)
+        binding.appVerLabel.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
         setupNotification()
 
         if (isDirectOpen()) {
@@ -172,12 +176,12 @@ class MainActivity : BaseActivity() {
                     bottom_navigation_bar.visibility = View.VISIBLE
                 }*/
                 destination.label?.let {
-                    toolbar_title.text = titleText(it, arguments)
+                    binding.toolbarTitle.text = titleText(it, arguments)
                 }
                 // 件数が必要ならばこの後の各 Fragment が設定する
-                toolbar_count.text = ""
+                binding.toolbarCount.text = ""
             }
-            appBarConfiguration = AppBarConfiguration(navController.graph, drawer_layout)
+            appBarConfiguration = AppBarConfiguration(navController.graph, binding.drawerLayout)
             setupActionBarWithNavController(navController,  appBarConfiguration)
         })
         currentNavController = controller
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
index d63b84234e26d1af853582e2855fac2cc461bcc7..9e27c64515eb36d85f44ea6884a262355f225107 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
@@ -24,7 +24,6 @@ import jp.atled.agileworks.AwApp
 import jp.atled.agileworks.databinding.FragmentWebviewDetailBinding
 import jp.atled.agileworks.model.*
 import jp.atled.agileworks.view.base.BaseViewModel
-import kotlinx.android.synthetic.main.fragment_webview_detail.*
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import java.lang.Exception
@@ -260,7 +259,7 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
             scrollAmount += scrollX - oldScrollX
         }
 
-        override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+        override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
             // 横方向のスクロールが発生した時は基本的にページ遷移しないが、画面橋付近でページめくりをした時には反応するよう、短いスクロールは無視する。
             if (scrollAmount.absoluteValue > SCROLL_THRESHOLD) {
                 return false
@@ -454,21 +453,21 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
         if (!isAdded) {
             return
         }
-        progress_view?.visibility = View.VISIBLE
+        viewDataBinding.progressView?.visibility = View.VISIBLE
     }
 
     override fun hideLoadingProgressBar() {
         if (!isAdded) {
             return
         }
-        progress_view?.visibility = View.GONE
+        viewDataBinding.progressView?.visibility = View.GONE
     }
 
     override fun setProgress(newProgress: Int) {
         if (!isAdded) {
             return
         }
-        progress_view?.setProgress(newProgress, true)
+        viewDataBinding.progressView?.setProgress(newProgress, true)
     }
 
     override fun checkConnect(): Boolean? {
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginActivity.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginActivity.kt
index 58de26d853fd398185f445baa30c65832e5dc76d..ac5a64e93738a831ced646db5b29cc08ba1e0f27 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginActivity.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginActivity.kt
@@ -16,19 +16,22 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import jp.atled.agileworks.AwApp
 import jp.atled.agileworks.R
+import jp.atled.agileworks.databinding.ActivityDirectOpenDocumentBinding
 import jp.atled.agileworks.model.*
 import jp.atled.agileworks.view.ui.toDeepLinkArguments
 import jp.atled.agileworks.view.ui.toDirectOpenArguments
-import kotlinx.android.synthetic.main.fragment_login.*
+import jp.atled.agileworks.databinding.ActivityLoginBinding
 
 class LoginActivity : AppCompatActivity() {
     private val TAG = "LoginActivity"
 
+    private lateinit var binding: ActivityLoginBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.d(TAG, "call onCreate()")
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login)
-
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        setContentView(binding.root)
         // サーバ情報引継ぎ
         updateServerSettings()
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index 7a3ada6fb46f699e38ce03d3e81d5129936040b7..35e82d774fe755a71bbcfa962ddc329b5b37caba 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -26,7 +26,6 @@ import jp.atled.agileworks.databinding.FragmentLoginBinding
 import jp.atled.agileworks.model.api.ApiClient
 import jp.atled.agileworks.view.ui.MainActivity
 import jp.atled.agileworks.view.ui.license.License
-import kotlinx.android.synthetic.main.fragment_login.*
 import net.openid.appauth.AuthState
 import net.openid.appauth.AuthorizationException
 import net.openid.appauth.AuthorizationService
@@ -93,12 +92,12 @@ class LoginFragment: Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        app_ver_label.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
+        binding.appVerLabel.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
 
         setLoginControlsEnabled(true)
 
         //サーバー追加ログイン画面の閉じるボタン押下
-        close_btn.setOnClickListener{
+        binding.closeBtn.setOnClickListener{
             val loginActivity = activity
             if (loginActivity != null) {
                 loginActivity!!.finish()
@@ -114,9 +113,9 @@ class LoginFragment: Fragment() {
         }
 
         if (requireActivity().intent.action == LoginActivity.ACTION_ADD_SERVER) {
-            toolbar.visibility = View.VISIBLE
+            binding.toolbar.visibility = View.VISIBLE
         } else {
-            toolbar.visibility = View.INVISIBLE
+            binding.toolbar.visibility = View.INVISIBLE
         }
 
         License.askLicenseAgreementIfNotYet(requireActivity()) {
@@ -179,7 +178,7 @@ class LoginFragment: Fragment() {
                 binding.viewmodel?.setServerContext()
 
                 if (checkServer()) {
-                    loginAlert(R.string.login_server_check_alert)
+                    whenAuthorizationSucceeds()
                 } else {
                     try {
                         startAuthorization()
@@ -254,6 +253,8 @@ class LoginFragment: Fragment() {
         for (server in serverList) {
             val serverName = LoginRepository(server).loadServerUrl()
             if (serverName == serverHost) {
+                ServerRepository().setServer(server)
+                ServerRepository().changeServerList(server)
                 return true
             }
         }
@@ -285,7 +286,7 @@ class LoginFragment: Fragment() {
 
     private fun setLoginButtonEnable(host: String, context: String) {
         if (!disableButtonFlg) {
-            loginButton.isEnabled = inputIsValid(host, context)
+            binding.loginButton.isEnabled = inputIsValid(host, context)
         }
     }
 
@@ -508,12 +509,12 @@ class LoginFragment: Fragment() {
     }
 
     private fun disableLogin() {
-        disablingView.visibility = View.VISIBLE
+        binding.disablingView.visibility = View.VISIBLE
         setLoginControlsEnabled(false)
     }
 
     private fun enableLogin() {
-        disablingView.visibility = View.INVISIBLE
+        binding.disablingView.visibility = View.INVISIBLE
         setLoginControlsEnabled(true)
 
         // 一度強制的に有効になるのでログインボタン評価し直し
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt
index ac67b45e1a868660a44ef900cb1dbd9a463af91a..498c8606ff1507278090a5a0db3f36313128d932 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt
@@ -4,7 +4,7 @@ import android.app.Activity
 import jp.atled.agileworks.model.*
 import jp.atled.agileworks.view.ui.MainActivity
 import jp.atled.agileworks.view.ui.documentweb.DocumentWebFragment
-import kotlinx.android.synthetic.main.activity_direct_open_document.*
+import jp.atled.agileworks.databinding.ActivityDirectOpenDocumentBinding
 
 object LoginUtil {
     fun clearAuthStateAndNotificationToken(serverNumber: Int? = null, onResponse: (Boolean) -> Unit) {
diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
index 7bad2ff6507001b30f004f57a8c75ea6b5d9402d..7044e9882374137cc752870d5eb58ded4257f81d 100644
--- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
+++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
@@ -166,9 +166,15 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent?
     private fun getApprovalItems(): List<ApprovalInfo>? {
         try {
             val prefs = AwApp.instance.applicationContext.getSharedPreferences(AwApp.WIDGET_PREFERENCES, Context.MODE_PRIVATE)
+            val timeout = 10000L
+            val startTime = System.currentTimeMillis()
 
             while (prefs.getBoolean(AwApp.WIDGET_UPDATE_FLG, false)) {
                 //別のウィジェットが更新中の場合は待つ
+                if(System.currentTimeMillis() - startTime > timeout){
+                    break
+                }
+                Thread.sleep(100)
             }
 
             prefs.edit().putBoolean(AwApp.WIDGET_UPDATE_FLG, true).apply()
diff --git a/build.gradle b/build.gradle
index e5765d1e8571c8548b3e61fcf11e76663acb3bba..d3e4953aea5a33371b828c480007554e7b9ac4e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,14 +2,14 @@
 
 buildscript {
     ext{
-        kotlin_version = '1.4.10'
+        kotlin_version = '1.8.20'
         nav_version = '2.3.2'
         workVersion = '2.7.0'
         anko_version = '0.10.8'
         retrofit_version = '2.8.1'
         coroutines_version = '1.3.7'
         moshi_version = '1.9.2'
-        google_services_version='4.3.3'
+        google_services_version= '4.3.3'
         firebase_analytics_version = '18.0.0'
         firebase_messaging_version = '23.0.0'
         constraint_layout_version = '2.0.4'
@@ -19,10 +19,10 @@ buildscript {
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
         classpath "com.google.gms:google-services:$google_services_version"
diff --git a/gradle.properties b/gradle.properties
index 267938546b1b3beb7624aa6b6fb0a02b54223b0f..33a260477c503ab8ff969784c0193e8cbb62b92a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e58cdc6383820cb358b24487e110994f23b252f5..98188097212e20e44f260c7395192a4771e7742d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #distributionUrl=gradle-7.0.2-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip