Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • jilin/group3project
  • kfieleke/group3project
  • apeng/group3project
3 results
Show changes
Commits on Source (10)
Hide whitespace changes
Inline Side-by-side
Showing
with 344 additions and 176 deletions
.gradle/7.5/executionHistory/executionHistory.lock
View file @ 106b0a65
No preview for this file type
.gradle/7.5/fileHashes/fileHashes.bin
View file @ 106b0a65
No preview for this file type
.gradle/7.5/fileHashes/fileHashes.lock
View file @ 106b0a65
No preview for this file type
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file @ 106b0a65
No preview for this file type
.idea/deploymentTargetDropDown.xml
View file @ 106b0a65
......@@ -7,11 +7,11 @@
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\peng_\.android\avd\Pixel_6_Pro_API_33.avd" />
<value value="C:\Users\peng_\.android\avd\Nexus_5X_Edited_API_28.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-04-24T18:33:44.406405700Z" />
<timeTargetWasSelectedWithDropDown value="2023-05-01T02:57:23.606282800Z" />
</component>
</project>
\ No newline at end of file
.idea/modules/app/AriTetrisburg.app.iml
View file @ 106b0a65
......@@ -4,7 +4,7 @@
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="7.4.2" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
<option name="LAST_KNOWN_AGP_VERSION" value="7.4.2" />
</configuration>
</facet>
......
.idea/workspace.xml
View file @ 106b0a65
......@@ -10,13 +10,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="project demo">
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/background.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/DrawView.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/DrawView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/MainActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -35,6 +38,9 @@
<task path="$PROJECT_DIR$/app">
<activation />
</task>
<task path="$PROJECT_DIR$">
<activation />
</task>
<projects_view>
<tree_state>
<expand>
......@@ -78,7 +84,7 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="arics_update" />
<entry key="$PROJECT_DIR$" value="master" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -263,19 +269,19 @@
<option name="project" value="LOCAL" />
<updated>1682866939808</updated>
</task>
<task id="LOCAL-00006" summary="project demo">
<created>1682908321311</created>
<task id="LOCAL-00006" summary="ready for demo">
<created>1682907976166</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1682908321311</updated>
<updated>1682907976166</updated>
</task>
<task id="LOCAL-00007" summary="project demo">
<created>1682908437725</created>
<task id="LOCAL-00007" summary="ready for demo, added functional radio buttons in the settings page.">
<created>1682923879056</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1682908437725</updated>
<updated>1682923879057</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers />
......@@ -298,7 +304,15 @@
<MESSAGE value="finish seting up all screens" />
<MESSAGE value="finish setting up all screens, second push attempt." />
<MESSAGE value="aric's update" />
<MESSAGE value="project demo" />
<option name="LAST_COMMIT_MESSAGE" value="project demo" />
<MESSAGE value="ready for demo" />
<MESSAGE value="ready for demo, added functional radio buttons in the settings page." />
<option name="LAST_COMMIT_MESSAGE" value="ready for demo, added functional radio buttons in the settings page." />
</component>
<component name="XDebuggerManager">
<watches-manager>
<configuration name="AndroidRunConfigurationType">
<watch expression="this.score" language="JAVA" />
</configuration>
</watches-manager>
</component>
</project>
\ No newline at end of file
app/src/main/java/com/example/aritetrisburg/DrawView.java
View file @ 106b0a65
......@@ -15,7 +15,7 @@ class DrawView extends View {
super(context);
paint = new Paint();
paint.setColor(Color.BLUE);
yOffset = 400;
yOffset = 300;
this.gameState = gameState;
}
......
app/src/main/java/com/example/aritetrisburg/GameState.java
View file @ 106b0a65
package com.example.aritetrisburg;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.SystemClock;
import android.util.SparseArray;
......@@ -15,11 +17,13 @@ public class GameState extends SettingsScreen{
boolean status;
int score;
int scoreMultiplier;
// public int scoreLevel;
boolean pause;
//public CheckBox checkBoxLow, checkBoxMedium, checkBoxHigh;
public RadioGroup radioGroupScore;
// public RadioGroup radioGroupScore;
BasicBlock[][] board;
Tetramino falling;
......@@ -28,9 +32,14 @@ public class GameState extends SettingsScreen{
private int columns;
private Integer ctr;
private SparseArray<Tetramino> tetraminos;
public SharedPreferences sp;
@Override
public void onCreate(Bundle savedInstanceState) {
scoreLevel = sharedPreferencesPoint.getInt("pointMagic",0);
// sp = getSharedPreferences("speedController", MODE_PRIVATE);
// scoreLevel = sharedPreferencesPoint.getInt("pointMagic", 99);
super.onCreate(savedInstanceState);
setContentView(R.layout.settings_screen);
......@@ -40,42 +49,57 @@ public class GameState extends SettingsScreen{
radioGroupScore = findViewById(R.id.pointLevel);
int checkedButton = radioGroupScore.getCheckedRadioButtonId();
switch (checkedButton) {
case R.id.pointLow:
Toast.makeText(GameState.this, "Married", Toast.LENGTH_SHORT).show();
break;
case R.id.pointMedium:
Toast.makeText(GameState.this, "Single", Toast.LENGTH_SHORT).show();
break;
case R.id.pointHigh:
Toast.makeText(GameState.this, "In a Relationship", Toast.LENGTH_SHORT).show();
break;
default:
break;
}
radioGroupScore.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
switch (checkedId) {
case R.id.pointLow:
Toast.makeText(GameState.this, "Married", Toast.LENGTH_SHORT).show();
break;
case R.id.pointMedium:
Toast.makeText(GameState.this, "Single", Toast.LENGTH_SHORT).show();
break;
case R.id.pointHigh:
Toast.makeText(GameState.this, "In a Relationship", Toast.LENGTH_SHORT).show();
break;
default:
break;
}
}
});
// int checkedButton = radioGroupScore.getCheckedRadioButtonId();
// switch (checkedButton) {
// case R.id.pointLow:
// Toast.makeText(GameState.this, "Married", Toast.LENGTH_SHORT).show();
// break;
// case R.id.pointMedium:
// Toast.makeText(GameState.this, "Single", Toast.LENGTH_SHORT).show();
// break;
// case R.id.pointHigh:
// Toast.makeText(GameState.this, "In a Relationship", Toast.LENGTH_SHORT).show();
// break;
// default:
// break;
// }
// radioGroupScore.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
// @Override
// public void onCheckedChanged(RadioGroup group, int checkedId) {
// switch (checkedId) {
// case R.id.pointLow:
// SharedPreferences.Editor editor1 = sp.edit();
// editor1.putInt("pointMagic", 1);
//// scoreLevel = sp.getInt("pointMagic",0);
// System.out.println(scoreLevel + " DICK");
//
// break;
// case R.id.pointMedium:
// SharedPreferences.Editor editor2 = sp.edit();
// editor2.putInt("pointMagic", 2);
//// scoreLevel = sp.getInt("speed", 1);
// System.out.println(scoreLevel + " DICK");
//
// break;
// case R.id.pointHigh:
// SharedPreferences.Editor editor3 = sp.edit();
// editor3.putInt("pointMagic", 3);
//// scoreLevel = sp.getInt("speed", 3);
// System.out.println(scoreLevel + " DICK");
// break;
// default:
// SharedPreferences.Editor editor4 = sp.edit();
// editor4.putInt("pointMagic", 9);
// System.out.println(scoreLevel + " DEFAULT");
//
// break;
// }
// }
// });
};
GameState(int rows, int columns, TetraminoType fallingTetraminoType) {
public GameState(int rows, int columns, TetraminoType fallingTetraminoType) {
this.rows = rows;
this.columns = columns;
......@@ -195,13 +219,37 @@ public class GameState extends SettingsScreen{
}
}
public int incrementScore() {
System.out.println(pointX_int);
System.out.println(scoreMultiplier);
public int incrementScore() {
//scoreLevel = sharedPreferencesPoint.getInt("pointMagic",0);
// radioGroupScore.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
// @Override
// public void onCheckedChanged(RadioGroup group, int checkedId) {
// switch (checkedId) {
// case R.id.pointLow:
// scoreLevel = 1;
// break;
// case R.id.pointMedium:
// scoreLevel = 2;
// break;
// case R.id.pointHigh:
// scoreLevel = 3;
// break;
// default:
// break;
// }
// }
// });
// System.out.println(pointX_int);
System.out.println(scoreLevel);
if (scoreLevel == 0) {
return this.score += 100;
}
// return this.score+=(100 * pointX_int);
return this.score+=(100);
return this.score+=(100 * scoreLevel);
}
void lineRemove() {
......
app/src/main/java/com/example/aritetrisburg/MainActivity.java
View file @ 106b0a65
......@@ -35,6 +35,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
int delayFactor;
int delay;
int scoreCounter;
int delayLowerLimit;
private static final String TAG = "Swipe Position";
private float x1, x2, y1, y2;
......@@ -52,7 +53,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
gameState = new GameState(24, 20, TetraminoType.getRandomTetramino());
drawView = new DrawView(this, gameState);
drawView.setBackgroundResource(R.drawable.img);
drawView.setBackgroundResource(R.drawable.background);
//drawView.setBackgroundColor(Color.BLACK);
game = new FrameLayout(this);
......@@ -137,7 +138,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
delay = delay / delayFactor + 1;
}
int score = gameState.incrementScore();
scoreCounter = gameState.incrementScore();
// /_____________________________________________________________________
// Intent intent1 = new Intent(MainActivity.this, ScoreLeaderboardScreen.class);
......
app/src/main/java/com/example/aritetrisburg/SettingsScreen.java
View file @ 106b0a65
......@@ -5,16 +5,20 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.widget.Button;
import android.widget.RadioGroup;
import android.widget.SeekBar;
import androidx.appcompat.app.AppCompatActivity;
public class SettingsScreen extends AppCompatActivity {
Button toHomeButton;
public SeekBar pointX, speedX;
//public SeekBar pointX, speedX;
//public int pointX_int;
public static int scoreLevel;
public int pointX_int;
public int speedX_int;
public RadioGroup radioGroupScore;
public int scoreMultiplier;
public SharedPreferences sharedPreferencesPoint, sharedPreferencesSpeed;
......@@ -23,86 +27,133 @@ public class SettingsScreen extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.settings_screen);
radioGroupScore = findViewById(R.id.pointLevel);
toHomeButton = (Button) findViewById(R.id.btnSetting);
pointX = (SeekBar) findViewById(R.id.seekPoint);
speedX = (SeekBar) findViewById(R.id.seekSpeed);
// pointX = (SeekBar) findViewById(R.id.seekPoint);
// speedX = (SeekBar) findViewById(R.id.seekSpeed);
pointX.setMax(100);
speedX.setMax(100);
// pointX.setMax(100);
// speedX.setMax(100);
sharedPreferencesPoint = getSharedPreferences("speedController", Context.MODE_PRIVATE);
scoreLevel = sharedPreferencesPoint.getInt("pointMagic", 99);
sharedPreferencesPoint = getPreferences(Context.MODE_PRIVATE);
sharedPreferencesSpeed = getPreferences(Context.MODE_PRIVATE);
pointX_int = sharedPreferencesPoint.getInt("last_position_point", 1);
speedX_int = sharedPreferencesSpeed.getInt("last_position_speed", 1);
pointX.setProgress(pointX_int);
speedX.setProgress(speedX_int);
pointX.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
//System.out.println(store_input_point(progress));
pointX_int = progress;
System.out.println(pointX_int + " first");
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
pointX_int = seekBar.getProgress();
scoreMultiplier = pointX_int;
System.out.println(pointX_int + " second");
// pointX_int = sharedPreferencesPoint.getInt("last_position_point", 1);
// speedX_int = sharedPreferencesSpeed.getInt("last_position_speed", 1);
//
// pointX.setProgress(pointX_int);
// speedX.setProgress(speedX_int);
}
radioGroupScore.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
SharedPreferences.Editor editor = sharedPreferencesPoint.edit();
editor.putInt("last_position_point", seekBar.getProgress());
editor.apply();
pointX_int = seekBar.getProgress();
scoreMultiplier = pointX_int;
System.out.println(pointX_int + " third");
public void onCheckedChanged(RadioGroup group, int checkedId) {
switch (checkedId) {
case R.id.pointLow:
SharedPreferences.Editor editor1 = sharedPreferencesPoint.edit();
editor1.putInt("pointMagic", 1);
editor1.apply();
// scoreLevel = sp.getInt("pointMagic",0);
System.out.println(scoreLevel);
break;
case R.id.pointMedium:
SharedPreferences.Editor editor2 = sharedPreferencesPoint.edit();
editor2.putInt("pointMagic", 2);
editor2.apply();
// scoreLevel = sp.getInt("speed", 1);
System.out.println(scoreLevel);
break;
case R.id.pointHigh:
SharedPreferences.Editor editor3 = sharedPreferencesPoint.edit();
editor3.putInt("pointMagic", 3);
editor3.apply();
// scoreLevel = sp.getInt("speed", 3);
System.out.println(scoreLevel);
break;
default:
SharedPreferences.Editor editor4 = sharedPreferencesPoint.edit();
editor4.putInt("pointMagic", 9);
editor4.apply();
System.out.println(scoreLevel);
break;
}
}
});
speedX.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
//System.out.println(store_input_point(progress));
}
// pointX.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
// @Override
// public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
// //System.out.println(store_input_point(progress));
// pointX_int = progress;
// System.out.println(pointX_int + " first");
// }
//
// @Override
// public void onStartTrackingTouch(SeekBar seekBar) {
// pointX_int = seekBar.getProgress();
// scoreMultiplier = pointX_int;
// System.out.println(pointX_int + " second");
//
// }
//
// @Override
// public void onStopTrackingTouch(SeekBar seekBar) {
// SharedPreferences.Editor editor = sharedPreferencesPoint.edit();
// editor.putInt("last_position_point", seekBar.getProgress());
// editor.apply();
//// pointX_int = seekBar.getProgress();
//// scoreMultiplier = pointX_int;
//// System.out.println(pointX_int + " third");
//
//
// }
// });
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
SharedPreferences.Editor editor = sharedPreferencesSpeed.edit();
editor.putInt("last_position_speed", seekBar.getProgress());
editor.apply();
speedX_int = seekBar.getProgress();
System.out.println(speedX_int);
}
});
// speedX.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
// @Override
// public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
// //System.out.println(store_input_point(progress));
//
// }
//
// @Override
// public void onStartTrackingTouch(SeekBar seekBar) {
//
// }
//
// @Override
// public void onStopTrackingTouch(SeekBar seekBar) {
// SharedPreferences.Editor editor = sharedPreferencesSpeed.edit();
// editor.putInt("last_position_speed", seekBar.getProgress());
// editor.apply();
// speedX_int = seekBar.getProgress();
// System.out.println(speedX_int);
// }
// });
toHomeButton.setOnClickListener(v -> {
Intent intent = new Intent(SettingsScreen.this, HomeScreen.class);
startActivity(intent);
System.out.println(pointX_int);
// System.out.println(pointX_int);
});
}
public int store_input_point(int i)
{
return i;
}
// public int store_input_point(int i)
// {
// return i;
// }
// @Override
// protected void onDestroy() {
......
app/src/main/res/drawable/background.png 0 → 100644
View file @ 106b0a65
app/src/main/res/drawable/background.png

