OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

PKRemote: Commit

Pentax DSLR Remote Control app.


Commit MetaInfo

Revisiond0a3d5886c3499119270867e136d633fa094e7f5 (tree)
Time2019-03-22 00:05:55
AuthorMRSa <mrsa@myad...>
CommiterMRSa

Log Message

画像部を長押しすることで、カレンダーを開けるようにしてみた。

Change Summary

Incremental Difference

--- a/app/src/main/java/net/osdn/gokigen/pkremote/MainActivity.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/MainActivity.java
@@ -51,7 +51,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
5151 public boolean onNavigationItemSelected(@NonNull MenuItem item) {
5252 switch (item.getItemId()) {
5353 case R.id.navigation_photo_library:
54- //
5554 scenceUpdater.changeScenceToImageList();
5655 return (true);
5756 case R.id.navigation_calendar:
@@ -72,6 +71,27 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
7271 *
7372 */
7473 @Override
74+ public void onBackPressed()
75+ {
76+ //Log.v(TAG, "onBackPressed()");
77+ super.onBackPressed();
78+ runOnUiThread(new Runnable() {
79+ @Override
80+ public void run()
81+ {
82+ if (scenceUpdater != null)
83+ {
84+ scenceUpdater.updateBottomNavigationMenu();
85+ }
86+ }
87+ });
88+ }
89+
90+ /**
91+ *
92+ *
93+ */
94+ @Override
7595 protected void onCreate(Bundle savedInstanceState)
7696 {
7797 super.onCreate(savedInstanceState);
--- a/app/src/main/java/net/osdn/gokigen/pkremote/calendar/CalendarFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/calendar/CalendarFragment.java
@@ -277,7 +277,6 @@ public class CalendarFragment extends Fragment implements View.OnClickListener,
277277 public void onResume()
278278 {
279279 super.onResume();
280-
281280 fragmentIsActive = true;
282281 }
283282
--- a/app/src/main/java/net/osdn/gokigen/pkremote/logcat/LogCatFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/logcat/LogCatFragment.java
@@ -11,7 +11,8 @@ import android.view.View;
1111 import android.view.ViewGroup;
1212 import android.widget.ArrayAdapter;
1313 import android.widget.ListView;
14-import android.widget.Toast;
14+
15+import com.google.android.material.snackbar.Snackbar;
1516
1617 import net.osdn.gokigen.pkremote.R;
1718
@@ -118,7 +119,8 @@ public class LogCatFragment extends ListFragment
118119 view.setSelection(dataItems.size());
119120
120121 // 更新終了通知
121- Toast.makeText(getActivity(), getString(R.string.finish_refresh), Toast.LENGTH_SHORT).show();
122+ Snackbar.make(activity.findViewById(R.id.fragment1), getString(R.string.finish_refresh), Snackbar.LENGTH_SHORT).show();
123+ //Toast.makeText(getActivity(), getString(R.string.finish_refresh), Toast.LENGTH_SHORT).show();
122124 }
123125 catch (Exception ee)
124126 {
--- a/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
@@ -74,6 +74,7 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
7474 private ImageGridViewAdapter adapter = null;
7575 private String filterLabel = null;
7676 private int currentSelectedIndex = 0;
77+ private boolean fragmentIsActive = false;
7778
7879
7980 public static ImageGridViewFragment newInstance(@NonNull IInterfaceProvider interfaceProvider)
@@ -179,6 +180,7 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
179180 {
180181 super.onResume();
181182 Log.v(TAG, "onResume() Start");
183+ fragmentIsActive = true;
182184 AppCompatActivity activity = (AppCompatActivity)getActivity();
183185 if (activity != null)
184186 {
@@ -276,6 +278,7 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
276278 public void onPause()
277279 {
278280 Log.v(TAG, "onPause() Start");
281+ fragmentIsActive = false;
279282 try
280283 {
281284 /*
@@ -310,6 +313,12 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
310313 Log.v(TAG, "onPause() End");
311314 }
312315
316+ public boolean isFragmentActive()
317+ {
318+ return (fragmentIsActive);
319+ }
320+
321+
313322 @Override
314323 public void onStop()
315324 {
--- a/app/src/main/java/net/osdn/gokigen/pkremote/scene/CameraSceneUpdater.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/scene/CameraSceneUpdater.java
@@ -38,7 +38,6 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
3838 private PreferenceFragmentCompat preferenceFragment = null;
3939 private LogCatFragment logCatFragment = null;
4040 private CalendarFragment calendarFragment = null;
41-
4241 private ImageGridViewFragment gridViewFragment = null;
4342
4443 public static CameraSceneUpdater newInstance(@NonNull AppCompatActivity activity)
@@ -239,7 +238,8 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
239238
240239 // IChangeScene
241240 @Override
242- public void changeSceneToCameraPropertyList() {
241+ public void changeSceneToCameraPropertyList()
242+ {
243243 /*
244244 try
245245 {
@@ -285,7 +285,8 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
285285
286286 // IChangeScene
287287 @Override
288- public void changeSceneToConfiguration() {
288+ public void changeSceneToConfiguration()
289+ {
289290 try {
290291 if (preferenceFragment == null) {
291292 try {
@@ -317,7 +318,8 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
317318
318319 // IChangeScene
319320 @Override
320- public void changeCameraConnection() {
321+ public void changeCameraConnection()
322+ {
321323 if (interfaceProvider == null) {
322324 Log.v(TAG, "changeCameraConnection() : interfaceProvider is NULL");
323325 return;
@@ -342,8 +344,10 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
342344
343345 // IChangeScene
344346 @Override
345- public void reloadRemoteImageContents() {
346- try {
347+ public void reloadRemoteImageContents()
348+ {
349+ try
350+ {
347351 ICameraContentsRecognizer recognizer = interfaceProvider.getCameraContentsRecognizer();
348352 if (recognizer != null) {
349353 // カメラ内のコンテンツ一覧を作成するように指示する
@@ -356,7 +360,8 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
356360
357361 // IChangeScene
358362 @Override
359- public void changeSceneToDebugInformation() {
363+ public void changeSceneToDebugInformation()
364+ {
360365 if (logCatFragment == null) {
361366 logCatFragment = LogCatFragment.newInstance();
362367 }
@@ -369,7 +374,8 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
369374
370375 // IChangeScene
371376 @Override
372- public void changeSceneToApiList() {
377+ public void changeSceneToApiList()
378+ {
373379 /*
374380 if (sonyApiListFragmentSony == null)
375381 {
@@ -385,8 +391,10 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
385391
386392 // IChangeScene
387393 @Override
388- public void changeSceneToCalendar() {
389- if (calendarFragment == null) {
394+ public void changeSceneToCalendar()
395+ {
396+ if (calendarFragment == null)
397+ {
390398 calendarFragment = CalendarFragment.newInstance(activity, this, interfaceProvider);
391399 }
392400 FragmentTransaction transaction = activity.getSupportFragmentManager().beginTransaction();
@@ -459,6 +467,32 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene,
459467 }
460468
461469 @Override
470+ public void updateBottomNavigationMenu()
471+ {
472+ try
473+ {
474+ // ナビゲーション部分の選択状態をしたい...
475+ int changeId = 0;
476+ if (calendarFragment.isFragmentActive())
477+ {
478+ changeId = R.id.navigation_calendar;
479+ }
480+ else if (gridViewFragment.isFragmentActive())
481+ {
482+ changeId = R.id.navigation_photo_library;
483+ }
484+ if ((bottomNavigationView != null)&&(changeId != 0))
485+ {
486+ bottomNavigationView.setSelectedItemId(changeId);
487+ }
488+ }
489+ catch (Exception e)
490+ {
491+ e.printStackTrace();
492+ }
493+ }
494+
495+ @Override
462496 public void setAnotherStatusReceiver(ICameraStatusReceiver statusReceiver)
463497 {
464498 this.anotherStatusReceiver = statusReceiver;
--- a/app/src/main/java/net/osdn/gokigen/pkremote/scene/IChangeScene.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/scene/IChangeScene.java
@@ -18,4 +18,5 @@ public interface IChangeScene
1818 void exitApplication();
1919 void reloadRemoteImageContents();
2020 void setAnotherStatusReceiver(ICameraStatusReceiver statusReceiver);
21+ void updateBottomNavigationMenu();
2122 }
Show on old repository browser