commit a6c27bf679e1a741427808abd2d628a4db1428f8 Author: Felix Kramer Date: Sat Sep 8 17:40:40 2018 +0200 First commit of Android project of the "Schafkopfzähler" - Working start screen - User can enter the player names - Main game layout with no functionality included diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5edb4ee --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..ed3a546 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..99202cc --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..77dea6a --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,29 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 27 + defaultConfig { + applicationId "project.schafkopfzaehler_2" + minSdkVersion 19 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support:design:27.1.1' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/project/schafkopfzaehler_2/ExampleInstrumentedTest.java b/app/src/androidTest/java/project/schafkopfzaehler_2/ExampleInstrumentedTest.java new file mode 100644 index 0000000..7084e43 --- /dev/null +++ b/app/src/androidTest/java/project/schafkopfzaehler_2/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package project.schafkopfzaehler_2; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("project.schafkopfzaehler_2", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..4471289 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/project/schafkopfzaehler_2/MainGameActivity.java b/app/src/main/java/project/schafkopfzaehler_2/MainGameActivity.java new file mode 100644 index 0000000..6c8f1d8 --- /dev/null +++ b/app/src/main/java/project/schafkopfzaehler_2/MainGameActivity.java @@ -0,0 +1,67 @@ +package project.schafkopfzaehler_2; + +import android.content.Intent; +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.util.Log; +import android.view.View; +import android.widget.Button; + +public class MainGameActivity extends AppCompatActivity { + + private Button p1, p2, p3, p4; + + private View.OnClickListener startClickListener = new View.OnClickListener() { + + @Override + public void onClick (View v) { + if (v == p1 || v == p2 || v == p3 || v == p4) { + playerButtonClicked(v); + } + } + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Log.d("MainGame", "onCreate"); + + setContentView(R.layout.main_game_layout); + + Intent intent = getIntent(); + String playerNames[] = intent.getStringArrayExtra("playerNames"); + + Log.d("MainGame", "Find Buttons"); + p1 = findViewById(R.id.p1_game); + p2 = findViewById(R.id.p2_game); + p3 = findViewById(R.id.p3_game); + p4 = findViewById(R.id.p4_game); + + Log.d("MainGame", "Set player names into buttons"); + // Set player names into buttons + p1.setText(playerNames[0]); + Log.d("MainGame", "Zero works -> one"); + p2.setText(playerNames[1]); + Log.d("MainGame", "one works -> two"); + p3.setText(playerNames[2]); + Log.d("MainGame", "Two works -> three"); + p4.setText(playerNames[3]); + Log.d("MainGame", "Three works"); + + p1.setOnClickListener(startClickListener); + p2.setOnClickListener(startClickListener); + p3.setOnClickListener(startClickListener); + p4.setOnClickListener(startClickListener); + + } + + private void playerButtonClicked (View v) { + + Log.d("MainGame", v + " clicked..."); + + } + +} diff --git a/app/src/main/java/project/schafkopfzaehler_2/StartActivity.java b/app/src/main/java/project/schafkopfzaehler_2/StartActivity.java new file mode 100644 index 0000000..6960be1 --- /dev/null +++ b/app/src/main/java/project/schafkopfzaehler_2/StartActivity.java @@ -0,0 +1,108 @@ +package project.schafkopfzaehler_2; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; + +public class StartActivity extends AppCompatActivity { + + private Button startButton; + private Button nextButton; + private String players[] = {"", "", "", ""}; + + private View.OnClickListener startClickListener = new View.OnClickListener() { + + @Override + public void onClick (View v) { + if (v == startButton) { + startButtonClicked(); + } + if (v == nextButton) { + nextButtonClicked(); + } + } + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.start_activity); + startButton = findViewById(R.id.startChoosePlayers); + startButton.setOnClickListener(startClickListener); + Log.d("Start", "onCreate"); + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onResume() { + super.onResume(); + } + + @Override + protected void onRestart() { + super.onRestart(); + } + + @Override + protected void onStart() { + super.onStart(); + } + + private void startButtonClicked() { + setContentView(R.layout.chooseplayers); + nextButton = findViewById(R.id.startMain); + nextButton.setOnClickListener(startClickListener); + } + + private void nextButtonClicked() { + // Get entered player names and store them in the players array + Log.d("Start", "nextButtonClicked --> Get player names"); + EditText player1 = findViewById(R.id.player1); + EditText player2 = findViewById(R.id.player2); + EditText player3 = findViewById(R.id.player3); + EditText player4 = findViewById(R.id.player4); + + // Raise error message if entry is empty + if ( player1.getText().toString().equals("") ) { + player1.setError(getString(R.string.emptyName)); + } else { + players[0] = player1.getText().toString(); + } + + if ( player2.getText().toString().equals("") ) { + player2.setError(getString(R.string.emptyName)); + } else { + players[1] = player2.getText().toString(); + } + + if ( player3.getText().toString().equals("") ) { + player3.setError(getString(R.string.emptyName)); + } else { + players[2] = player3.getText().toString(); + } + + if ( player4.getText().toString().equals("") ) { + player4.setError(getString(R.string.emptyName)); + } else { + players[3] = player4.getText().toString(); + } + + Log.d("Start", "nextButtonClicked --> Intent follows"); + + Intent intent = new Intent(this, MainGameActivity.class); + intent.putExtra("playerNames", players); + startActivity(intent); + + + } + + +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7bd21d --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/schafkopfkarten.png b/app/src/main/res/drawable/schafkopfkarten.png new file mode 100644 index 0000000..a89174b Binary files /dev/null and b/app/src/main/res/drawable/schafkopfkarten.png differ diff --git a/app/src/main/res/drawable/test.xml b/app/src/main/res/drawable/test.xml new file mode 100644 index 0000000..a8b409b --- /dev/null +++ b/app/src/main/res/drawable/test.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/woodentable.png b/app/src/main/res/drawable/woodentable.png new file mode 100644 index 0000000..f3bcb2d Binary files /dev/null and b/app/src/main/res/drawable/woodentable.png differ diff --git a/app/src/main/res/font/germania_one.ttf b/app/src/main/res/font/germania_one.ttf new file mode 100644 index 0000000..bd83f36 Binary files /dev/null and b/app/src/main/res/font/germania_one.ttf differ diff --git a/app/src/main/res/layout-land/start_activity.xml b/app/src/main/res/layout-land/start_activity.xml new file mode 100644 index 0000000..f00d5f9 --- /dev/null +++ b/app/src/main/res/layout-land/start_activity.xml @@ -0,0 +1,51 @@ + + + + + + + + + +