From 92dd5da6c6af1a366cb9dfebdee9e3d248253788 Mon Sep 17 00:00:00 2001 From: sitou Date: Tue, 22 Jul 2025 09:24:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?sdk36=E3=81=AB=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 11 +- app/proguard-rules.pro | 11 + .../view/ui/DirectOpenDocumentActivity.kt | 22 +- .../atled/agileworks/view/ui/MainActivity.kt | 9 + .../view/ui/NavigationExtensions.kt | 2 +- .../layout/activity_direct_open_document.xml | 7 +- app/src/main/res/layout/activity_login.xml | 3 +- app/src/main/res/layout/activity_main.xml | 5 +- app/src/main/res/layout/fragment_login.xml | 333 +++++++++--------- build.gradle | 6 +- gradle.properties | 3 + gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 227 insertions(+), 187 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 345dfd85..81527c68 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,11 +6,11 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.android.gms.oss-licenses-plugin' android { - compileSdk 34 + compileSdk 36 defaultConfig { applicationId "jp.atled.agileworks" minSdkVersion 24 - targetSdk 34 + targetSdk 36 versionCode 6 versionName "1.1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -20,6 +20,7 @@ android { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.debug } } buildFeatures { @@ -33,7 +34,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() } - buildToolsVersion = '34.0.0' + buildToolsVersion = '36.0.0' dataBinding { enabled = true @@ -58,7 +59,7 @@ dependencies { implementation "androidx.navigation:navigation-runtime-ktx:$nav_version" implementation "androidx.work:work-runtime-ktx:$workVersion" implementation "android.arch.lifecycle:extensions:$lifecycle_extention_version" - implementation "com.google.android.gms:play-services-oss-licenses:17.0.0" + implementation "com.google.android.gms:play-services-oss-licenses:17.2.0" // Retrofit implementation "com.squareup.retrofit2:retrofit:$retrofit_version" @@ -93,7 +94,7 @@ dependencies { implementation "com.journeyapps:zxing-android-embedded:$zxing_version" - implementation "com.google.android.material:material:1.1.0" + implementation "com.google.android.material:material:1.2.0" } repositories { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f1b42451..04e5470a 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -19,3 +19,14 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile + +#sdk36対応時bundleを作れなかった対応 +-dontwarn org.bouncycastle.jsse.BCSSLParameters +-dontwarn org.bouncycastle.jsse.BCSSLSocket +-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider +-dontwarn org.conscrypt.Conscrypt$Version +-dontwarn org.conscrypt.Conscrypt +-dontwarn org.conscrypt.ConscryptHostnameVerifier +-dontwarn org.openjsse.javax.net.ssl.SSLParameters +-dontwarn org.openjsse.javax.net.ssl.SSLSocket +-dontwarn org.openjsse.net.ssl.OpenJSSE \ No newline at end of file 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 d4326e25..49a013f3 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 @@ -17,6 +17,8 @@ import jp.atled.agileworks.view.utils.putNonNullStingFromExtra import android.view.KeyEvent import android.view.View import android.widget.Button +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import jp.atled.agileworks.model.LoginRepository import jp.atled.agileworks.model.ServerRepository import jp.atled.agileworks.databinding.ActivityDirectOpenDocumentBinding @@ -62,17 +64,10 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener { if (firstServer != tapServer) { createDialog().show() } else { - closeTapped() + finish() } } - private fun closeTapped(){ - var event = KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK) - dispatchKeyEvent(event) - event = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK) - dispatchKeyEvent(event) - } - private fun title() = intent.getStringExtra("title") ?: "" private fun url() = intent.getStringExtra("url") ?: "" @@ -99,7 +94,7 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener { override fun onClick(dialogInterface: DialogInterface, i: Int) { Log.d(TAG, "alert dialog click positive") ServerRepository().changeServerList(tapServer) - closeTapped() + finish() MainActivity.start(context, null) } }) @@ -107,7 +102,7 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener { override fun onClick(dialogInterface: DialogInterface, i: Int) { Log.d(TAG, "alert dialog click negative") ServerRepository().setServer(firstServer) - closeTapped() + finish() } }) .create() @@ -117,6 +112,13 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener { private fun setupDrawerMenu() { DrawerMenu.setup(this, binding.drawerLayout, binding.navigationDrawer) + val navigationView = binding.navigationDrawer + val headerView = navigationView.getHeaderView(0) + ViewCompat.setOnApplyWindowInsetsListener(headerView) { view, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + view.setPadding(view.paddingLeft, systemBars.top, view.paddingRight, view.paddingBottom) + insets + } 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) 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 d6856f43..236f5669 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 @@ -18,6 +18,8 @@ import androidx.annotation.StringRes import androidx.appcompat.app.ActionBar import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.navigation.NavController @@ -56,6 +58,13 @@ class MainActivity : BaseActivity() { setSupportActionBar(binding.toolbar) supportActionBar?.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM) DrawerMenu.setup(this, binding.drawerLayout, binding.navigationDrawer) + val navigationView = binding.navigationDrawer + val headerView = navigationView.getHeaderView(0) + ViewCompat.setOnApplyWindowInsetsListener(headerView) { view, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + view.setPadding(view.paddingLeft, systemBars.top, view.paddingRight, view.paddingBottom) + insets + } binding.appVerLabel.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME) setupNotification() diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt b/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt index f88b25dc..c9920bed 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt @@ -194,7 +194,7 @@ private fun BottomNavigationView.setupItemReselected( viewModel.reselectBottomNavigationItem(item.itemId) // Pop the back stack to the start destination of the current navController graph navController.popBackStack( - navController.graph.startDestination, false + navController.graph.startDestinationId, false ) } } diff --git a/app/src/main/res/layout/activity_direct_open_document.xml b/app/src/main/res/layout/activity_direct_open_document.xml index ce26c96e..2acea7a5 100644 --- a/app/src/main/res/layout/activity_direct_open_document.xml +++ b/app/src/main/res/layout/activity_direct_open_document.xml @@ -15,7 +15,9 @@ + android:orientation="vertical" + android:fitsSystemWindows="true" + android:background="?attr/colorPrimary"> + android:layout_weight="1" + android:background="@color/white"/> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index dcbd25bc..fae20b96 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -3,7 +3,8 @@ + android:layout_height="wrap_content" + android:fillViewport="true"> + android:orientation="vertical" + android:fitsSystemWindows="true" + android:background="?attr/colorPrimary"> diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 1b4d1421..e056b4b3 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -11,197 +11,204 @@ android:id="@+id/snackbarArea" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingBottom="0dp" > - - -