フィルターしたときの全選択・全選択解除を実装した。これで一通り。
@@ -25,14 +25,11 @@ | ||
25 | 25 | <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" /> |
26 | 26 | </component> |
27 | 27 | <component name="ChangeListManager"> |
28 | - <list default="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="ファイル名を一括ダウンロードと同じとなるように合わせこんだ。"> | |
29 | - <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_select_all_grey_24dp.xml" afterDir="false" /> | |
28 | + <list default="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="全選択・全選択解除を入れた(が、フィルターを気にせずに全選択する...)"> | |
30 | 29 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
30 | + <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" /> | |
31 | 31 | <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" afterDir="false" /> |
32 | 32 | <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java" afterDir="false" /> |
33 | - <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" afterDir="false" /> | |
34 | - <change beforePath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" afterDir="false" /> | |
35 | - <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" /> | |
36 | 33 | </list> |
37 | 34 | <ignored path="AirA01b.iws" /> |
38 | 35 | <ignored path=".idea/workspace.xml" /> |
@@ -61,10 +58,10 @@ | ||
61 | 58 | <session id="-1676451752"> |
62 | 59 | <usages-collector id="statistics.lifecycle.project"> |
63 | 60 | <counts> |
64 | - <entry key="project.closed" value="14" /> | |
61 | + <entry key="project.closed" value="15" /> | |
65 | 62 | <entry key="project.open.time.0" value="2" /> |
66 | 63 | <entry key="project.open.time.1" value="3" /> |
67 | - <entry key="project.open.time.12" value="2" /> | |
64 | + <entry key="project.open.time.12" value="3" /> | |
68 | 65 | <entry key="project.open.time.13" value="1" /> |
69 | 66 | <entry key="project.open.time.14" value="1" /> |
70 | 67 | <entry key="project.open.time.19" value="1" /> |
@@ -72,7 +69,7 @@ | ||
72 | 69 | <entry key="project.open.time.20" value="1" /> |
73 | 70 | <entry key="project.open.time.22" value="1" /> |
74 | 71 | <entry key="project.open.time.26" value="1" /> |
75 | - <entry key="project.opened" value="15" /> | |
72 | + <entry key="project.opened" value="16" /> | |
76 | 73 | </counts> |
77 | 74 | </usages-collector> |
78 | 75 | <usages-collector id="statistics.file.extensions.open"> |
@@ -81,10 +78,10 @@ | ||
81 | 78 | <entry key="gradle" value="12" /> |
82 | 79 | <entry key="gradlew" value="1" /> |
83 | 80 | <entry key="iml" value="3" /> |
84 | - <entry key="java" value="191" /> | |
81 | + <entry key="java" value="193" /> | |
85 | 82 | <entry key="png" value="2" /> |
86 | 83 | <entry key="properties" value="2" /> |
87 | - <entry key="xml" value="72" /> | |
84 | + <entry key="xml" value="73" /> | |
88 | 85 | </counts> |
89 | 86 | </usages-collector> |
90 | 87 | <usages-collector id="statistics.file.types.open"> |
@@ -92,17 +89,17 @@ | ||
92 | 89 | <entry key="Groovy" value="12" /> |
93 | 90 | <entry key="IDEA_MODULE" value="3" /> |
94 | 91 | <entry key="Image" value="2" /> |
95 | - <entry key="JAVA" value="191" /> | |
92 | + <entry key="JAVA" value="193" /> | |
96 | 93 | <entry key="PLAIN_TEXT" value="2" /> |
97 | 94 | <entry key="Properties" value="2" /> |
98 | - <entry key="XML" value="72" /> | |
95 | + <entry key="XML" value="73" /> | |
99 | 96 | </counts> |
100 | 97 | </usages-collector> |
101 | 98 | <usages-collector id="statistics.file.extensions.edit"> |
102 | 99 | <counts> |
103 | 100 | <entry key="gradle" value="11" /> |
104 | - <entry key="java" value="9926" /> | |
105 | - <entry key="txt" value="293" /> | |
101 | + <entry key="java" value="11277" /> | |
102 | + <entry key="txt" value="331" /> | |
106 | 103 | <entry key="xml" value="1602" /> |
107 | 104 | </counts> |
108 | 105 | </usages-collector> |
@@ -109,8 +106,8 @@ | ||
109 | 106 | <usages-collector id="statistics.file.types.edit"> |
110 | 107 | <counts> |
111 | 108 | <entry key="Groovy" value="11" /> |
112 | - <entry key="JAVA" value="9926" /> | |
113 | - <entry key="PLAIN_TEXT" value="293" /> | |
109 | + <entry key="JAVA" value="11277" /> | |
110 | + <entry key="PLAIN_TEXT" value="331" /> | |
114 | 111 | <entry key="XML" value="1602" /> |
115 | 112 | </counts> |
116 | 113 | </usages-collector> |
@@ -120,7 +117,20 @@ | ||
120 | 117 | <favorites_list name="AirA01b" /> |
121 | 118 | </component> |
122 | 119 | <component name="FileEditorManager"> |
123 | - <leaf /> | |
120 | + <leaf> | |
121 | + <file pinned="false" current-in-tab="true"> | |
122 | + <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java"> | |
123 | + <provider selected="true" editor-type-id="text-editor"> | |
124 | + <state relative-caret-position="455"> | |
125 | + <caret line="332" selection-start-line="332" selection-end-line="332" /> | |
126 | + <folding> | |
127 | + <element signature="imports" expanded="true" /> | |
128 | + </folding> | |
129 | + </state> | |
130 | + </provider> | |
131 | + </entry> | |
132 | + </file> | |
133 | + </leaf> | |
124 | 134 | </component> |
125 | 135 | <component name="FileTemplateManagerImpl"> |
126 | 136 | <option name="RECENT_TEMPLATES"> |
@@ -3237,9 +3247,9 @@ | ||
3237 | 3247 | <option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_select_all_grey_24dp.xml" /> |
3238 | 3248 | <option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" /> |
3239 | 3249 | <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> |
3250 | + <option value="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" /> | |
3251 | + <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" /> | |
3240 | 3252 | <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java" /> |
3241 | - <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" /> | |
3242 | - <option value="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" /> | |
3243 | 3253 | </list> |
3244 | 3254 | </option> |
3245 | 3255 | </component> |
@@ -3255,7 +3265,7 @@ | ||
3255 | 3265 | <foldersAlwaysOnTop value="true" /> |
3256 | 3266 | </navigator> |
3257 | 3267 | <panes> |
3258 | - <pane id="Scope" /> | |
3268 | + <pane id="PackagesPane" /> | |
3259 | 3269 | <pane id="ProjectPane"> |
3260 | 3270 | <subPane> |
3261 | 3271 | <expand> |
@@ -3323,7 +3333,7 @@ | ||
3323 | 3333 | <item name="src" type="462c0819:PsiDirectoryNode" /> |
3324 | 3334 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
3325 | 3335 | <item name="res" type="462c0819:PsiDirectoryNode" /> |
3326 | - <item name="drawable" type="462c0819:PsiDirectoryNode" /> | |
3336 | + <item name="layout" type="462c0819:PsiDirectoryNode" /> | |
3327 | 3337 | </path> |
3328 | 3338 | <path> |
3329 | 3339 | <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" /> |
@@ -3337,24 +3347,6 @@ | ||
3337 | 3347 | <path> |
3338 | 3348 | <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" /> |
3339 | 3349 | <item name="AirA01b" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> |
3340 | - <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> | |
3341 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
3342 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
3343 | - <item name="res" type="462c0819:PsiDirectoryNode" /> | |
3344 | - <item name="values" type="462c0819:PsiDirectoryNode" /> | |
3345 | - </path> | |
3346 | - <path> | |
3347 | - <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" /> | |
3348 | - <item name="AirA01b" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> | |
3349 | - <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> | |
3350 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
3351 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
3352 | - <item name="res" type="462c0819:PsiDirectoryNode" /> | |
3353 | - <item name="values-ja" type="462c0819:PsiDirectoryNode" /> | |
3354 | - </path> | |
3355 | - <path> | |
3356 | - <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" /> | |
3357 | - <item name="AirA01b" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> | |
3358 | 3350 | <item name="gradle" type="462c0819:PsiDirectoryNode" /> |
3359 | 3351 | </path> |
3360 | 3352 | </expand> |
@@ -3361,8 +3353,8 @@ | ||
3361 | 3353 | <select /> |
3362 | 3354 | </subPane> |
3363 | 3355 | </pane> |
3356 | + <pane id="Scope" /> | |
3364 | 3357 | <pane id="AndroidView" /> |
3365 | - <pane id="PackagesPane" /> | |
3366 | 3358 | </panes> |
3367 | 3359 | </component> |
3368 | 3360 | <component name="PropertiesComponent"> |
@@ -3835,13 +3827,6 @@ | ||
3835 | 3827 | <option name="presentableId" value="Default" /> |
3836 | 3828 | <updated>1469871562549</updated> |
3837 | 3829 | </task> |
3838 | - <task id="LOCAL-00145" summary="接続失敗時には、WIFI設定画面を開けるようにする。"> | |
3839 | - <created>1498144471222</created> | |
3840 | - <option name="number" value="00145" /> | |
3841 | - <option name="presentableId" value="LOCAL-00145" /> | |
3842 | - <option name="project" value="LOCAL" /> | |
3843 | - <updated>1498144471222</updated> | |
3844 | - </task> | |
3845 | 3830 | <task id="LOCAL-00146" summary="接続画面から、WIFI設定画面を開けるようにする。"> |
3846 | 3831 | <created>1499178893674</created> |
3847 | 3832 | <option name="number" value="00146" /> |
@@ -4178,7 +4163,14 @@ | ||
4178 | 4163 | <option name="project" value="LOCAL" /> |
4179 | 4164 | <updated>1552121796077</updated> |
4180 | 4165 | </task> |
4181 | - <option name="localTasksCounter" value="194" /> | |
4166 | + <task id="LOCAL-00194" summary="全選択・全選択解除を入れた(が、フィルターを気にせずに全選択する...)"> | |
4167 | + <created>1552124821534</created> | |
4168 | + <option name="number" value="00194" /> | |
4169 | + <option name="presentableId" value="LOCAL-00194" /> | |
4170 | + <option name="project" value="LOCAL" /> | |
4171 | + <updated>1552124821534</updated> | |
4172 | + </task> | |
4173 | + <option name="localTasksCounter" value="195" /> | |
4182 | 4174 | <servers /> |
4183 | 4175 | </component> |
4184 | 4176 | <component name="TodoView"> |
@@ -4192,6 +4184,7 @@ | ||
4192 | 4184 | </component> |
4193 | 4185 | <component name="ToolWindowManager"> |
4194 | 4186 | <frame x="63" y="-8" width="2505" height="1456" extended-state="6" /> |
4187 | + <editor active="true" /> | |
4195 | 4188 | <layout> |
4196 | 4189 | <window_info id="Image Layers" order="0" /> |
4197 | 4190 | <window_info id="Nl-Palette" order="1" /> |
@@ -4200,7 +4193,7 @@ | ||
4200 | 4193 | <window_info id="Captures" order="4" sideWeight="0.5040369" side_tool="true" weight="0.21384679" /> |
4201 | 4194 | <window_info id="Build Variants" order="5" sideWeight="0.5040369" side_tool="true" weight="0.21384679" /> |
4202 | 4195 | <window_info id="Capture Tool" order="6" /> |
4203 | - <window_info id="Favorites" order="7" sideWeight="0.08392435" side_tool="true" visible="true" weight="0.21384679" /> | |
4196 | + <window_info id="Favorites" order="7" sideWeight="0.08392435" side_tool="true" weight="0.21384679" /> | |
4204 | 4197 | <window_info id="Palette	" order="8" /> |
4205 | 4198 | <window_info anchor="bottom" id="Message" order="0" /> |
4206 | 4199 | <window_info anchor="bottom" id="Find" order="1" weight="0.33101314" /> |
@@ -4211,11 +4204,11 @@ | ||
4211 | 4204 | <window_info anchor="bottom" id="TODO" order="6" weight="0.32903227" /> |
4212 | 4205 | <window_info anchor="bottom" id="Android Profiler" order="7" weight="0.32946634" /> |
4213 | 4206 | <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.51249486" side_tool="true" weight="0.45839873" /> |
4214 | - <window_info anchor="bottom" id="Logcat" order="9" visible="true" weight="0.34570765" /> | |
4207 | + <window_info anchor="bottom" id="Logcat" order="9" weight="0.34570765" /> | |
4215 | 4208 | <window_info anchor="bottom" id="Android Monitor" order="10" sideWeight="0.4747798" weight="0.46310833" /> |
4216 | 4209 | <window_info anchor="bottom" id="Version Control" order="11" weight="0.3265306" /> |
4217 | 4210 | <window_info anchor="bottom" id="Terminal" order="12" weight="0.32903227" /> |
4218 | - <window_info anchor="bottom" id="Build" order="13" weight="0.32791957" /> | |
4211 | + <window_info anchor="bottom" id="Build" order="13" visible="true" weight="0.32791957" /> | |
4219 | 4212 | <window_info anchor="bottom" id="Gradle Console" order="14" sideWeight="0.50921756" side_tool="true" weight="0.46058732" /> |
4220 | 4213 | <window_info anchor="bottom" id="Messages" order="15" sideWeight="0.4875051" weight="0.20649652" /> |
4221 | 4214 | <window_info anchor="right" id="Properties" order="0" /> |
@@ -4244,7 +4237,6 @@ | ||
4244 | 4237 | <option name="myLimit" value="2678400000" /> |
4245 | 4238 | </component> |
4246 | 4239 | <component name="VcsManagerConfiguration"> |
4247 | - <MESSAGE value="次バージョン準備。" /> | |
4248 | 4240 | <MESSAGE value="プロパティの設定を、現在設定と違うものだけ設定するようにした。" /> |
4249 | 4241 | <MESSAGE value="Android7 で、動画ファイルの共有ができなかった不具合を修正する。" /> |
4250 | 4242 | <MESSAGE value="ビルドバージョンを更新する。" /> |
@@ -4269,7 +4261,8 @@ | ||
4269 | 4261 | <MESSAGE value="とりあえず動くものにした。" /> |
4270 | 4262 | <MESSAGE value="いきなりPlaybackモードが外れることがあったので、対策をうった。(一括ダウンロード時のみ)" /> |
4271 | 4263 | <MESSAGE value="ファイル名を一括ダウンロードと同じとなるように合わせこんだ。" /> |
4272 | - <option name="LAST_COMMIT_MESSAGE" value="ファイル名を一括ダウンロードと同じとなるように合わせこんだ。" /> | |
4264 | + <MESSAGE value="全選択・全選択解除を入れた(が、フィルターを気にせずに全選択する...)" /> | |
4265 | + <option name="LAST_COMMIT_MESSAGE" value="全選択・全選択解除を入れた(が、フィルターを気にせずに全選択する...)" /> | |
4273 | 4266 | </component> |
4274 | 4267 | <component name="editorHistoryManager"> |
4275 | 4268 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/logcat/LogCatUpdater.java"> |
@@ -4294,18 +4287,18 @@ | ||
4294 | 4287 | </provider> |
4295 | 4288 | </entry> |
4296 | 4289 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/column_load.xml"> |
4290 | + <provider editor-type-id="android-designer2" /> | |
4297 | 4291 | <provider selected="true" editor-type-id="text-editor" /> |
4298 | - <provider editor-type-id="android-designer2" /> | |
4299 | 4292 | </entry> |
4300 | 4293 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/column_save.xml"> |
4294 | + <provider editor-type-id="android-designer2" /> | |
4301 | 4295 | <provider selected="true" editor-type-id="text-editor" /> |
4302 | - <provider editor-type-id="android-designer2" /> | |
4303 | 4296 | </entry> |
4304 | 4297 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/column_save_bt.xml"> |
4298 | + <provider editor-type-id="android-designer2" /> | |
4305 | 4299 | <provider selected="true" editor-type-id="text-editor"> |
4306 | 4300 | <state relative-caret-position="-156" /> |
4307 | 4301 | </provider> |
4308 | - <provider editor-type-id="android-designer2" /> | |
4309 | 4302 | </entry> |
4310 | 4303 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/myolycameraprops/LoadSaveMyCameraPropertyDialog.java"> |
4311 | 4304 | <provider selected="true" editor-type-id="text-editor"> |
@@ -4315,60 +4308,60 @@ | ||
4315 | 4308 | </provider> |
4316 | 4309 | </entry> |
4317 | 4310 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_properties.xml"> |
4311 | + <provider editor-type-id="android-designer2" /> | |
4318 | 4312 | <provider selected="true" editor-type-id="text-editor"> |
4319 | 4313 | <state relative-caret-position="323"> |
4320 | 4314 | <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" /> |
4321 | 4315 | </state> |
4322 | 4316 | </provider> |
4323 | - <provider editor-type-id="android-designer2" /> | |
4324 | 4317 | </entry> |
4325 | 4318 | <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/debug_view.xml"> |
4319 | + <provider editor-type-id="android-designer2" /> | |
4326 | 4320 | <provider selected="true" editor-type-id="text-editor"> |
4327 | 4321 | <state relative-caret-position="204"> |
4328 | 4322 | <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" /> |
4329 | 4323 | </state> |
4330 | 4324 | </provider> |
4331 | - <provider editor-type-id="android-designer2" /> | |
4332 | 4325 | </entry> |
4333 | 4326 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/view_image_page.xml"> |
4327 | + <provider editor-type-id="android-designer2" /> | |
4334 | 4328 | <provider selected="true" editor-type-id="text-editor"> |
4335 | 4329 | <state relative-caret-position="85"> |
4336 | 4330 | <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" /> |
4337 | 4331 | </state> |
4338 | 4332 | </provider> |
4339 | - <provider editor-type-id="android-designer2" /> | |
4340 | 4333 | </entry> |
4341 | 4334 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_manipulate_image_view.xml"> |
4335 | + <provider editor-type-id="android-designer2" /> | |
4342 | 4336 | <provider selected="true" editor-type-id="text-editor"> |
4343 | 4337 | <state relative-caret-position="1581"> |
4344 | 4338 | <caret line="93" column="40" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="40" /> |
4345 | 4339 | </state> |
4346 | 4340 | </provider> |
4347 | - <provider editor-type-id="android-designer2" /> | |
4348 | 4341 | </entry> |
4349 | 4342 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_live_view.xml"> |
4343 | + <provider editor-type-id="android-designer2" /> | |
4350 | 4344 | <provider selected="true" editor-type-id="text-editor"> |
4351 | 4345 | <state relative-caret-position="102"> |
4352 | 4346 | <caret line="13" column="42" lean-forward="true" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" /> |
4353 | 4347 | </state> |
4354 | 4348 | </provider> |
4355 | - <provider editor-type-id="android-designer2" /> | |
4356 | 4349 | </entry> |
4357 | 4350 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_image_pager_view.xml"> |
4351 | + <provider editor-type-id="android-designer2" /> | |
4358 | 4352 | <provider selected="true" editor-type-id="text-editor"> |
4359 | 4353 | <state relative-caret-position="204"> |
4360 | 4354 | <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" /> |
4361 | 4355 | </state> |
4362 | 4356 | </provider> |
4363 | - <provider editor-type-id="android-designer2" /> | |
4364 | 4357 | </entry> |
4365 | 4358 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_connecting_view.xml"> |
4359 | + <provider editor-type-id="android-designer2" /> | |
4366 | 4360 | <provider selected="true" editor-type-id="text-editor"> |
4367 | 4361 | <state relative-caret-position="442"> |
4368 | 4362 | <caret line="26" column="39" lean-forward="true" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" /> |
4369 | 4363 | </state> |
4370 | 4364 | </provider> |
4371 | - <provider editor-type-id="android-designer2" /> | |
4372 | 4365 | </entry> |
4373 | 4366 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java"> |
4374 | 4367 | <provider selected="true" editor-type-id="text-editor"> |
@@ -4388,31 +4381,31 @@ | ||
4388 | 4381 | </provider> |
4389 | 4382 | </entry> |
4390 | 4383 | <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> |
4384 | + <provider editor-type-id="android-manifest" /> | |
4391 | 4385 | <provider selected="true" editor-type-id="text-editor"> |
4392 | 4386 | <state relative-caret-position="306"> |
4393 | 4387 | <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" /> |
4394 | 4388 | </state> |
4395 | 4389 | </provider> |
4396 | - <provider editor-type-id="android-manifest" /> | |
4397 | 4390 | </entry> |
4398 | 4391 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/view_grid_cell.xml"> |
4392 | + <provider editor-type-id="android-designer2" /> | |
4399 | 4393 | <provider selected="true" editor-type-id="text-editor"> |
4400 | 4394 | <state relative-caret-position="527"> |
4401 | 4395 | <caret line="31" column="35" selection-start-line="31" selection-start-column="35" selection-end-line="31" selection-end-column="35" /> |
4402 | 4396 | </state> |
4403 | 4397 | </provider> |
4404 | - <provider editor-type-id="android-designer2" /> | |
4405 | 4398 | </entry> |
4406 | 4399 | <entry file="file://$PROJECT_DIR$/app/src/main/res/color/setting_text_color.xml"> |
4407 | 4400 | <provider selected="true" editor-type-id="text-editor" /> |
4408 | 4401 | </entry> |
4409 | 4402 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/listarrayitems.xml"> |
4403 | + <provider editor-type-id="android-designer2" /> | |
4410 | 4404 | <provider selected="true" editor-type-id="text-editor"> |
4411 | 4405 | <state relative-caret-position="210"> |
4412 | 4406 | <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" /> |
4413 | 4407 | </state> |
4414 | 4408 | </provider> |
4415 | - <provider editor-type-id="android-designer2" /> | |
4416 | 4409 | </entry> |
4417 | 4410 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/ConfirmationDialog.java"> |
4418 | 4411 | <provider selected="true" editor-type-id="text-editor"> |
@@ -4434,6 +4427,7 @@ | ||
4434 | 4427 | </provider> |
4435 | 4428 | </entry> |
4436 | 4429 | <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_view_with_raw.xml"> |
4430 | + <provider editor-type-id="android-designer2" /> | |
4437 | 4431 | <provider selected="true" editor-type-id="text-editor"> |
4438 | 4432 | <state relative-caret-position="507"> |
4439 | 4433 | <caret line="47" column="59" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="59" /> |
@@ -4446,7 +4440,6 @@ | ||
4446 | 4440 | </folding> |
4447 | 4441 | </state> |
4448 | 4442 | </provider> |
4449 | - <provider editor-type-id="android-designer2" /> | |
4450 | 4443 | </entry> |
4451 | 4444 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ScalableImagePager.java"> |
4452 | 4445 | <provider selected="true" editor-type-id="text-editor"> |
@@ -4456,36 +4449,36 @@ | ||
4456 | 4449 | </provider> |
4457 | 4450 | </entry> |
4458 | 4451 | <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/movie_view.xml"> |
4452 | + <provider editor-type-id="android-designer2" /> | |
4459 | 4453 | <provider selected="true" editor-type-id="text-editor" /> |
4460 | - <provider editor-type-id="android-designer2" /> | |
4461 | 4454 | </entry> |
4462 | 4455 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> |
4456 | + <provider editor-type-id="android-designer2" /> | |
4463 | 4457 | <provider selected="true" editor-type-id="text-editor" /> |
4464 | - <provider editor-type-id="android-designer2" /> | |
4465 | 4458 | </entry> |
4466 | 4459 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragmant_camera_property.xml"> |
4460 | + <provider editor-type-id="android-designer2" /> | |
4467 | 4461 | <provider selected="true" editor-type-id="text-editor"> |
4468 | 4462 | <state relative-caret-position="343"> |
4469 | 4463 | <caret line="153" selection-start-line="153" selection-end-line="153" selection-end-column="36" /> |
4470 | 4464 | </state> |
4471 | 4465 | </provider> |
4472 | - <provider editor-type-id="android-designer2" /> | |
4473 | 4466 | </entry> |
4474 | 4467 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_entries.xml"> |
4468 | + <provider editor-type-id="android-designer2" /> | |
4475 | 4469 | <provider selected="true" editor-type-id="text-editor"> |
4476 | 4470 | <state relative-caret-position="187"> |
4477 | 4471 | <caret line="11" selection-start-line="11" selection-end-line="11" selection-end-column="33" /> |
4478 | 4472 | </state> |
4479 | 4473 | </provider> |
4480 | - <provider editor-type-id="android-designer2" /> | |
4481 | 4474 | </entry> |
4482 | 4475 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_camera_properties.xml"> |
4476 | + <provider editor-type-id="android-designer2" /> | |
4483 | 4477 | <provider selected="true" editor-type-id="text-editor"> |
4484 | 4478 | <state relative-caret-position="17"> |
4485 | 4479 | <caret line="1" column="14" selection-start-line="1" selection-end-line="6" /> |
4486 | 4480 | </state> |
4487 | 4481 | </provider> |
4488 | - <provider editor-type-id="android-designer2" /> | |
4489 | 4482 | </entry> |
4490 | 4483 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/MultiFileDownloadConfirmationDialog.java"> |
4491 | 4484 | <provider selected="true" editor-type-id="text-editor"> |
@@ -4498,12 +4491,12 @@ | ||
4498 | 4491 | </provider> |
4499 | 4492 | </entry> |
4500 | 4493 | <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_confirmation_batch_download.xml"> |
4494 | + <provider editor-type-id="android-designer2" /> | |
4501 | 4495 | <provider selected="true" editor-type-id="text-editor"> |
4502 | 4496 | <state relative-caret-position="527"> |
4503 | 4497 | <caret line="47" column="62" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="62" /> |
4504 | 4498 | </state> |
4505 | 4499 | </provider> |
4506 | - <provider editor-type-id="android-designer2" /> | |
4507 | 4500 | </entry> |
4508 | 4501 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ExifInformationDumper.java"> |
4509 | 4502 | <provider selected="true" editor-type-id="text-editor"> |
@@ -4519,14 +4512,6 @@ | ||
4519 | 4512 | </state> |
4520 | 4513 | </provider> |
4521 | 4514 | </entry> |
4522 | - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_image_grid_view.xml"> | |
4523 | - <provider selected="true" editor-type-id="text-editor"> | |
4524 | - <state relative-caret-position="46"> | |
4525 | - <caret line="3" column="39" lean-forward="true" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" /> | |
4526 | - </state> | |
4527 | - </provider> | |
4528 | - <provider editor-type-id="android-designer2" /> | |
4529 | - </entry> | |
4530 | 4515 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageDownloader.java"> |
4531 | 4516 | <provider selected="true" editor-type-id="text-editor"> |
4532 | 4517 | <state relative-caret-position="34"> |
@@ -4542,22 +4527,12 @@ | ||
4542 | 4527 | </provider> |
4543 | 4528 | </entry> |
4544 | 4529 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java"> |
4545 | - <provider selected="true" editor-type-id="text-editor"> | |
4546 | - <state> | |
4547 | - <folding> | |
4548 | - <element signature="e#4156#4433#0" expanded="true" /> | |
4549 | - <element signature="e#4432#4433#0" expanded="true" /> | |
4550 | - </folding> | |
4551 | - </state> | |
4552 | - </provider> | |
4530 | + <provider selected="true" editor-type-id="text-editor" /> | |
4553 | 4531 | </entry> |
4554 | 4532 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/logcat/LogCatFragment.java"> |
4555 | 4533 | <provider selected="true" editor-type-id="text-editor"> |
4556 | 4534 | <state relative-caret-position="202"> |
4557 | 4535 | <caret line="12" column="31" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" /> |
4558 | - <folding> | |
4559 | - <element signature="e#3643#3677#0" expanded="true" /> | |
4560 | - </folding> | |
4561 | 4536 | </state> |
4562 | 4537 | </provider> |
4563 | 4538 | </entry> |
@@ -4623,6 +4598,7 @@ | ||
4623 | 4598 | <provider selected="true" editor-type-id="images" /> |
4624 | 4599 | </entry> |
4625 | 4600 | <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml"> |
4601 | + <provider editor-type-id="android-designer2" /> | |
4626 | 4602 | <provider selected="true" editor-type-id="text-editor"> |
4627 | 4603 | <state relative-caret-position="561"> |
4628 | 4604 | <caret line="33" selection-start-line="33" selection-end-line="33" /> |
@@ -4631,28 +4607,33 @@ | ||
4631 | 4607 | </folding> |
4632 | 4608 | </state> |
4633 | 4609 | </provider> |
4634 | - <provider editor-type-id="android-designer2" /> | |
4635 | 4610 | </entry> |
4636 | 4611 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java"> |
4637 | 4612 | <provider selected="true" editor-type-id="text-editor"> |
4638 | - <state relative-caret-position="403"> | |
4639 | - <caret line="295" column="35" selection-start-line="295" selection-start-column="35" selection-end-line="295" selection-end-column="35" /> | |
4613 | + <state relative-caret-position="731"> | |
4614 | + <caret line="448" column="13" lean-forward="true" selection-start-line="448" selection-start-column="13" selection-end-line="448" selection-end-column="13" /> | |
4640 | 4615 | <folding> |
4641 | 4616 | <element signature="imports" expanded="true" /> |
4642 | - <element signature="e#15957#15958#0" expanded="true" /> | |
4643 | - <element signature="e#16006#16007#0" expanded="true" /> | |
4617 | + <element signature="e#17685#17686#0" expanded="true" /> | |
4618 | + <element signature="e#17734#17735#0" expanded="true" /> | |
4644 | 4619 | </folding> |
4645 | 4620 | </state> |
4646 | 4621 | </provider> |
4647 | 4622 | </entry> |
4623 | + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_image_grid_view.xml"> | |
4624 | + <provider editor-type-id="android-designer2" /> | |
4625 | + <provider selected="true" editor-type-id="text-editor"> | |
4626 | + <state relative-caret-position="335"> | |
4627 | + <caret line="20" column="43" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="43" /> | |
4628 | + </state> | |
4629 | + </provider> | |
4630 | + </entry> | |
4648 | 4631 | <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java"> |
4649 | 4632 | <provider selected="true" editor-type-id="text-editor"> |
4650 | - <state relative-caret-position="2737"> | |
4651 | - <caret line="168" column="9" selection-start-line="168" selection-start-column="9" selection-end-line="168" selection-end-column="9" /> | |
4633 | + <state relative-caret-position="455"> | |
4634 | + <caret line="332" selection-start-line="332" selection-end-line="332" /> | |
4652 | 4635 | <folding> |
4653 | 4636 | <element signature="imports" expanded="true" /> |
4654 | - <element signature="e#3081#3082#0" expanded="true" /> | |
4655 | - <element signature="e#3153#3154#0" expanded="true" /> | |
4656 | 4637 | </folding> |
4657 | 4638 | </state> |
4658 | 4639 | </provider> |
@@ -152,18 +152,13 @@ | ||
152 | 152 | } else if (id == R.id.action_select_all) { |
153 | 153 | try |
154 | 154 | { |
155 | - // 全選択 → 全選択解除 | |
156 | - if (contentListHolder.isAllSelected()) | |
157 | - { | |
158 | - contentListHolder.setAllSelection(false); | |
159 | - } | |
160 | - else | |
161 | - { | |
162 | - contentListHolder.setAllSelection(true); | |
163 | - } | |
155 | + // 全選択・全選択の解除 | |
156 | + contentListHolder.setResetAllSelection(); | |
164 | 157 | |
165 | - GridViewAdapter adapter = (GridViewAdapter) gridView.getAdapter(); | |
166 | - adapter.notifyDataSetChanged(); | |
158 | + // 画面表示の更新 | |
159 | + gridView.invalidateViews(); | |
160 | + //GridViewAdapter adapter = (GridViewAdapter) gridView.getAdapter(); | |
161 | + //adapter.notifyDataSetChanged(); | |
167 | 162 | } |
168 | 163 | catch (Exception e) |
169 | 164 | { |
@@ -283,6 +278,7 @@ | ||
283 | 278 | } |
284 | 279 | } |
285 | 280 | |
281 | + | |
286 | 282 | @Override |
287 | 283 | public void onPause() |
288 | 284 | { |
@@ -400,6 +396,9 @@ | ||
400 | 396 | |
401 | 397 | RadioButton checkDate = activity.findViewById(R.id.radio_date); |
402 | 398 | contentListHolder.setCondition(checkDate.isChecked(), label); |
399 | + | |
400 | + // アイテムの選択を落とす | |
401 | + contentListHolder.setAllSelection(false); | |
403 | 402 | } |
404 | 403 | refresh(false); |
405 | 404 | } catch (Exception e) { |
@@ -418,14 +417,17 @@ | ||
418 | 417 | public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) |
419 | 418 | { |
420 | 419 | Log.v(TAG, "onCheckedChanged : " + isChecked); |
421 | - try { | |
422 | - if (!isChecked) { | |
420 | + try | |
421 | + { | |
422 | + if (!isChecked) | |
423 | + { | |
423 | 424 | // do nothing! |
424 | 425 | return; |
425 | 426 | } |
426 | 427 | boolean dateChecked = (buttonView.getId() == R.id.radio_date); |
427 | 428 | FragmentActivity activity = getActivity(); |
428 | - if (activity != null) { | |
429 | + if (activity != null) | |
430 | + { | |
429 | 431 | Spinner categorySpinner = activity.findViewById(R.id.category_spinner); |
430 | 432 | |
431 | 433 | // パス一覧 / 日付一覧 |
@@ -439,10 +441,15 @@ | ||
439 | 441 | |
440 | 442 | contentListHolder.setCondition(dateChecked, "ALL"); |
441 | 443 | |
444 | + // アイテムの選択を落とす | |
445 | + contentListHolder.setAllSelection(false); | |
446 | + | |
442 | 447 | // 画面更新。 |
443 | 448 | refresh(false); |
444 | 449 | } |
445 | - } catch (Exception e) { | |
450 | + } | |
451 | + catch (Exception e) | |
452 | + { | |
446 | 453 | e.printStackTrace(); |
447 | 454 | } |
448 | 455 | } |
@@ -104,7 +104,7 @@ | ||
104 | 104 | * すべて選択されているか? |
105 | 105 | * |
106 | 106 | */ |
107 | - boolean isAllSelected() | |
107 | + private boolean isAllSelected() | |
108 | 108 | { |
109 | 109 | return (contentList.size() == getSelectedContentCount()); |
110 | 110 | } |
@@ -281,4 +281,88 @@ | ||
281 | 281 | Collections.sort(pathList, Collections.reverseOrder()); |
282 | 282 | return (pathList); |
283 | 283 | } |
284 | + | |
285 | + /** | |
286 | + * アイテムの選択状態をすべて設定する (フィルターも加味する) | |
287 | + * | |
288 | + */ | |
289 | + void setResetAllSelection() | |
290 | + { | |
291 | + if (label.equals("ALL")) | |
292 | + { | |
293 | + setAllSelection(!isAllSelected()); | |
294 | + } | |
295 | + else if (isDateFilter) | |
296 | + { | |
297 | + setResetAllSelectionWithDate(label); | |
298 | + } | |
299 | + else | |
300 | + { | |
301 | + setResetAllSelectionWithPath(label); | |
302 | + } | |
303 | + } | |
304 | + | |
305 | + /** | |
306 | + * アイテムの全選択・全選択解除を指定されているパスに関して設定する | |
307 | + * | |
308 | + */ | |
309 | + private void setResetAllSelectionWithPath(String path) | |
310 | + { | |
311 | + int itemCount = 0; | |
312 | + int checkedCount = 0; | |
313 | + for (OLYCameraContentInfoEx content : contentList) | |
314 | + { | |
315 | + if (path.equals(content.getFileInfo().getDirectoryPath())) | |
316 | + { | |
317 | + itemCount++; | |
318 | + if (content.isChecked()) | |
319 | + { | |
320 | + checkedCount++; | |
321 | + } | |
322 | + } | |
323 | + } | |
324 | + | |
325 | + boolean isChecked = (itemCount != checkedCount); | |
326 | + for (OLYCameraContentInfoEx content : contentList) | |
327 | + { | |
328 | + if (path.equals(content.getFileInfo().getDirectoryPath())) | |
329 | + { | |
330 | + content.setChecked(isChecked); | |
331 | + } | |
332 | + } | |
333 | + } | |
334 | + | |
335 | + /** | |
336 | + * アイテムの全選択・全選択解除を指定されている日付に関して設定する | |
337 | + * | |
338 | + */ | |
339 | + private void setResetAllSelectionWithDate(String dateLabel) | |
340 | + { | |
341 | + int itemCount = 0; | |
342 | + int checkedCount = 0; | |
343 | + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd", Locale.ENGLISH); | |
344 | + for (OLYCameraContentInfoEx content : contentList) | |
345 | + { | |
346 | + String capturedDate = format.format(content.getFileInfo().getDatetime()); | |
347 | + if (dateLabel.equals(capturedDate)) | |
348 | + { | |
349 | + itemCount++; | |
350 | + if (content.isChecked()) | |
351 | + { | |
352 | + checkedCount++; | |
353 | + } | |
354 | + } | |
355 | + } | |
356 | + | |
357 | + boolean isChecked = (itemCount != checkedCount); | |
358 | + for (OLYCameraContentInfoEx content : contentList) | |
359 | + { | |
360 | + String capturedDate = format.format(content.getFileInfo().getDatetime()); | |
361 | + if (dateLabel.equals(capturedDate)) | |
362 | + { | |
363 | + content.setChecked(isChecked); | |
364 | + } | |
365 | + } | |
366 | + } | |
367 | + | |
284 | 368 | } |