Merge pull request #301 from nitta-lab-2021/kuraoka_ad
マージします!!!!
commit 5dd3d563e9630df96d8670a131220adfcb4901f4
2 parents d31a9a9 + 18b7f3d
fujii kouta authored on 4 Nov 2021
Showing 3 changed files
View
15
.idea/misc.xml
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Users/Student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_home.xml" value="0.1" />
<entry key="..\:/Users/student/AndroidStudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_create.xml" value="0.14175724637681159" />
<entry key="..\:/Users/student/AndroidStudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_edit.xml" value="0.14175724637681159" />
<entry key="..\:/Users/student/AndroidStudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_edit_header.xml" value="0.14175724637681159" />
<entry key="..\:/Users/student/AndroidStudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_follow_list.xml" value="0.14175724637681159" />
<entry key="..\:/Users/student/AndroidStudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_home.xml" value="0.14175724637681159" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/flame_style.xml" value="0.3907407407407407" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/frame_style.xml" value="0.3907407407407407" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_add.xml" value="0.45487179487179485" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_border_color.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_fast_forward_24.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_fast_rewind.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_group_add.xml" value="0.45487179487179485" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml" value="0.45487179487179485" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml" value="0.45487179487179485" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml" value="0.45487179487179485" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_library_add.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_palette_24.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_pause.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_pending.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_baseline_west.xml" value="0.3824074074074074" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/drawable/ic_paint_tool_button.xml" value="0.2712962962962963" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_animation.xml" value="0.22870370370370371" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_animation_detail.xml" value="0.360054347826087" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_follow_follower.xml" value="0.307518115942029" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_follow_list.xml" value="0.33469202898550726" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_follower_list.xml" value="0.33469202898550726" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_invite.xml" value="0.3596014492753623" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_login_screen.xml" value="0.3596014492753623" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_title.xml" value="0.37318840579710144" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_userpage.xml" value="0.3596014492753623" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_work_list.xml" value="0.32382246376811596" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/animation_home.xml" value="0.2674772036474164" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/follow_or_follower_list.xml" value="0.307518115942029" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_create.xml" value="0.37318840579710144" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_edit.xml" value="0.18362282878411912" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_edit_header.xml" value="0.307518115942029" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_follow_list.xml" value="0.307518115942029" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_follower_list.xml" value="0.307518115942029" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_home.xml" value="0.37318840579710144" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_mypage.xml" value="0.2674772036474164" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_search.xml" value="0.37318840579710144" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_test.xml" value="0.32382246376811596" />
View
7
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java
package org.ntlab.acanthus_client.views.main_menu_ui.create;
 
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
 
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
Button appButton = view.findViewById(R.id.Paint_button_create);
ImageButton nittasiteButton = view.findViewById(R.id.nittalabimage);
 
//ダミーユーザー
 
 
createViewModel.getAidJson().observe(getViewLifecycleOwner(), list -> {
acanthus.setAid(createViewModel.getAidJson().getValue().getAid());
});
 
nittasiteButton.setOnClickListener(v -> {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://silverbullet.is.konan-u.ac.jp/"));
startActivity(intent);
});
 
 
}
 
View
app/src/main/res/layout/fragment_create.xml