<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="11" />
+ <bytecodeTargetLevel target="17" />
</component>
</project>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="deploymentTargetDropDown">
+ <runningDeviceTargetSelectedWithDropDown>
+ <Target>
+ <type value="RUNNING_DEVICE_TARGET" />
+ <deviceKey>
+ <Key>
+ <type value="SERIAL_NUMBER" />
+ <value value="3e50111c1220" />
+ </Key>
+ </deviceKey>
+ </Target>
+ </runningDeviceTargetSelectedWithDropDown>
+ <timeTargetWasSelectedWithDropDown value="2023-04-22T10:45:18.823110600Z" />
+ </component>
+</project>
\ No newline at end of file
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="1.8 (1)" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="KotlinJpsPluginSettings">
+ <option name="version" value="1.8.0" />
+ </component>
+</project>
\ No newline at end of file
<textMaps />
</LinkMapSettings>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
//apply plugin: 'kotlin-android-extensions'
android {
- compileSdkVersion 32
+ compileSdkVersion 33
defaultConfig {
applicationId "jp.osdn.gokigen.mangle"
minSdkVersion 21
- targetSdkVersion 32
- versionCode 1006003
- versionName "1.6.3"
+ targetSdkVersion 33
+ versionCode 1006004
+ versionName "1.6.4"
//testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
//}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
+ namespace 'jp.osdn.gokigen.mangle'
}
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation 'androidx.exifinterface:exifinterface:1.3.3'
- implementation "androidx.core:core-ktx:1.7.0"
- implementation 'androidx.appcompat:appcompat:1.4.1'
- implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+ implementation 'androidx.exifinterface:exifinterface:1.3.6'
+ implementation "androidx.core:core-ktx:1.10.0"
+ implementation 'androidx.appcompat:appcompat:1.6.1'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.preference:preference-ktx:1.2.0'
- implementation 'com.google.android.material:material:1.6.0'
+ implementation 'com.google.android.material:material:1.8.0'
+ implementation "androidx.core:core-splashscreen:1.0.1"
- def camerax_version = "1.1.0-beta03"
+ def camerax_version = "1.3.0-alpha05"
implementation "androidx.camera:camera-core:$camerax_version"
implementation "androidx.camera:camera-camera2:$camerax_version"
implementation "androidx.camera:camera-lifecycle:$camerax_version"
- def camerax_view_version = "1.1.0-beta03"
+ def camerax_view_version = "1.3.0-alpha05"
implementation "androidx.camera:camera-extensions:$camerax_view_version"
implementation "androidx.camera:camera-view:$camerax_view_version"
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="jp.osdn.gokigen.mangle">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.camera.any" />
<uses-permission android:name="android.permission.CAMERA" />
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:usesCleartextTraffic="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/Theme.A01Splash">
<activity android:name=".MainActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
package jp.osdn.gokigen.gokigenassets.camera.console
-
import android.view.GestureDetector
import android.view.MotionEvent
import android.view.ScaleGestureDetector
{
// ScaleGestureDetector.OnScaleGestureListener
- override fun onScale(detector: ScaleGestureDetector?): Boolean
+ override fun onScale(detector: ScaleGestureDetector): Boolean
{
return (false)
}
// ScaleGestureDetector.OnScaleGestureListener
- override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean
+ override fun onScaleBegin(detector: ScaleGestureDetector): Boolean
{
return (false)
}
// ScaleGestureDetector.OnScaleGestureListener
- override fun onScaleEnd(detector: ScaleGestureDetector?)
+ override fun onScaleEnd(detector: ScaleGestureDetector)
{
//
}
- override fun onLongPress(e: MotionEvent?)
+ override fun onLongPress(e: MotionEvent)
{
super.onLongPress(e)
try
{
- if (e != null)
- {
- positionArea.onLongPress(e.x, e.y)
- }
+ positionArea.onLongPress(e.x, e.y)
}
catch (e : Exception)
{
}
}
- override fun onSingleTapUp(e: MotionEvent?): Boolean
+ override fun onSingleTapUp(e: MotionEvent): Boolean
{
var ret = false
super.onSingleTapUp(e)
try
{
- if (e != null)
- {
- ret = positionArea.onSingleTapUp(e.x, e.y)
- }
+ ret = positionArea.onSingleTapUp(e.x, e.y)
}
catch (e : Exception)
{
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus
import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
import jp.osdn.gokigen.gokigenassets.scene.IVibrator
override fun onCreate(savedInstanceState: Bundle?)
{
+ ///////// SHOW SPLASH SCREEN /////////
+ installSplashScreen()
+
Log.v(TAG, " ----- onCreate() -----")
super.onCreate(savedInstanceState)
<color name="colorPrimary">#6200EE</color>
<color name="colorPrimaryDark">#3700B3</color>
<color name="colorAccent">#03DAC5</color>
+ <color name="colorAccentDark">#FF018786</color>
+ <color name="background_color">#FF000000</color>
+ <color name="black">#FF000000</color>
+ <color name="white">#FFFFFFFF</color>
</resources>
\ No newline at end of file
--- /dev/null
+<resources>
+ <!-- Base application theme. -->
+ <style name="Theme.Aohina" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+ <!-- Primary brand color. -->
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
+ <item name="colorOnPrimary">@color/white</item>
+ <!-- Secondary brand color. -->
+ <item name="colorSecondary">@color/colorAccent</item>
+ <item name="colorSecondaryVariant">@color/colorAccentDark</item>
+ <item name="colorOnSecondary">@color/black</item>
+ <!-- Status bar color. -->
+ <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+ <!-- Customize your theme here. -->
+ </style>
+ <style name="Theme.A01Splash" parent="Theme.SplashScreen">
+ <item name="windowSplashScreenBackground">@color/colorAccentDark</item>
+ <item name="windowSplashScreenIconBackgroundColor">@color/colorAccentDark</item>
+ <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+ <item name="windowSplashScreenAnimationDuration">300</item>
+ <item name="postSplashScreenTheme">@style/Theme.Aohina</item>
+ </style>
+</resources>
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = "1.6.21"
+ ext.kotlin_version = "1.8.0"
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.2.0'
+ classpath 'com.android.tools.build:gradle:8.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
task clean(type: Delete) {
delete rootProject.buildDir
-}
\ No newline at end of file
+}
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip