diff --git a/.idea/misc.xml b/.idea/misc.xml index 5dfb9c6..a4a179a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,22 +3,24 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aaab359..153311b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,6 +25,7 @@ + parent, View view, int position, long id) { + Intent intent = new Intent( + this.getApplicationContext(), PaintActivity.class); + + // clickされたpositionのtextとphotoのID + String selectedText = scenes[position]; + // インテントにセット + intent.putExtra("Text", selectedText); + + // SubActivityへ遷移 + startActivity(intent); + } + + //----------------------------------------------------------------- + // init + private void init() { + Acanthus acanthus = (Acanthus) getApplication(); + inviteViewModel = new ViewModelProvider(this).get(InviteViewModel.class); + } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java new file mode 100644 index 0000000..7de98da --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java @@ -0,0 +1,8 @@ +package org.ntlab.acanthus_client.views.paint; + +import androidx.lifecycle.ViewModel; + +public class InviteViewModel extends ViewModel { + + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java new file mode 100644 index 0000000..c4c0adf --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java @@ -0,0 +1,70 @@ +package org.ntlab.acanthus_client.views.paint; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.TextView; + +import org.ntlab.acanthus_client.R; + +public class ListViewAdapter extends BaseAdapter { + + static class ViewHolder { + TextView textView; + } + + private LayoutInflater inflater; + private int itemLayoutId; + private String[] titles; + private int[] ids; + + ListViewAdapter(Context context, int itemLayoutId, + String[] scenes) { + super(); + this.inflater = (LayoutInflater) + context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + this.itemLayoutId = itemLayoutId; + this.titles = scenes; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ViewHolder holder; + // 最初だけ View を inflate して、それを再利用する + if (convertView == null) { + // activity_main.xml に list.xml を inflate して convertView とする + convertView = inflater.inflate(itemLayoutId, parent, false); + // ViewHolder を生成 + holder = new ViewHolder(); + holder.textView = convertView.findViewById(R.id.textView); + convertView.setTag(holder); + } + // holder を使って再利用 + else { + holder = (ViewHolder) convertView.getTag(); + } + + // 現在の position にあるファイル名リストを holder の textView にセット + holder.textView.setText(titles[position]); + + return convertView; + } + + @Override + public int getCount() { + // texts 配列の要素数 + return titles.length; + } + + @Override + public Object getItem(int position) { + return null; + } + + @Override + public long getItemId(int position) { + return 0; + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java new file mode 100644 index 0000000..4ce2f5c --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java @@ -0,0 +1,34 @@ +package org.ntlab.acanthus_client.views.userpage; + +import android.os.Bundle; +import android.widget.Button; +import android.widget.TextView; + +import org.ntlab.acanthus_client.R; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.ViewModelProvider; + +public class UserPageActivity extends AppCompatActivity { + + private UserPageViewModel userPageViewModel; + + @Override + protected void onCreate(Bundle savedInstanceState){ + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_userpage); + + userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); + + TextView userName = findViewById(R.id.userNameText); + TextView profileText = findViewById(R.id.profileText); + + Button returnButton = findViewById(R.id.returnButton); + Button followUserButton = findViewById(R.id.followUserButton); + Button followButton = findViewById(R.id.followButton); + Button followerButton = findViewById(R.id.followerButton); + Button animationListButton = findViewById(R.id.animationListButton); + + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java new file mode 100644 index 0000000..081b9a9 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java @@ -0,0 +1,9 @@ +package org.ntlab.acanthus_client.views.userpage; + +import androidx.lifecycle.ViewModel; + +public class UserPageViewModel extends ViewModel { + + + +} diff --git a/app/src/main/res/drawable/headshot_reasonably_small_400x400.png b/app/src/main/res/drawable/headshot_reasonably_small_400x400.png new file mode 100644 index 0000000..1545dc1 --- /dev/null +++ b/app/src/main/res/drawable/headshot_reasonably_small_400x400.png Binary files differ diff --git a/app/src/main/res/drawable/higeorgie.png b/app/src/main/res/drawable/higeorgie.png new file mode 100644 index 0000000..91295d0 --- /dev/null +++ b/app/src/main/res/drawable/higeorgie.png Binary files differ diff --git a/app/src/main/res/layout/activity_invite.xml b/app/src/main/res/layout/activity_invite.xml new file mode 100644 index 0000000..078cc4a --- /dev/null +++ b/app/src/main/res/layout/activity_invite.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_paint.xml b/app/src/main/res/layout/activity_paint.xml index b799275..93059f5 100644 --- a/app/src/main/res/layout/activity_paint.xml +++ b/app/src/main/res/layout/activity_paint.xml @@ -85,5 +85,21 @@ app:labelVisibilityMode="labeled" app:menu="@menu/bottom_nav_paint" /> +