Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Questionnaire page #401

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a97d8ef
Start implementing questionnaire page
shiraji Feb 28, 2017
090c23c
[WIP] Add fields for API
gen0083 Mar 1, 2017
bfef726
[Revert this] downgrade gradle plugin to 2.2.3
gen0083 Mar 1, 2017
ce8beaa
Add QuestionnaireView
gen0083 Mar 2, 2017
86e5013
[WIP]Post test data
gen0083 Mar 2, 2017
2dbf397
Add new questions and fix test data
shiraji Mar 2, 2017
7103a90
Merge pull request #395 from shiraji/shiraji/77_g_questionnaire
konifar Mar 2, 2017
0878209
Delete useless comments
shiraji Mar 2, 2017
775bb12
Start adding questionnaire strings
shiraji Mar 2, 2017
0484fa7
Fix duplicate resource name
gen0083 Mar 2, 2017
af080f8
Update Android Studio to 2.3
gen0083 Mar 3, 2017
94cd2ee
Implement DataBinding
gen0083 Mar 3, 2017
9036d45
Add view of questionnaire type EditText
gen0083 Mar 3, 2017
2607463
Remove unnecessary log
gen0083 Mar 3, 2017
5940ad1
Add option that questionnaire has other field
gen0083 Mar 3, 2017
643fd78
Check QuestionnaireTextInputView works correctly?
gen0083 Mar 3, 2017
9e83c58
Rename variables
gen0083 Mar 4, 2017
9a7b541
Add Questionnaire item using CheckBox with multiple select
gen0083 Mar 4, 2017
0cfd4fc
Add questionnaire item type ranking using FeedbackRankingView
gen0083 Mar 4, 2017
4ab8dad
Implement other option in QuestionnaireRadioView
gen0083 Mar 4, 2017
4377c8a
Change questionnaire description to nullable
gen0083 Mar 4, 2017
112295b
Replace Callback with ResourceResolver/Navigator
shiraji Mar 4, 2017
91de869
Put QuestionnaireViews to questionnaire fragment
gen0083 Mar 4, 2017
f4072a8
Merge remote-tracking branch 'origin/questionnaire_view' into questio…
gen0083 Mar 4, 2017
1ef556e
Fix typo
gen0083 Mar 4, 2017
ad16d3f
Welcome back web link :wink:
shiraji Mar 4, 2017
514db5e
Fix bug crashing app when EditText in other field clicked
gen0083 Mar 4, 2017
8d8c655
Remove unnecessary comments/logs
gen0083 Mar 4, 2017
0af21be
Merge pull request #397 from gen0083/questionnaire_view
konifar Mar 5, 2017
c44b586
Merge branch 'master' into questionnaire
konifar Mar 6, 2017
1812e77
Refactored questionnaire view
konifar Mar 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
import java.util.ArrayList;

import io.github.droidkaigi.confsched2017.R;
import timber.log.Timber;

/**
* Copyright 2017 G-CREATE
@@ -88,7 +87,6 @@ public void onClick(View v) {
} else {
checkedList.remove(values[id]);
}
Timber.d("selected:%d", getMultipleValue().length);
if (itemChangedListener != null) {
itemChangedListener.onCheckedItemChanged();
}
Original file line number Diff line number Diff line change
@@ -32,14 +32,12 @@ public QuestionnaireRankingView(Context context, AttributeSet attrs, int defStyl
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
Timber.d("attached to window");
rankingView.addListener(currentRankingChangedListener);
}

@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
Timber.d("detached from window");
rankingView.removeListener(currentRankingChangedListener);
}
}
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ public void onClickSponsors(@SuppressWarnings("unused") View view) {
}

public void onClickQuestionnaire(@SuppressWarnings("unused") View view) {
navigator.navigateToQuestionnairePage();
navigator.navigateToWebPage("https://docs.google.com/forms/d/1SNBvJernnyBwglNentXxpdSUkWI9U6umWdDs4Na8OIU/viewform?edit_requested=true");
}

public void onClickContributors(@SuppressWarnings("unused") View view) {
Original file line number Diff line number Diff line change
@@ -42,12 +42,10 @@ public void destroy() {

public void onClickSubmitQuestionnaireButton(@SuppressWarnings("unused") View view) {
// TODO: replace real data
// TODO: 連続クリック時の制御
// droidKaigiClient.submitQuestionnaire(Questionnaire.createTestData())
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe((response) -> Timber.d("submit success\n%s", response), Timber::e);
// TODO: delete this (only in developing)
Timber.d("test questionnaire=%s", questionnaire);
}