MainActivity natty #79

Merged s-yamagiwa merged 6 commits into nitta-lab-2025:master from nitta-lab-2025:mainActivity_natty 7 days ago

2025-10-14	386a606 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 7 days ago
	c791975 Browse files » MainActivityでフレンドのアイコンコメントを表示させるのと、通知が来たときの疑似的な処理を書きました n-morii committed 7 days ago
	7e90e35 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 ... # Conflicts: # app/src/main/res/values/colors.xml n-morii committed 7 days ago
	123bd0b Browse files » MainActivityでフレンドのアイコンコメントを表示させるのと、通知が来たときの疑似的な処理を書きました n-morii committed 7 days ago
2025-10-02	266b633 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 ... # Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java n-morii committed 19 days ago
2025-10-02	c392829 Browse files » MainActivityでフレンドのアイコンコメントを表示させるのと、通知が来たときの疑似的な処理を書きました n-morii committed 19 days ago