Compare commits

...

3 Commits

Author SHA1 Message Date
rhinemann 59e8912eb0 Added sources 2024-03-09 22:42:13 +02:00
rhinemann 9e5cda2974 Added MBTI traching 2024-03-09 22:41:34 +02:00
rhinemann 79194f6c74 Deleted .idea 2024-03-09 22:41:15 +02:00
21 changed files with 378 additions and 226 deletions

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
*.iml #*.iml
.gradle .gradle
/local.properties local.properties
.idea .idea
.DS_Store .DS_Store
app/build app/build

3
.idea/.gitignore vendored
View File

@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml

View File

@ -1,116 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme>
</component>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
</component>
</project>

View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>

View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
</component>
</project>

View File

@ -1,39 +0,0 @@
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Project/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable-v24/radiobutton_selector.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/bg.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/custom_button_sqare.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/custom_button_sqare_2.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/custom_button_sqare_3.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/hexagon1.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/hexagon2.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/hexagon3.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/hexagon_button.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/drawable/ic_launcher_background.xml" value="0.3828125" />
<entry key="..\:/Project/app/src/main/res/layout/activity_about.xml" value="0.36666666666666664" />
<entry key="..\:/Project/app/src/main/res/layout/activity_calculator.xml" value="0.2066859530697525" />
<entry key="..\:/Project/app/src/main/res/layout/activity_graph.xml" value="0.3761904761904762" />
<entry key="..\:/Project/app/src/main/res/layout/activity_home_screen.xml" value="0.5" />
<entry key="..\:/Project/app/src/main/res/layout/activity_instruction.xml" value="0.36666666666666664" />
<entry key="..\:/Project/app/src/main/res/layout/activity_main.xml" value="0.20572916666666666" />
<entry key="..\:/Project/app/src/main/res/layout/activity_mbti.xml" value="0.36666666666666664" />
<entry key="..\:/Project/app/src/main/res/layout/activity_mbtiresult.xml" value="0.36666666666666664" />
<entry key="..\:/Project/app/src/main/res/layout/activity_profile.xml" value="0.33" />
<entry key="..\:/Project/app/src/main/res/layout/activity_temper.xml" value="0.36666666666666664" />
<entry key="..\:/Project/app/src/main/res/layout/activity_temper_result.xml" value="0.33" />
<entry key="..\:/Project/app/src/main/res/layout/activity_tests.xml" value="0.36666666666666664" />
<entry key="..\:/Project/app/src/main/res/layout/content_scrolling.xml" value="0.36666666666666664" />
<entry key="..\:/Project/app/src/main/res/menu/menu_facult.xml" value="0.5" />
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -0,0 +1,109 @@
package com.rhinemann.project;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;
import android.widget.Button;
import android.widget.TextView;
public class MBTI extends AppCompatActivity {
Integer questionId;
TextView MBTIQuestion, MBTIAnswer;
String[] MBTIQuestions, MBTIAnswers;
String Result;
char[] ResultChar;
Button aButton, bButton, Home;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_mbti);
questionId = 0;
MBTIQuestion = findViewById(R.id.MBTI_Question);
MBTIAnswer = findViewById(R.id.MBTI_Answer);
MBTIQuestions = getResources().getStringArray(R.array.MBTI_Questions);
MBTIAnswers = getResources().getStringArray(R.array.MBTI_Answers);
aButton = findViewById(R.id.Button_A);
bButton = findViewById(R.id.Button_B);
Result = "MBTI";
ResultChar = Result.toCharArray();
MBTIQuestion.setText(MBTIQuestions[questionId]);
MBTIAnswer.setText(MBTIAnswers[questionId]);
aButton.setOnClickListener(v -> {
switch (questionId) {
case 0:
ResultChar[0] = 'E';
break;
case 1:
ResultChar[1] = 'S';
break;
case 2:
ResultChar[2] = 'T';
break;
case 3:
ResultChar[3] = 'J';
break;
}
Result = String.valueOf(ResultChar);
if (questionId < 3) {
questionId++;
MBTIQuestion.setText(MBTIQuestions[questionId]);
MBTIAnswer.setText(MBTIAnswers[questionId]);
} else { MBTIResult(); }
});
bButton.setOnClickListener(v -> {
switch (questionId) {
case 0:
ResultChar[0] = 'I';
break;
case 1:
ResultChar[1] = 'N';
break;
case 2:
ResultChar[2] = 'F';
break;
case 3:
ResultChar[3] = 'P';
break;
}
Result = String.valueOf(ResultChar);
if (questionId < 3) {
questionId++;
MBTIQuestion.setText(MBTIQuestions[questionId]);
MBTIAnswer.setText(MBTIAnswers[questionId]);
} else { MBTIResult(); }
});
Home = findViewById(R.id.home);
Home.setOnClickListener(v -> {
Intent intent = new Intent(MBTI.this, HomeScreen.class);
startActivity(intent);
});
}
public void MBTIResult(){
Intent intent = new Intent(MBTI.this, MBTIResult.class);
intent.putExtra("Result", Result);
startActivity(intent);
}
}

View File

