スプラッシュ画面の変更
|
@ -166,6 +166,8 @@ dependencies {
|
||||||
"fcmImplementation"("com.google.firebase:firebase-messaging:23.4.0")
|
"fcmImplementation"("com.google.firebase:firebase-messaging:23.4.0")
|
||||||
"fcmImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:${Vers.kotlinxCoroutinesVersion}")
|
"fcmImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:${Vers.kotlinxCoroutinesVersion}")
|
||||||
|
|
||||||
|
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||||
|
|
||||||
// implementation "org.conscrypt:conscrypt-android:$conscryptVersion"
|
// implementation "org.conscrypt:conscrypt-android:$conscryptVersion"
|
||||||
api("org.conscrypt:conscrypt-android:${Vers.conscryptVersion}")
|
api("org.conscrypt:conscrypt-android:${Vers.conscryptVersion}")
|
||||||
implementation("com.github.UnifiedPush:android-connector:2.1.1")
|
implementation("com.github.UnifiedPush:android-connector:2.1.1")
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
android:maxAspectRatio="100"
|
android:maxAspectRatio="100"
|
||||||
android:resizeableActivity="true"
|
android:resizeableActivity="true"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/AppTheme.Light"
|
android:theme="@style/Theme.App.Starting"
|
||||||
tools:ignore="DataExtractionRules,UnusedAttribute">
|
tools:ignore="DataExtractionRules,UnusedAttribute">
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
|
|
|
@ -5,6 +5,7 @@ import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.FileProvider
|
import androidx.core.content.FileProvider
|
||||||
|
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||||
import jp.juggler.subwaytooter.pref.FILE_PROVIDER_AUTHORITY
|
import jp.juggler.subwaytooter.pref.FILE_PROVIDER_AUTHORITY
|
||||||
import jp.juggler.util.*
|
import jp.juggler.util.*
|
||||||
import jp.juggler.util.data.digestSHA256Hex
|
import jp.juggler.util.data.digestSHA256Hex
|
||||||
|
@ -47,6 +48,9 @@ class ActCallback : AppCompatActivity() {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
installSplashScreen()
|
||||||
|
App1.setActivityTheme(this)
|
||||||
|
|
||||||
var intent = this.intent
|
var intent = this.intent
|
||||||
log.d("onCreate flags=0x${intent?.flags?.toString(radix = 16)}")
|
log.d("onCreate flags=0x${intent?.flags?.toString(radix = 16)}")
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
|
@ -17,6 +17,7 @@ import android.widget.ImageButton
|
||||||
import android.widget.LinearLayout
|
import android.widget.LinearLayout
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||||
import androidx.drawerlayout.widget.DrawerLayout
|
import androidx.drawerlayout.widget.DrawerLayout
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
@ -398,6 +399,7 @@ class ActMain : AppCompatActivity(),
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
log.d("onCreate")
|
log.d("onCreate")
|
||||||
|
installSplashScreen()
|
||||||
refActMain = WeakReference(this)
|
refActMain = WeakReference(this)
|
||||||
supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
|
supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
After Width: | Height: | Size: 5.2 KiB |
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 19 KiB |
After Width: | Height: | Size: 19 KiB |
After Width: | Height: | Size: 4.4 KiB |
After Width: | Height: | Size: 7.2 KiB |
After Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 17 KiB |
|
@ -3,21 +3,31 @@
|
||||||
<!-- light theme -->
|
<!-- light theme -->
|
||||||
<style name="AppTheme.Light" parent="AppTheme.Light.Base">
|
<style name="AppTheme.Light" parent="AppTheme.Light.Base">
|
||||||
<item name="android:windowSplashScreenBackground">@color/Other_splashBackground</item>
|
<item name="android:windowSplashScreenBackground">@color/Other_splashBackground</item>
|
||||||
<item name="android:windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
|
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon_blue_white</item>
|
||||||
<item name="android:windowSplashScreenAnimationDuration">1000</item>
|
<item name="android:windowSplashScreenAnimationDuration">1000</item>
|
||||||
|
<item name="windowSplashScreenBackground">@color/Other_splashBackground</item>
|
||||||
|
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon_blue_white</item>
|
||||||
|
<item name="windowSplashScreenAnimationDuration">1000</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!-- dark theme -->
|
<!-- dark theme -->
|
||||||
<style name="AppTheme.Dark" parent="AppTheme.Dark.Base">
|
<style name="AppTheme.Dark" parent="AppTheme.Dark.Base">
|
||||||
<item name="android:windowSplashScreenBackground">@color/Other_splashBackground</item>
|
<item name="android:windowSplashScreenBackground">@color/Other_splashBackground</item>
|
||||||
<item name="android:windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
|
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon_blue_white</item>
|
||||||
<item name="android:windowSplashScreenAnimationDuration">1000</item>
|
<item name="android:windowSplashScreenAnimationDuration">1000</item>
|
||||||
|
<item name="windowSplashScreenBackground">@color/Other_splashBackground</item>
|
||||||
|
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon_blue_white</item>
|
||||||
|
<item name="windowSplashScreenAnimationDuration">1000</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!-- Mastidon theme -->
|
<!-- Mastidon theme -->
|
||||||
<style name="AppTheme.Mastodon" parent="AppTheme.Mastodon.Base">
|
<style name="AppTheme.Mastodon" parent="AppTheme.Mastodon.Base">
|
||||||
<item name="android:windowSplashScreenBackground">@color/Other_splashBackground</item>
|
<item name="android:windowSplashScreenBackground">@color/Other_splashBackground</item>
|
||||||
<item name="android:windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
|
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon_blue_white</item>
|
||||||
<item name="android:windowSplashScreenAnimationDuration">1000</item>
|
<item name="android:windowSplashScreenAnimationDuration">100</item>
|
||||||
|
<item name="windowSplashScreenBackground">@color/Other_splashBackground</item>
|
||||||
|
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon_blue_white</item>
|
||||||
|
<item name="windowSplashScreenAnimationDuration">100</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -148,7 +148,7 @@
|
||||||
<!-- =================================================== -->
|
<!-- =================================================== -->
|
||||||
|
|
||||||
<!-- スプラッシュ画面の背景色はテーマ関係なし -->
|
<!-- スプラッシュ画面の背景色はテーマ関係なし -->
|
||||||
<color name="Other_splashBackground">#0080ff</color>
|
<color name="Other_splashBackground">#000000</color>
|
||||||
|
|
||||||
<!-- 通知のアクセント色 -->
|
<!-- 通知のアクセント色 -->
|
||||||
<color name="colorOsNotificationAccent">#B3E1FF</color>
|
<color name="colorOsNotificationAccent">#B3E1FF</color>
|
||||||
|
|
|
@ -203,10 +203,8 @@
|
||||||
<item name="android:textColor">@color/Dark_colorTextTimeSmall</item>
|
<item name="android:textColor">@color/Dark_colorTextTimeSmall</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<style name="AppTheme.Mastodon.Base" parent="Theme.AppCompat.NoActionBar">
|
<style name="AppTheme.Mastodon.Base" parent="Theme.AppCompat.NoActionBar">
|
||||||
|
|
||||||
|
|
||||||
<!-- AppCompat ============================================ -->
|
<!-- AppCompat ============================================ -->
|
||||||
|
|
||||||
<!-- テキスト色 -->
|
<!-- テキスト色 -->
|
||||||
|
|
|
@ -11,4 +11,14 @@
|
||||||
<style name="AppTheme.Mastodon" parent="AppTheme.Mastodon.Base">
|
<style name="AppTheme.Mastodon" parent="AppTheme.Mastodon.Base">
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.App.Starting" parent="Theme.SplashScreen">
|
||||||
|
<item name="windowSplashScreenBackground">@color/Other_splashBackground</item>
|
||||||
|
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon_blue_white</item>
|
||||||
|
<item name="windowSplashScreenAnimationDuration">100</item>
|
||||||
|
|
||||||
|
<!-- Set the theme of the Activity that directly follows your splash screen. -->
|
||||||
|
<!-- Required -->
|
||||||
|
<item name="postSplashScreenTheme">@style/AppTheme.Mastodon</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|