diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..cd711a0
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a291fb3..2484353 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 7eeb974..e45276e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,6 +26,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+
+ buildFeatures {
+ dataBinding true
+ }
}
dependencies {
@@ -36,4 +40,5 @@ dependencies {
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a1b06f5..f4a7cb1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.Java_mot_testing">
-
+
diff --git a/app/src/main/java/io/n0x/android/java_mot_testing/FractionCalculator.java b/app/src/main/java/io/n0x/android/java_mot_testing/FractionCalculator.java
new file mode 100644
index 0000000..eb9d9ab
--- /dev/null
+++ b/app/src/main/java/io/n0x/android/java_mot_testing/FractionCalculator.java
@@ -0,0 +1,59 @@
+package io.n0x.android.java_mot_testing;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class FractionCalculator{
+
+ private static final String TAG = FractionCalculator.class.getName();
+
+ private int enumLeft;
+ private int denomLeft;
+ private int enumRight;
+ private int denomRight;
+ public int enumResult;
+ public int denomResult;
+
+
+ protected void doStuff() {
+ Log.d(TAG, "FractionCalculator started");
+ }
+
+ public int getEnumLeft() {
+ return enumLeft;
+ }
+
+ public void setEnumLeft(int enumLeft) {
+ this.enumLeft = enumLeft;
+ }
+
+ public int getDenomLeft() {
+ return denomLeft;
+ }
+
+ public void setDenomLeft(int denomLeft) {
+ this.denomLeft = denomLeft;
+ }
+
+ public int getEnumRight() {
+ return enumRight;
+ }
+
+ public void setEnumRight(int enumRight) {
+ this.enumRight = enumRight;
+ }
+
+ public int getDenomRight() {
+ return denomRight;
+ }
+
+ public void setDenomRight(int denomRight) {
+ this.denomRight = denomRight;
+ }
+
+ // GETTER AND SETTER
+
+}
diff --git a/app/src/main/java/io/n0x/android/java_mot_testing/MainActivity.java b/app/src/main/java/io/n0x/android/java_mot_testing/MainActivity.java
index d3c316c..c679ed0 100644
--- a/app/src/main/java/io/n0x/android/java_mot_testing/MainActivity.java
+++ b/app/src/main/java/io/n0x/android/java_mot_testing/MainActivity.java
@@ -1,19 +1,54 @@
package io.n0x.android.java_mot_testing;
-import android.app.Activity;
-
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
-import io.n0x.android.java_mot_testing.ex9.FractionCalculator;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.BindingAdapter;
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+ private static final String TAG = MainActivity.class.getName();
+
+
+
+ FractionCalculator calc = new FractionCalculator();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setContentView(R.layout.ex9_data_binding);
+ Log.d(TAG, "MainActivity started");
- Intent intent = new Intent(this, FractionCalculator.class);
- startActivity(intent);
+
+ // Button Listeners
+ findViewById(R.id.button_add).setOnClickListener(this);
+
+ calc.doStuff();
+ }
+
+ @Override
+ public void onClick(View v) {
+ if (v.getId() == R.id.button_add) {
+
+ TextView textView = findViewById(R.id.txt_enum_result);
+ textView.setText("10");
+
+ calc.enumResult = 5;
+ calc.denomResult = 6;
+
+ //calc.setDenomLeft(10);
+/*
+ enumLeft = 1;
+ denomLeft = 2;
+ enumRight = 3;
+ denomRight = 4;
+
+
+ //*/
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/io/n0x/android/java_mot_testing/ex9/FractionCalculator.java b/app/src/main/java/io/n0x/android/java_mot_testing/ex9/FractionCalculator.java
deleted file mode 100644
index 53f1d26..0000000
--- a/app/src/main/java/io/n0x/android/java_mot_testing/ex9/FractionCalculator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.n0x.android.java_mot_testing.ex9;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
-import io.n0x.android.java_mot_testing.R;
-
-public class FractionCalculator extends Activity{
-
- private static final String TAG = FractionCalculator.class.getName();
-
- private TextView txt_enum_left;
- private TextView txt_denom_left;
- private TextView txt_enum_right;
- private TextView txt_denom_right;
- private TextView txt_enum_result;
- private TextView txt_denom_result;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.ex9_data_binding);
- Log.d(TAG, "FractionCalculator started");
-
- /*
- txt_enum_left = (TextView) findViewById(R.id.txt_enum_left);
- txt_denom_left = (TextView) findViewById(R.id.txt_denom_left);
- txt_enum_right = (TextView) findViewById(R.id.txt_enum_right);
- txt_denom_right = (TextView) findViewById(R.id.txt_denom_right);
- txt_enum_result = (TextView) findViewById(R.id.txt_enum_result);
- txt_denom_result = (TextView) findViewById(R.id.txt_denom_result);
-
- // Set all fields to 0
- txt_enum_left.setText("0");
- txt_denom_left.setText("0");
- txt_enum_right.setText("0");
- txt_denom_right.setText("0");
- txt_enum_result.setText("0");
- txt_denom_result.setText("0");
- //*/
-
- }
-
- @Override
- protected void onStart() {
- super.onStart();
-
-
-
- }
-}
diff --git a/app/src/main/res/layout/ex9_data_binding.xml b/app/src/main/res/layout/ex9_data_binding.xml
index 4fa9b3d..ffbcd75 100644
--- a/app/src/main/res/layout/ex9_data_binding.xml
+++ b/app/src/main/res/layout/ex9_data_binding.xml
@@ -1,137 +1,146 @@
-
+
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file