@ -0,0 +1,85 @@
package com.rhinemann.project;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;
import android.widget.Button;
import android.widget.TextView;
public class MBTIResult extends AppCompatActivity {
TextView Result, Explanation;
String ResultText;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_mbtiresult);
Result = findViewById(R.id.Result);
Explanation = findViewById(R.id.Explanation);
ResultText = getIntent().getStringExtra("Result");
Result.setText(ResultText);
switch (ResultText){
case "ESTG":
Explanation.setText(R.string.ESTJ);
break;
case "ISTJ":
Explanation.setText(R.string.ISTJ);
break;
case "ESTP":
Explanation.setText(R.string.ESTP);
break;
case "ISTP":
Explanation.setText(R.string.ISTP);
break;
case "ENTJ":
Explanation.setText(R.string.ENTJ);
break;
case "INTJ":
Explanation.setText(R.string.INTJ);
break;
case "ENTP":
Explanation.setText(R.string.ENTP);
break;
case "INTP":
Explanation.setText(R.string.INTP);
break;
case "ESFJ":
Explanation.setText(R.string.ESFJ);
break;
case "ISFJ":
Explanation.setText(R.string.ISFJ);
break;
case "ESFP":
Explanation.setText(R.string.ESFP);
break;
case "ISFP":
Explanation.setText(R.string.ISFP);
break;
case "ENFJ":
Explanation.setText(R.string.ENFJ);
break;
case "INFJ":
Explanation.setText(R.string.INFJ);
break;
case "ENFP":
Explanation.setText(R.string.ENFP);
break;
case "INFP":
Explanation.setText(R.string.INFP);
break;
}
Button Home = findViewById(R.id.home);
Home.setOnClickListener(v -> {
Intent intent = new Intent(MBTIResult.this, HomeScreen.class);
startActivity(intent);
});
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#FF69A5FA" />
</shape>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#FFC97FFA" />
</shape>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#FFAB96FF" />
</shape>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="170dp"
android:height="170dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="#FF69A5FA"
android:pathData="M485.291,129.408l-224-128c-3.285-1.877-7.296-1.877-10.581,0l-224,128c-3.328,1.899-5.376,5.44-5.376,9.259v234.667
c0,3.819,2.048,7.36,5.376,9.259l224,128c1.643,0.939,3.456,1.408,5.291,1.408s3.648-0.469,5.291-1.408l224-128
c3.328-1.899,5.376-5.44,5.376-9.259V138.667C490.667,134.848,488.619,131.307,485.291,129.408z" />
</vector>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="170dp"
android:height="170dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="#FFC97FFA"
android:pathData="M485.291,129.408l-224-128c-3.285-1.877-7.296-1.877-10.581,0l-224,128c-3.328,1.899-5.376,5.44-5.376,9.259v234.667
c0,3.819,2.048,7.36,5.376,9.259l224,128c1.643,0.939,3.456,1.408,5.291,1.408s3.648-0.469,5.291-1.408l224-128
c3.328-1.899,5.376-5.44,5.376-9.259V138.667C490.667,134.848,488.619,131.307,485.291,129.408z" />
</vector>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="170dp"
android:height="170dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="#FFAB96FF"
android:pathData="M485.291,129.408l-224-128c-3.285-1.877-7.296-1.877-10.581,0l-224,128c-3.328,1.899-5.376,5.44-5.376,9.259v234.667
c0,3.819,2.048,7.36,5.376,9.259l224,128c1.643,0.939,3.456,1.408,5.291,1.408s3.648-0.469,5.291-1.408l224-128
c3.328-1.899,5.376-5.44,5.376-9.259V138.667C490.667,134.848,488.619,131.307,485.291,129.408z" />
</vector>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="80dp"
android:height="80dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="#FFAB96FF"
android:pathData="M485.291,129.408l-224-128c-3.285-1.877-7.296-1.877-10.581,0l-224,128c-3.328,1.899-5.376,5.44-5.376,9.259v234.667
c0,3.819,2.048,7.36,5.376,9.259l224,128c1.643,0.939,3.456,1.408,5.291,1.408s3.648-0.469,5.291-1.408l224-128
c3.328-1.899,5.376-5.44,5.376-9.259V138.667C490.667,134.848,488.619,131.307,485.291,129.408z" />
</vector>

View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MBTI"
android:background="@drawable/background_light">
<TextView
android:id="@+id/MBTI_Question"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="16dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/MBTI_Answer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/MBTI_Question" />
<Button
android:id="@+id/Button_A"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="150dp"
android:text="А"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/Button_B"
app:layout_constraintTop_toBottomOf="@id/MBTI_Answer" />
<Button
android:id="@+id/Button_B"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Б"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/Button_A"
app:layout_constraintTop_toTopOf="@+id/Button_A" />
<Button
android:id="@+id/home"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/toMain"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
style="@style/Widget.AppCompat.Button.Borderless"
android:textColor="#FFAB96FF"
android:textSize="30dp" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MBTIResult"
android:background="@drawable/background_light">
<TextView
android:id="@+id/Result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="TextView"
android:textColor="#000000"
android:textSize="34sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/Explanation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="8dp"
android:text="TextView"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Result" />
<Button
android:id="@+id/home"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/toMain"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
style="@style/Widget.AppCompat.Button.Borderless"
android:textColor="#FFAB96FF"
android:textSize="30dp" />
</androidx.constraintlayout.widget.ConstraintLayout>