| Revision | 881be0d231de44f2c98c07b496e07f2df173cfbe (tree) |
|---|---|
| Zeit | 2020-05-05 22:22:44 |
| Autor | MRSa <mrsa@myad...> |
| Commiter | MRSa |
次バージョンの準備。（アイコン等整備）
app/build.gradle (diff)
app/src/main/ic_launcher-playstore.png (diff)
app/src/main/java/net/osdn/gokigen/gr2control/preference/Gr2ControlPreferenceFragment.java (diff) app/src/main/res/drawable/ic_launcher_foreground.xml (diff) app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (diff) app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (diff)
app/src/main/res/mipmap-hdpi/ic_launcher.png (diff)
app/src/main/res/mipmap-hdpi/ic_launcher_round.png (diff)
app/src/main/res/mipmap-mdpi/ic_launcher.png (diff)
app/src/main/res/mipmap-mdpi/ic_launcher_round.png (diff)
app/src/main/res/mipmap-xhdpi/ic_launcher.png (diff)
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (diff)
app/src/main/res/mipmap-xxhdpi/ic_launcher.png (diff)
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (diff)
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (diff)
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (diff) app/src/main/res/values/ic_launcher_background.xml (diff) app/src/main/res/xml/preferences_summary.xml (diff)| @@ -6,8 +6,8 @@ android { | ||
| 6 | 6 | applicationId "net.osdn.gokigen.gr2control" |
| 7 | 7 | minSdkVersion 14 |
| 8 | 8 | targetSdkVersion 29 |
| 9 | - versionCode 1003001 | |
| 10 | - versionName "1.3.1" | |
| 9 | + versionCode 1003002 | |
| 10 | + versionName "1.3.2" | |
| 11 | 11 | } |
| 12 | 12 | buildTypes { |
| 13 | 13 | release { |
| @@ -9,6 +9,7 @@ import android.util.Log; | ||
| 9 | 9 | |
| 10 | 10 | import net.osdn.gokigen.gr2control.R; |
| 11 | 11 | import net.osdn.gokigen.gr2control.camera.ICameraConnection; |
| 12 | +import net.osdn.gokigen.gr2control.camera.ricohgr2.operation.RicohGr2CameraPowerOff; | |
| 12 | 13 | import net.osdn.gokigen.gr2control.logcat.LogCatViewer; |
| 13 | 14 | import net.osdn.gokigen.gr2control.scene.IChangeScene; |
| 14 | 15 |
| @@ -26,6 +27,7 @@ import androidx.preference.PreferenceManager; | ||
| 26 | 27 | public class Gr2ControlPreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, Preference.OnPreferenceClickListener |
| 27 | 28 | { |
| 28 | 29 | private final String TAG = toString(); |
| 30 | + //private RicohGr2CameraPowerOff powerOffController = null; | |
| 29 | 31 | private IChangeScene changeScene = null; |
| 30 | 32 | private AppCompatActivity context = null; |
| 31 | 33 | private SharedPreferences preferences = null; |
| @@ -57,6 +59,9 @@ public class Gr2ControlPreferenceFragment extends PreferenceFragmentCompat impl | ||
| 57 | 59 | { |
| 58 | 60 | try |
| 59 | 61 | { |
| 62 | + //powerOffController = new RicohGr2CameraPowerOff(context, changeScene); | |
| 63 | + //powerOffController.prepare(); | |
| 64 | + | |
| 60 | 65 | logCatViewer = new LogCatViewer(changeScene); |
| 61 | 66 | logCatViewer.prepare(); |
| 62 | 67 | this.changeScene = changeScene; |
| @@ -237,6 +242,14 @@ public class Gr2ControlPreferenceFragment extends PreferenceFragmentCompat impl | ||
| 237 | 242 | connectionMethod.setSummary(connectionMethod.getValue() + " "); |
| 238 | 243 | } |
| 239 | 244 | |
| 245 | + /* | |
| 246 | + Preference exitApplication = findPreference("exit_application"); | |
| 247 | + if (exitApplication != null) | |
| 248 | + { | |
| 249 | + exitApplication.setOnPreferenceClickListener(powerOffController); | |
| 250 | + } | |
| 251 | + */ | |
| 252 | + | |
| 240 | 253 | Preference opcPreference = findPreference("opc_settings"); |
| 241 | 254 | if (opcPreference != null) |
| 242 | 255 | { |
| @@ -0,0 +1,19 @@ | ||
| 1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | |
| 2 | + android:width="108dp" | |
| 3 | + android:height="108dp" | |
| 4 | + android:viewportWidth="50.462574" | |
| 5 | + android:viewportHeight="50.462574" | |
| 6 | + android:tint="#EDEDED"> | |
| 7 | + <group android:translateX="13.231287" | |
| 8 | + android:translateY="13.231287"> | |
| 9 | + <path | |
| 10 | + android:fillColor="#FF000000" | |
| 11 | + android:pathData="M12,14m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/> | |
| 12 | + <path | |
| 13 | + android:fillColor="#FF000000" | |
| 14 | + android:pathData="M16,3.33c2.58,0 4.67,2.09 4.67,4.67H22c0,-3.31 -2.69,-6 -6,-6v1.33M16,6c1.11,0 2,0.89 2,2h1.33c0,-1.84 -1.49,-3.33 -3.33,-3.33V6"/> | |
| 15 | + <path | |
| 16 | + android:fillColor="#FF000000" | |
| 17 | + android:pathData="M17,9c0,-1.11 -0.89,-2 -2,-2L15,4L9,4L7.17,6L4,6c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,9h-5zM12,19c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/> | |
| 18 | + </group> | |
| 19 | +</vector> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 | <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> |
| 3 | - <background android:drawable="@drawable/ic_launcher_background"/> | |
| 4 | - <foreground android:drawable="@mipmap/ic_launcher_foreground"/> | |
| 3 | + <background android:drawable="@color/ic_launcher_background"/> | |
| 4 | + <foreground android:drawable="@drawable/ic_launcher_foreground"/> | |
| 5 | 5 | </adaptive-icon> |
| \ No newline at end of file |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 | <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> |
| 3 | - <background android:drawable="@drawable/ic_launcher_background"/> | |
| 4 | - <foreground android:drawable="@mipmap/ic_launcher_foreground"/> | |
| 3 | + <background android:drawable="@color/ic_launcher_background"/> | |
| 4 | + <foreground android:drawable="@drawable/ic_launcher_foreground"/> | |
| 5 | 5 | </adaptive-icon> |
| \ No newline at end of file |
| @@ -0,0 +1,4 @@ | ||
| 1 | +<?xml version="1.0" encoding="utf-8"?> | |
| 2 | +<resources> | |
| 3 | + <color name="ic_launcher_background">#26A69A</color> | |
| 4 | +</resources> | |
| \ No newline at end of file |
| @@ -2,7 +2,12 @@ | ||
| 2 | 2 | <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > |
| 3 | 3 | <PreferenceCategory |
| 4 | 4 | android:title="@string/pref_cat_application_control"> |
| 5 | - | |
| 5 | +/* | |
| 6 | + <PreferenceScreen | |
| 7 | + android:key="exit_application" | |
| 8 | + android:icon="@drawable/ic_power_settings_new_black_24dp" | |
| 9 | + android:title="@string/pref_exit_power_off" /> | |
| 10 | +*/ | |
| 6 | 11 | <ListPreference |
| 7 | 12 | android:title="@string/pref_connection_method" |
| 8 | 13 | android:entryValues="@array/connection_method_value" |
Fork
