Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-kapt'

apply plugin: 'kotlin-android-extensions'

android {
Expand All @@ -24,7 +26,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="undefined.dsm.getterra">
<uses-permission android:name="android.permission.INTERNET" />


<application
android:allowBackup="true"
Expand All @@ -16,6 +18,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ui.QuizMainActivity" ></activity>
<activity android:name=".ui.CorrectionMainActivity"></activity>
</application>

</manifest>
25 changes: 25 additions & 0 deletions app/src/main/java/undefined/dsm/getterra/connecter/API.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package undefined.dsm.getterra.connecter;



import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.Header;
import retrofit2.http.POST;
import retrofit2.http.Path;


public interface API {
@GET("Solve/solve/{boothName}")
Call<GetSolve> getSolve (
@Header("") String Authorization,
@Path("boothName") String boothName
);
@POST("Solve/solve/{boothCode}")
Call<PostSolve> postSolve(
@Header("") String Authorization,
@Path("boothCode") String boothCode,
@Body problemIdAnswer PA
);
}
9 changes: 0 additions & 9 deletions app/src/main/java/undefined/dsm/getterra/connecter/API.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import okhttp3.logging.HttpLoggingInterceptor
import retrofit2.Retrofit
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import retrofit2.converter.gson.GsonConverterFactory
import undefined.dsm.getterra.connecter.API

object Connecter {
lateinit var retrofit: Retrofit
Expand All @@ -17,7 +18,7 @@ object Connecter {

retrofit = Retrofit
.Builder()
.baseUrl("http://ec2-52-79-240-33.ap-northeast-2.compute.amazonaws.com/api/")
.baseUrl("https://ec2.istruly.sexy:1234/")
.addConverterFactory(GsonConverterFactory.create())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.client(client)
Expand Down
43 changes: 43 additions & 0 deletions app/src/main/java/undefined/dsm/getterra/connecter/GetSolve.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package undefined.dsm.getterra.connecter;

import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

public class GetSolve {
@SerializedName("boothName")
@Expose
private String boothName;
@SerializedName("problemId")
@Expose
private String problemId;
@SerializedName("question")
@Expose
private String question;
@SerializedName("problemType")
@Expose
private int problemType;
@SerializedName("choices")
@Expose
private String[] choices;

public String getBoothName() {
return boothName;
}

public String getQuestion() {
return question;
}

public int getProblemType() {
return problemType;
}

public String[] getChoices() {
return choices;
}

public String getProblemId()
{
return problemId;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package undefined.dsm.getterra.connecter;

public class PostSolve {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package undefined.dsm.getterra.connecter;

public class problemIdAnswer {
String problemId, answer;
public problemIdAnswer(String a, String b)
{
problemId = a;
answer = b;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package undefined.dsm.getterra.ui;

import android.app.Activity;

import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;

import undefined.dsm.getterra.R;


public class CorrectionMainActivity extends AppCompatActivity {
Activity quizActivity = QuizMainActivity._QuizMainActivity;
View correctionBackground;
TextView goToBack;
TextView isAnswerTrue_tv;
TextView clubName;
String boothName;
boolean isAnswerTrue;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_correction_main);
Intent intent = getIntent();
boothName = intent.getStringExtra("boothName");
isAnswerTrue = intent.getBooleanExtra("isAnswerTrue",true);
correctionBackground = findViewById(R.id.correction_background);
goToBack = (TextView)findViewById(R.id.correction_gotoback_tv);
isAnswerTrue_tv = (TextView)findViewById(R.id.correction_isanswertrue_tv);
clubName = (TextView)findViewById(R.id.correction_clubname_tv);
setBackGroundColor();
}
public void goToMain(View v)
{
quizActivity.finish();
finish();
}
public void backToResolve(View v)
{
finish();
}
public void setBackGroundColor()
{
clubName.setText(boothName);//동아리이름. 레트로핏 서버연동 필요

if(isAnswerTrue){ // 정답이 맞으면
correctionBackground.setBackgroundColor(0xfffff5f5);
isAnswerTrue_tv.setText("정답!");
goToBack.setTextColor(0xffffb587);
}
else{
correctionBackground.setBackgroundColor(0xffd4e5ff);
isAnswerTrue_tv.setText("오답");
goToBack.setTextColor(0xff84b6ff);
// 점령시켰다는 메세지 서버에 보내기.
}
}
}
6 changes: 4 additions & 2 deletions app/src/main/java/undefined/dsm/getterra/ui/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package undefined.dsm.getterra.ui

import android.content.Intent
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import undefined.dsm.getterra.R

class MainActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
var intent : Intent = Intent(this,QuizMainActivity::class.java)
startActivity(intent)
}
}
}
87 changes: 87 additions & 0 deletions app/src/main/java/undefined/dsm/getterra/ui/OXFragment.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package undefined.dsm.getterra.ui;

import android.content.Context;

import android.support.v4.app.Fragment;
import android.os.Bundle;

import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import undefined.dsm.getterra.R;

public class OXFragment extends Fragment {
TextView o, x;
boolean b[] = new boolean[2];
public OXFragment(){

}

public interface SendDataOX{
void sendDataOX(boolean OX[]);
}

private SendDataOX sendDataOX;

@Override
public void onAttach(Context context)
{
super.onAttach(context);
if(context instanceof SendDataOX){
sendDataOX = (SendDataOX) context;
} else{
throw new RuntimeException(context.toString() + "must implement");
}
}

@Override
public void onDetach(){
super.onDetach();
sendDataOX = null;
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
b[0] = false; b[1] = false;
View view = inflater.inflate(R.layout.fragment_ox, container, false);
o = view.findViewById(R.id.quiz_answeriso_btn);
x = view.findViewById(R.id.quiz_answerisx_btn);

View.OnClickListener listener = new View.OnClickListener()
{
@Override
public void onClick(View v)
{
switch (v.getId())
{
case R.id.quiz_answeriso_btn:
b[0] = true; b[1] = false; break;
case R.id.quiz_answerisx_btn:
b[0] = false; b[1] = true;break;
}
sendDataOX.sendDataOX(b);
selectAnimation(o, b[0]);
selectAnimation(x, b[1]);
}
};
o.setOnClickListener(listener);
x.setOnClickListener(listener);
return view;
}
public void selectAnimation(TextView t, boolean b){
if(b==true)
{
t.setTextColor(0xffffffff);
t.setBackgroundColor(0xffffb587);
t.setBackgroundResource(R.drawable.round_background_reverse);
}
else
{
t.setTextColor(0xffffb587);
t.setBackgroundColor(0xffffffff);
t.setBackgroundResource(R.drawable.round_background);
}
}
}
Loading