diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index e06e293..38fe66f 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 6ceea08..7dae684 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,12 +5,6 @@ - - - - - - @@ -22,7 +16,14 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 954b995..df9f9d6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,16 +3,20 @@ package="org.ntlab.irisclient"> + + android:theme="@style/Theme.IrisClient" + android:usesCleartextTraffic="true"> + + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index 4575e47..b3ad02c 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -1,14 +1,36 @@ package org.ntlab.irisclient; import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; import android.os.Bundle; +import org.ntlab.irisclient.viewmodels.DrawingStateViewModel; + public class DrawingActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_drawing); + DrawingStateViewModel drawingStateViewModel = new ViewModelProvider(this).get(DrawingStateViewModel.class); + + drawingStateViewModel.getDno().observe(this, new Observer() { + private Integer dno; + @Override + public void onChanged(Integer dno) { + this.dno = dno; + } + }); + + drawingStateViewModel.getState().observe(this, new Observer() { + private Integer state; + @Override + public void onChanged(Integer state) { + this.state = state; + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/GameActivity.java b/app/src/main/java/org/ntlab/irisclient/GameActivity.java new file mode 100644 index 0000000..1ecac8f --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/GameActivity.java @@ -0,0 +1,14 @@ +package org.ntlab.irisclient; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class GameActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_game); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml new file mode 100644 index 0000000..eb05557 --- /dev/null +++ b/app/src/main/res/layout/activity_game.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file