417 KiB

app/src/main/res/layout/activity_main.xml
View file @ 106b0a65
......@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
android:background="@drawable/img"
android:background="@drawable/background"
>
......
app/src/main/res/layout/settings_screen.xml
View file @ 106b0a65
......@@ -84,69 +84,123 @@
android:layout_marginLeft="20dp"
android:id="@+id/txtPoint"/>
<SeekBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/txtPoint"
android:layout_alignParentEnd="true"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="0dp"
android:layout_toEndOf="@+id/txtPoint"
android:layout_toRightOf="@+id/txtPoint"
android:id="@+id/seekPoint"
android:thumbTint="@color/lavender_btn"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/txtPoint1x"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1.0X"
android:layout_marginLeft="200dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2.0X"
android:layout_toRightOf="@+id/txtPoint1x"
android:layout_marginLeft="120dp"/>
</RelativeLayout>
<RadioGroup
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_gravity="center"
android:orientation="horizontal"
android:id="@+id/pointLevel">
<RadioButton
<!-- <SeekBar-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignBottom="@+id/txtPoint"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginStart="20dp"-->
<!-- android:layout_marginEnd="20dp"-->
<!-- android:layout_marginTop="0dp"-->
<!-- android:layout_marginBottom="0dp"-->
<!-- android:layout_toEndOf="@+id/txtPoint"-->
<!-- android:layout_toRightOf="@+id/txtPoint"-->
<!-- android:id="@+id/seekPoint"-->
<!-- android:thumbTint="@color/lavender_btn"/>-->
<RadioGroup
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Low"
android:checked="true"
android:id="@+id/pointLow"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Medium"
android:id="@+id/pointMedium"
android:layout_marginLeft="15dp"/>
<RadioButton
android:orientation="horizontal"
android:layout_alignParentEnd="true"
android:layout_marginStart="30dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="0dp"
android:layout_toEndOf="@+id/txtPoint"
android:layout_toRightOf="@+id/txtPoint"
android:id="@+id/pointLevel"
android:backgroundTint="@color/lavender_btn">
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:checked="true"
android:buttonTint="@color/lavender_btn"
android:id="@+id/pointLow"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:id="@+id/pointMedium"
android:buttonTint="@color/lavender_btn"
android:layout_marginLeft="20dp"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:id="@+id/pointHigh"
android:buttonTint="@color/lavender_btn"
android:layout_marginLeft="20dp"/>
</RadioGroup>
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="High"
android:id="@+id/pointHigh"
android:layout_marginLeft="15dp"/>
</RadioGroup>
android:layout_height="wrap_content">
<TextView
android:id="@+id/txtPoint1x"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Low"
android:layout_marginLeft="200dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Medium"
android:layout_toRightOf="@+id/txtPoint1x"
android:layout_marginLeft="30dp"
android:id="@+id/txtPoint2x"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="High"
android:layout_toRightOf="@+id/txtPoint2x"
android:layout_marginLeft="30dp"/>
</RelativeLayout>
<!-- <RadioGroup-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="20dp"-->
<!--android:layout_gravity="center"-->
<!-- android:orientation="horizontal"-->
<!-- android:id="@+id/pointLevel"-->
<!-- android:backgroundTint="@color/lavender_btn">-->
<!-- <RadioButton-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="Low"-->
<!-- android:checked="true"-->
<!-- android:buttonTint="@color/lavender_btn"-->
<!-- android:id="@+id/pointLow"/>-->
<!-- <RadioButton-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="Medium"-->
<!-- android:id="@+id/pointMedium"-->
<!-- android:buttonTint="@color/lavender_btn"-->
<!-- android:layout_marginLeft="15dp"/>-->
<!-- <RadioButton-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="High"-->
<!-- android:id="@+id/pointHigh"-->
<!-- android:buttonTint="@color/lavender_btn"-->
<!-- android:layout_marginLeft="15dp"/>-->
<!-- </RadioGroup>-->
<Button
android:layout_width="wrap_content"
......
demopresentation.pptx 0 → 100644
View file @ 106b0a65
File added
finalprojectdemo.mp4 → finalProjectDemo.mp4
View file @ 106b0a65
No preview for this file type