MainActivity natty #139

Merged h-nishimura merged 11 commits into nitta-lab-2025:master from nitta-lab-2025:mainActivity_natty on 30 Oct 2025

2025-10-30	8627ce0 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty n-morii committed on 30 Oct 2025
	25e610b Browse files » MainActivityでアクティビティが更新順になるように調整した。 n-morii committed on 30 Oct 2025
	d4c9fe9 Browse files » Merge branch 'master' into mainActivity_natty ... # Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java n-morii committed on 30 Oct 2025
	77b545e Browse files » MainActivityでアクティビティが更新順になるように調整中 n-morii committed on 30 Oct 2025
	80173f7 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty n-morii committed on 30 Oct 2025
	7429dab Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty n-morii committed on 30 Oct 2025
	35f6a71 Browse files » MainActivityでアクティビティが更新順になるように調整中 n-morii committed on 30 Oct 2025
	537c601 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty n-morii committed on 30 Oct 2025
2025-10-28	f3be082 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty n-morii committed on 28 Oct 2025
	8f3e907 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty n-morii committed on 28 Oct 2025
	5755cb1 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty n-morii committed on 28 Oct 2025