From: MRSa Date: Tue, 5 May 2020 13:22:44 +0000 (+0900) Subject: 次バージョンの準備。（アイコン等整備） X-Git-Url: http://git.osdn.net/view?p=gokigen%2FGr2Control.git;a=commitdiff_plain;h=881be0d231de44f2c98c07b496e07f2df173cfbe 次バージョンの準備。（アイコン等整備） --- diff --git a/app/build.gradle b/app/build.gradle index d66416c..74cfed3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "net.osdn.gokigen.gr2control" minSdkVersion 14 targetSdkVersion 29 - versionCode 1003001 - versionName "1.3.1" + versionCode 1003002 + versionName "1.3.2" } buildTypes { release { diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..18f443f Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/preference/Gr2ControlPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/preference/Gr2ControlPreferenceFragment.java index bcbdeae..50c95b2 100644 --- a/app/src/main/java/net/osdn/gokigen/gr2control/preference/Gr2ControlPreferenceFragment.java +++ b/app/src/main/java/net/osdn/gokigen/gr2control/preference/Gr2ControlPreferenceFragment.java @@ -9,6 +9,7 @@ import android.util.Log; import net.osdn.gokigen.gr2control.R; import net.osdn.gokigen.gr2control.camera.ICameraConnection; +import net.osdn.gokigen.gr2control.camera.ricohgr2.operation.RicohGr2CameraPowerOff; import net.osdn.gokigen.gr2control.logcat.LogCatViewer; import net.osdn.gokigen.gr2control.scene.IChangeScene; @@ -26,6 +27,7 @@ import androidx.preference.PreferenceManager; public class Gr2ControlPreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, Preference.OnPreferenceClickListener { private final String TAG = toString(); + //private RicohGr2CameraPowerOff powerOffController = null; private IChangeScene changeScene = null; private AppCompatActivity context = null; private SharedPreferences preferences = null; @@ -57,6 +59,9 @@ public class Gr2ControlPreferenceFragment extends PreferenceFragmentCompat impl { try { + //powerOffController = new RicohGr2CameraPowerOff(context, changeScene); + //powerOffController.prepare(); + logCatViewer = new LogCatViewer(changeScene); logCatViewer.prepare(); this.changeScene = changeScene; @@ -237,6 +242,14 @@ public class Gr2ControlPreferenceFragment extends PreferenceFragmentCompat impl connectionMethod.setSummary(connectionMethod.getValue() + " "); } + /* + Preference exitApplication = findPreference("exit_application"); + if (exitApplication != null) + { + exitApplication.setOnPreferenceClickListener(powerOffController); + } + */ + Preference opcPreference = findPreference("opc_settings"); if (opcPreference != null) { diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..ca638be --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index c4a603d..7353dbd 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index c4a603d..7353dbd 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 222a4f0..681754a 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 8971a1d..0528b23 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index e0cc7df..1245f0a 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 42c7c7b..794590f 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index c7fc958..10e7015 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 7962f23..767c714 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index f0965fa..c2bc963 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index e23a416..559c785 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f014491..db354a0 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 6ec1e00..948bb3e 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..09a756b --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #26A69A + \ No newline at end of file diff --git a/app/src/main/res/xml/preferences_summary.xml b/app/src/main/res/xml/preferences_summary.xml index 3fba833..f8ad09a 100644 --- a/app/src/main/res/xml/preferences_summary.xml +++ b/app/src/main/res/xml/preferences_summary.xml @@ -2,7 +2,12 @@ - +/* + +*/