diff options
113 files changed, 3376 insertions, 0 deletions
diff --git a/android/SameGame/.gitignore b/android/SameGame/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/android/SameGame/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/android/SameGame/app/.gitignore b/android/SameGame/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/android/SameGame/app/.gitignore @@ -0,0 +1 @@ +/build
\ No newline at end of file diff --git a/android/SameGame/app/Changelog.txt b/android/SameGame/app/Changelog.txt new file mode 100644 index 0000000..aefe426 --- /dev/null +++ b/android/SameGame/app/Changelog.txt @@ -0,0 +1,15 @@ +0.240327-0 - Elementy przesuwane są prawidłowo, jednak usuwanie duzej ilości elementów, potrfi wyłączyć aplikację
+0.240325-3 - Usunięcie notyfikacji, 'listIndex' zbiera za dużo indeksów, nie wiem skąd bierze nadmiar
+0.240325-2 - Zmaina ikony
+0.240325-1 - Nie liczy bialych pól w funkcji 'like', już tak nie zwalnia, jednak nie mozna się spieszyć z klikaniem
+0.240325-0 - Poprawinie kolejności przy odświeżąniu GRidView
+0.240324-1 - Usuwa od czterech do max ośmiu razy, później się zawiesza
+0.240324-0 - Usuwa elemety z kolumien, jednak potrafi się wyłożyć (gdy wszystkie kolumny są białe ?)
+0.240323-0 - Usuwa elementy z prawej strony, zdarza się że usunie nadmiar elementów. Aplikacja potrafi się zawiesić i wyłączyć
+0.240322-2 - Reimplementacja 'blank' - dodanie 'toLeft' jednak najpierw należy dodać funkcję sortującą malejąco
+0.240322-1 - Dodanie funkcji 'blank' kasującej kolor elementu
+0.240322-0 - Rozpoznaje "duety"
+0.240321-1 - Rozpoznaje łańcuchy kolorów na siatce - usuwa duplikaty oraz sortuje lańcuchy
+0.240321-0 - Wyświetla pięcio kolorową siatkę
+0.240320-4 - Wyświetla jedno kolorową siatkę
+0.240319-0 - Inicjacja
\ No newline at end of file diff --git a/android/SameGame/app/build.gradle.kts b/android/SameGame/app/build.gradle.kts new file mode 100644 index 0000000..f5be856 --- /dev/null +++ b/android/SameGame/app/build.gradle.kts @@ -0,0 +1,71 @@ +plugins { + alias(libs.plugins.androidApplication) + alias(libs.plugins.jetbrainsKotlinAndroid) +} + +android { + namespace = "com.example.samegame" + compileSdk = 34 + + defaultConfig { + applicationId = "com.example.samegame" + minSdk = 24 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation("androidx.cardview:cardview:1.0.0") + implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha13") + // To use constraintlayout in compose + implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha13") + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + +}
\ No newline at end of file diff --git a/android/SameGame/app/proguard-rules.pro b/android/SameGame/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/android/SameGame/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
\ No newline at end of file diff --git a/android/SameGame/app/src/androidTest/java/com/example/samegame/ExampleInstrumentedTest.kt b/android/SameGame/app/src/androidTest/java/com/example/samegame/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..8e9c9b3 --- /dev/null +++ b/android/SameGame/app/src/androidTest/java/com/example/samegame/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.samegame + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.samegame", appContext.packageName) + } +}
\ No newline at end of file diff --git a/android/SameGame/app/src/main/AndroidManifest.xml b/android/SameGame/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..fc3f30e --- /dev/null +++ b/android/SameGame/app/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <application
+ android:allowBackup="true"
+ android:dataExtractionRules="@xml/data_extraction_rules"
+ android:fullBackupContent="@xml/backup_rules"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/ic_launcher_round"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.SameGame"
+ android:largeHeap="true"
+ tools:targetApi="31">
+ <activity
+ android:name=".MainActivity"
+ android:exported="true"
+ android:label="@string/app_name"
+ android:theme="@style/Theme.SameGame">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/ic_launcher-playstore.png b/android/SameGame/app/src/main/ic_launcher-playstore.png Binary files differnew file mode 100644 index 0000000..3a978c4 --- /dev/null +++ b/android/SameGame/app/src/main/ic_launcher-playstore.png diff --git a/android/SameGame/app/src/main/java/com/example/samegame/Box.java b/android/SameGame/app/src/main/java/com/example/samegame/Box.java new file mode 100644 index 0000000..6bab739 --- /dev/null +++ b/android/SameGame/app/src/main/java/com/example/samegame/Box.java @@ -0,0 +1,317 @@ +/*
+Same Game - My first application built in Kotlin
+date: 19-III-2024
+code: Przemyslaw R. Pietraszczyk
+license: GPL v3
+IDE: Android Studio Iguana
+*/
+package com.example.samegame;
+
+import java.util.*;
+import java.lang.*;
+
+class Box {
+ int index;
+ int groupIndex;
+ String color;
+ int x, y;
+ boolean visit;
+ public List<String> groupList = new ArrayList<String>();
+ public List<Integer> listIndex = new ArrayList<Integer>();
+
+ public int value; // czy kolor (0) czy bialy (1)
+ public int resource;
+ public Box() {
+
+ visit = false;
+ value = 0;
+ }
+
+ public void setIndex(int n) {
+ int index = n;
+ }
+
+ public void setGroupIndex(int n) {
+ groupIndex = n;
+ }
+
+ public void setColorName(String c) {
+ color = c;
+ }
+
+ public void setVelocity(int _x, int _y) {
+ x = _x;
+ y = _y;
+ }
+
+ public int getGroupIndex() {
+ return groupIndex;
+ }
+
+ public String getColor() {
+ return color;
+ }
+
+ public int getVelocityY() {
+ return y;
+ }
+
+ public int getVelocityX() {
+ return x;
+ }
+
+ public Box get() {
+ return this;
+ }
+
+
+ public void like(String color, Box [][] squares, int y, int x, int origy, int origx)throws Exception, StackOverflowError {
+
+ if ( squares[y][x].getColor() != "white") {
+ if (squares[y][x].getColor().equals(color)) {
+ if (y >= 1) {
+ if (squares[y - 1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ //like(color, squares, y-1, x, origy, origx);
+ try {
+ like(color, squares, y - 1, x, origy, origx);
+ //intelligence.add("3");
+ } catch (StackOverflowError s) {
+ like(color, squares, y - 1, x, origy, origx);
+ // intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ if (x >= 1) {
+ if (squares[y][x - 1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ //like(color, squares, y, x-1 , origy, origx);
+ try {
+ like(color, squares, y, x - 1, origy, origx);
+ //intelligence.add("3");
+ } catch (StackOverflowError s) {
+ like(color, squares, y, x - 1, origy, origx);
+ // intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+
+ if (y < 8) {
+ if (squares[y + 1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ //like(color, squares, y+1, x, origy, origx);
+ try {
+ like(color, squares, y + 1, x, origy, origx);
+ //intelligence.add("3");
+ } catch (StackOverflowError s) {
+ like(color, squares, y + 1, x, origy, origx);
+ // intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ if (x < 5) {
+ if (squares[y][x + 1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ //like(color, squares, y, x+1 , origy, origx);
+ try {
+ like(color, squares, y, x + 1, origy, origx);
+ //intelligence.add("3");
+ } catch (StackOverflowError s) {
+ like(color, squares, y, x + 1, origy, origx);
+ //intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ squares[y][x].visit = false;
+ }
+ }
+ }
+
+ // Mozliwe ze wogole nie potrzebne
+ public void blank() {
+ this.setColorName("white");
+ this.value = 1;
+
+ }
+
+ public void toUp(Box [][] squares, int y, int x) {
+
+ int n = 9;
+ String temp;
+ int v; // = new Box();
+ for(int i=0; i < n; i++){
+ for(int j=1; j < (n-i); j++){
+ //if(squares[y][j-1].getColor() != squares[y][j].getColor() && squares[y][j].getColor() == "white"){
+ //if(squares[y][j-1].getColor() != squares[y][j].getColor()){
+ if(squares[j-1][x].value > squares[j][x].value) {
+
+ //swap elements
+ temp = squares[j-1][x].getColor();
+ v = squares[j-1][x].value;
+ squares[j-1][x].setColorName(squares[j][x].getColor());
+ squares[j-1][x].value = squares[j][x].value;
+ squares[j][x].setColorName(temp);
+ squares[j][x].value = v;
+ }
+
+ }
+ }
+ }
+
+ public void toLeft(Box [][] squares, int y, int x) {
+
+ int n = 6;
+ String temp;
+ int v; // = new Box();
+ for(int i=0; i < n; i++){
+ for(int j=1; j < (n-i); j++){
+ //if(squares[y][j-1].getColor() != squares[y][j].getColor() && squares[y][j].getColor() == "white"){
+ //if(squares[y][j-1].getColor() != squares[y][j].getColor()){
+ if(squares[y][j-1].value > squares[y][j].value) {
+
+ //swap elements
+ temp = squares[y][j-1].getColor();
+ v = squares[y][j-1].value;
+ squares[y][j-1].setColorName(squares[y][j].getColor());
+ squares[y][j-1].value = squares[y][j].value;
+ squares[y][j].setColorName(temp);
+ squares[y][j].value = v;
+ }
+
+ }
+ }
+ }
+
+ public void removeDuplicates() {
+
+ List<String> tmp = new ArrayList<String> ();
+
+ for(String item:this.groupList){
+ boolean find = false;
+ for (String t:tmp) {
+ if (t.equals(item)){
+ find = true;
+ }
+ }
+ if (find == false) {
+ tmp.add(item);
+ }
+ }
+ this.groupList.clear();
+ this.groupList = tmp;
+ }
+
+ public void removeDuplicatesIndex() {
+
+ List<Integer> tmp = new ArrayList<Integer> ();
+
+ for(Integer item:this.listIndex){
+ boolean find = false;
+ for (Integer t:tmp) {
+ if (t.equals(item)){
+ find = true;
+ }
+ }
+ if (find == false) {
+ tmp.add(item);
+ }
+ }
+ this.listIndex.clear();
+ this.listIndex = tmp;
+ }
+
+ public void clearVisit(){
+ this.visit = false;
+ }
+
+ public void sort() {
+
+ // Zbyt nowe dopiero od API 24
+ //String[] strings = b.groupList.toArray(String[]::new);
+ String[] strings = new String[this.groupList.size()];
+ for (int i = 0; i < this.groupList.size(); i++) {
+ strings[i] = this.groupList.get(i);
+ }
+
+ Integer[] numbers = new Integer[strings.length];
+ for(int i = 0;i < strings.length;i++)
+ {
+ try
+ {
+ numbers[i] = Integer.parseInt(strings[i]);
+ }
+ catch (NumberFormatException nfe)
+ {
+ numbers[i] = null;
+ }
+ }
+
+ Arrays.sort(numbers, Collections.reverseOrder());
+
+ /*
+ int n = numbers.length;
+ int temp = 0;
+ for(int i=0; i < n; i++){
+ for(int j=1; j < (n-i); j++){
+ if(numbers[j-1] > numbers[j]){
+ //swap elements
+ temp = numbers[j-1];
+ numbers[j-1] = numbers[j];
+ numbers[j] = temp;
+ }
+
+ }
+ }
+ */
+
+ this.groupList.clear();
+ for(int i = 0;i < numbers.length;i++)
+ {
+ try
+ {
+ this.groupList.add(Integer.toString(numbers[i]));
+ }
+ catch (NumberFormatException nfe)
+ {
+ //numbers[i] = null;
+ }
+ }
+
+ }
+
+ public void sortReverseIndex() {
+ // Zbyt nowe dopiero od API 24
+ //String[] strings = b.groupList.toArray(String[]::new);
+ Integer[] integers = new Integer[this.listIndex.size()];
+ for (int i = 0; i < this.listIndex.size(); i++) {
+ integers[i] = this.listIndex.get(i);
+ }
+
+ Arrays.sort(integers, Collections.reverseOrder());
+
+ this.listIndex.clear();
+ for(int i = 0;i < integers.length;i++)
+ {
+ try
+ {
+ this.listIndex.add(integers[i]);
+ }
+ catch (NumberFormatException nfe)
+ {
+ //numbers[i] = null;
+ }
+ }
+ }
+}
\ No newline at end of file diff --git a/android/SameGame/app/src/main/java/com/example/samegame/GridRVAdapter.kt b/android/SameGame/app/src/main/java/com/example/samegame/GridRVAdapter.kt new file mode 100644 index 0000000..fd4c993 --- /dev/null +++ b/android/SameGame/app/src/main/java/com/example/samegame/GridRVAdapter.kt @@ -0,0 +1,79 @@ +/*
+Same Game - My first application built in Kotlin
+date: 19-III-2024
+code: Przemyslaw R. Pietraszczyk
+license: GPL v3
+IDE: Android Studio Iguana
+*/
+
+package com.example.samegame
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.ImageView
+import android.widget.TextView
+
+// on below line we are creating an
+// adapter class for our grid view.
+internal class GridRVAdapter(
+ // on below line we are creating two
+ // variables for course list and context
+ private val courseList: List<GridViewModal>,
+ private val context: Context
+) :
+ BaseAdapter() {
+ // in base adapter class we are creating variables
+ // for layout inflater, course image view and course text view.
+ private var layoutInflater: LayoutInflater? = null
+ private lateinit var courseTV: TextView
+ private lateinit var courseIV: ImageView
+
+ // below method is use to return the count of course list
+ override fun getCount(): Int {
+ return courseList.size
+ }
+
+ // below function is use to return the item of grid view.
+ override fun getItem(position: Int): Any? {
+ return null
+ }
+
+ // below function is use to return item id of grid view.
+ override fun getItemId(position: Int): Long {
+ return 0
+ }
+
+ // in below function we are getting individual item of grid view.
+ override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View? {
+ var convertView = convertView
+ // on blow line we are checking if layout inflater
+ // is null, if it is null we are initializing it.
+ if (layoutInflater == null) {
+ layoutInflater =
+ context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+ }
+ // on the below line we are checking if convert view is null.
+ // If it is null we are initializing it.
+ if (convertView == null) {
+ // on below line we are passing the layout file
+ // which we have to inflate for each item of grid view.
+ convertView = layoutInflater!!.inflate(R.layout.row, null)
+ }
+ // on below line we are initializing our course image view
+ // and course text view with their ids.
+ // trzeba zainicjowac
+ //courseIV = convertView!!.findViewById(R.id.idIVCourse)
+ // Nie wyswietla ikony
+ ///courseIV.setImageResource(courseList.get(position).courseImg)
+ // on below line we are setting text in our course text view.
+ courseTV = convertView!!.findViewById(R.id.idTVCourse)
+ courseTV.setText(courseList.get(position).courseName)
+ courseTV.setBackgroundColor(courseList.get(position).courseImg);
+
+ // at last we are returning our convert view.
+ return convertView
+ }
+}
diff --git a/android/SameGame/app/src/main/java/com/example/samegame/MainActivity.kt b/android/SameGame/app/src/main/java/com/example/samegame/MainActivity.kt new file mode 100644 index 0000000..331357a --- /dev/null +++ b/android/SameGame/app/src/main/java/com/example/samegame/MainActivity.kt @@ -0,0 +1,290 @@ +/* +Same Game - My first application built in Kotlin +date: 19-III-2024 +code: Przemyslaw R. Pietraszczyk +license: GPL v3 +IDE: Android Studio Iguana +*/ + +package com.example.samegame + +//import android.R + +//import android.content.Intent + +//import android.R + +//import android.R +import android.os.Bundle +import android.widget.AdapterView +import android.widget.GridView +import android.widget.Toast +import androidx.activity.ComponentActivity +import android.view.LayoutInflater +import java.util.* + + +//import com.example.samegame.R + + +private inline fun <reified T> matrixOfFields(n: Int, m: Int) = Array(n) { arrayOfNulls<T>(m) } +//private var arrayMap = matrixOfFields<Box>(9, 6) // example arguments +//private var courseList: List<GridViewModal> = TODO() + +data class GridViewModal( + // we are creating a modal class with 2 member + // one is course name as string and + // other course img as int. + val courseName: String, + val courseImg: Int, + val resource: Int, + val index: Int +) +class MainActivity : ComponentActivity() { + + //override fun onCreate(savedInstanceState: Bundle?) { + // super.onCreate(savedInstanceState) + // setContentView(layout.activity_main) +/* + val bitmap: Bitmap = Bitmap.createBitmap(700, 1000, Bitmap.Config.ARGB_8888) + val canvas: Canvas = Canvas(bitmap) + val footingpaint = Paint () + footingpaint.setARGB (255, 128, 54, 67) + + var shapeDrawable: ShapeDrawable + // oval positions + var left = 50 + var top = 50 + var right = 200 + var bottom = 200 + + // draw rectangle shape to canvas + shapeDrawable = ShapeDrawable(RectShape()) + shapeDrawable.setBounds( left, top, right, bottom) + shapeDrawable.getPaint().setColor(Color.parseColor("#009944")) + shapeDrawable.draw(canvas) + + + // now bitmap holds the updated pixels + // val img = findViewById<View>(R.id.imageV) as ImageView + + // set bitmap as background to ImageView + //R.id.imageV.background = BitmapDrawable(getResources(), bitmap) + + //shapeDrawable.setBackground(BitmapDrawable(resources, BIMAP)) +*/ + //val img = findViewById<View>(R.id.imageV) as ImageView + + + + + + + // on below line we are creating + // variables for grid view and course list + lateinit var courseGRV: GridView + lateinit var courseList: List<GridViewModal> + //private inline fun <reified T> matrixOfFields(n: Int, m: Int) = Array(n) { arrayOfNulls<T>(m) } + //private fun <Box> matrixOfFields(n: Int, m: Int) = Array(n) { arrayOfNulls<Box>(m) } + + private var arrayMap = matrixOfFields<Box>(9, 6) // example arguments + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + // initializing variables of grid view with their ids. + courseGRV = findViewById(R.id.idGRV) + courseList = ArrayList<GridViewModal>() + + var listOfColors = listOf("blue","green", "magenta", "navy", "orange", "yellow") + var k = 0 + for (y: Int in 0..8) + { + for (x: Int in 0..5) + { + val rnds = (0..2).random() + arrayMap[y][x] = Box() + arrayMap[y][x]!!.setColorName(listOfColors[rnds]) // 9 + arrayMap[y][x]!!.setGroupIndex(k++); + arrayMap[y][x]!!.setVelocity(y, x); + } + } + for (y: Int in 0..8) + { + for (x: Int in 0..5) + { + arrayMap[y][x]!!.like(arrayMap[y][x]!!.getColor(), arrayMap, y, x, y, x); + arrayMap[y][x]!!.clearVisit() + + arrayMap[y][x]!!.removeDuplicates() + arrayMap[y][x]!!.sort() // also reverse + + arrayMap[y][x]!!.removeDuplicatesIndex() + arrayMap[y][x]!!.sortReverseIndex() + + + arrayMap[y][x]!!.resource = this.resources.getIdentifier(arrayMap[y][x]!!.getColor(), "color", this.packageName) + //courseList = courseList + GridViewModal("czwarty", R.mipmap.ic_launcher) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.groupList.toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.getColor(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.listIndex.toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + courseList = courseList + GridViewModal(arrayMap[y][x]!!.getGroupIndex().toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + + } + } + // on below line we are initializing our course adapter + // and passing course list and context. + var courseAdapter = GridRVAdapter(courseList = courseList, this@MainActivity) + + // on below line we are setting adapter to our grid view. + courseGRV.adapter = courseAdapter + + // on below line we are adding on item + // click listener for our grid view. + courseGRV.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ -> + // nie idzie tego użyć w osobnej fukcji, replikujw arrayMap + var text: String + val y: Int = position / 6 + val x: Int = position % 6 + text = "Shit" + val color: String = arrayMap[y][x]!!.getColor() + + if (y >= 1) { + val c: String = arrayMap[y-1][x]!!.getColor() + if (color == c) text = "bingo !" + } + if (y < 8) { + val c: String = arrayMap[y+1][x]!!.getColor() + if (color == c) text = "bingo !" + } + if (x >= 1) { + val c: String = arrayMap[y][x-1]!!.getColor() + if (color == c) text = "bingo !" + } + if (x < 5) { + val c: String = arrayMap[y][x+1]!!.getColor() + if (color == c) text = "bingo !" + } + /* + Toast.makeText( + applicationContext, courseList[position].courseName + " selected", + //applicationContext, text, + Toast.LENGTH_SHORT + ).show() + */ + + if (text != "Shit") { + for (l in arrayMap[y][x]!!.listIndex) { + val i: Int = l / 6 + val j: Int = l % 6 + arrayMap[i][j]!!.blank() + } + println("Left lastIndex: "+arrayMap[y][x]!!.listIndex.toString()) + // Przesunięcie w lerwo + for (l in arrayMap[y][x]!!.listIndex) { + val i: Int = l / 6 + val j: Int = l % 6 + arrayMap[i][j]!!.toLeft(arrayMap, i, j) + } + + + // Usuwanie elementow + + for (y: Int in 0..8) { + for (x: Int in 0..5) { + arrayMap[y][x]!!.groupList.clear() + arrayMap[y][x]!!.listIndex.clear() + } + } + + courseList = ArrayList<GridViewModal>() + for (y: Int in 0..8) + { + for (x: Int in 0..5) + { + arrayMap[y][x]!!.like(arrayMap[y][x]!!.getColor(), arrayMap, y, x, y, x); + arrayMap[y][x]!!.clearVisit() + + arrayMap[y][x]!!.removeDuplicates() + arrayMap[y][x]!!.sort() + arrayMap[y][x]!!.removeDuplicatesIndex() + arrayMap[y][x]!!.sortReverseIndex() + + + arrayMap[y][x]!!.resource = this.resources.getIdentifier(arrayMap[y][x]!!.getColor(), "color", this.packageName) + //courseList = courseList + GridViewModal("czwarty", R.mipmap.ic_launcher) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.groupList.toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.getColor(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.listIndex.toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + courseList = courseList + GridViewModal(arrayMap[y][x]!!.getGroupIndex().toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + + } + + } + + + + //courseAdapter = GridRVAdapter(courseList = courseList, this@MainActivity) + //courseGRV.invalidateViews(); + //courseGRV.setAdapter(courseAdapter); + //courseAdapter.notifyDataSetChanged() + + + + + + for (i: Int in 0..8) + for (j: Int in 0..5) + arrayMap[i][j]!!.toUp(arrayMap, i, j) + + // czyszczenie + + for (y: Int in 0..8) { + for (x: Int in 0..5) { + arrayMap[y][x]!!.groupList.clear() + arrayMap[y][x]!!.listIndex.clear() + } + } + + courseList = ArrayList<GridViewModal>() + for (y: Int in 0..8) + { + for (x: Int in 0..5) + { + arrayMap[y][x]!!.like(arrayMap[y][x]!!.getColor(), arrayMap, y, x, y, x); + arrayMap[y][x]!!.clearVisit() + + arrayMap[y][x]!!.removeDuplicates() + arrayMap[y][x]!!.sort() + arrayMap[y][x]!!.removeDuplicatesIndex() + arrayMap[y][x]!!.sortReverseIndex() + + + arrayMap[y][x]!!.resource = this.resources.getIdentifier(arrayMap[y][x]!!.getColor(), "color", this.packageName) + //courseList = courseList + GridViewModal("czwarty", R.mipmap.ic_launcher) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.groupList.toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.getColor(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + //courseList = courseList + GridViewModal(arrayMap[y][x]!!.listIndex.toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + courseList = courseList + GridViewModal(arrayMap[y][x]!!.getGroupIndex().toString(), getResources().getColor( arrayMap[y][x]!!.resource), arrayMap[y][x]!!.resource, arrayMap[y][x]!!.getGroupIndex() ) + + } + + } + + courseAdapter = GridRVAdapter(courseList = courseList, this@MainActivity) + courseGRV.invalidateViews(); + courseGRV.setAdapter(courseAdapter); + courseAdapter.notifyDataSetChanged() + + + + // on below line we are setting adapter to our grid view. + // courseGRV.adapter = courseAdapter + + } + + } + + } +} diff --git a/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Color.kt b/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Color.kt new file mode 100644 index 0000000..2510091 --- /dev/null +++ b/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.samegame.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260)
\ No newline at end of file diff --git a/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Theme.kt b/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Theme.kt new file mode 100644 index 0000000..6a5d879 --- /dev/null +++ b/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.example.samegame.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun SameGameTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +}
\ No newline at end of file diff --git a/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Type.kt b/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Type.kt new file mode 100644 index 0000000..eefeeae --- /dev/null +++ b/android/SameGame/app/src/main/java/com/example/samegame/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.samegame.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +)
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/drawable/ic_launcher_background.xml b/android/SameGame/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..953ca56 --- /dev/null +++ b/android/SameGame/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?>
+<vector
+ android:height="108dp"
+ android:width="108dp"
+ android:viewportHeight="108"
+ android:viewportWidth="108"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#3DDC84"
+ android:pathData="M0,0h108v108h-108z"/>
+ <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/android/SameGame/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/SameGame/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/android/SameGame/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt" + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z"> + <aapt:attr name="android:fillColor"> + <gradient + android:endX="85.84757" + android:endY="92.4963" + android:startX="42.9492" + android:startY="49.59793" + android:type="linear"> + <item + android:color="#44000000" + android:offset="0.0" /> + <item + android:color="#00000000" + android:offset="1.0" /> + </gradient> + </aapt:attr> + </path> + <path + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" + android:strokeWidth="1" + android:strokeColor="#00000000" /> +</vector>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/drawable/my_image.xml b/android/SameGame/app/src/main/res/drawable/my_image.xml new file mode 100644 index 0000000..83cbc16 --- /dev/null +++ b/android/SameGame/app/src/main/res/drawable/my_image.xml @@ -0,0 +1,15 @@ +<!--
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <bitmap android:gravity="center" android:src="@drawable/remove" />
+</selector>
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+<item>
+
+
+ <bitmap android:gravity="center" android:src="@mipmap/ic_launcher" />
+
+</item>
+</layer-list>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/layout/activity_main.xml b/android/SameGame/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..60e93f9 --- /dev/null +++ b/android/SameGame/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:tools="http://schemas.android.com/tools"
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+tools:context=".MainActivity">
+
+<!--on below line we are creating a grid view-->
+<GridView
+ android:id="@+id/idGRV"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:horizontalSpacing="1dp"
+ android:numColumns="6"
+ android:verticalSpacing="1dp" />
+
+</RelativeLayout>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/layout/gridview_item.xml b/android/SameGame/app/src/main/res/layout/gridview_item.xml new file mode 100644 index 0000000..42b5e45 --- /dev/null +++ b/android/SameGame/app/src/main/res/layout/gridview_item.xml @@ -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"
+android:padding="2dp"
+android:background="#E0F7FA"
+android:layout_width="match_parent"
+android:layout_height="match_parent">
+
+<androidx.cardview.widget.CardView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:padding="4dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+<!--
+ <ImageView
+ android:id="@+id/idIVCourse"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:layout_gravity="center"
+ android:layout_margin="5dp"
+ android:padding="4dp"
+ android:src="@mipmap/ic_launcher" />
+
+
+
+ <TextView
+ android:id="@+id/idTVCourse"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_margin="5dp"
+ android:padding="4dp"
+ android:text="@string/app_name"
+ android:textAlignment="center"
+ android:textColor="@color/black" />
+ -->
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/layout/row.xml b/android/SameGame/app/src/main/res/layout/row.xml new file mode 100644 index 0000000..08c1896 --- /dev/null +++ b/android/SameGame/app/src/main/res/layout/row.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/layoutbg"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:gravity="center"
+ android:orientation="horizontal" >
+<!--
+ <ImageView
+ android:id="@+id/idIVCourse"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_margin="2dp"
+ android:padding="1dp"
+ />
+ - android:src="@mipmap/ic_launcher" -->
+
+ <TextView
+ android:id="@+id/idTVCourse"
+ android:layout_width="100dp"
+ android:layout_height="77dp"
+ android:layout_gravity="center"
+ android:layout_margin="1dp"
+ android:padding="1dp"
+ android:background="@color/white"
+ android:text="@string/app_name"
+ android:textAlignment="center"
+ android:textColor="@color/black" />
+</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/SameGame/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..fdd632e --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/SameGame/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..fdd632e --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..31329f1 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp Binary files differnew file mode 100644 index 0000000..b624c4b --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp diff --git a/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differnew file mode 100644 index 0000000..34d648f --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..c33fa57 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp Binary files differnew file mode 100644 index 0000000..e3b8d9e --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp diff --git a/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differnew file mode 100644 index 0000000..4d92e62 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..143b4a1 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp Binary files differnew file mode 100644 index 0000000..e1ea7a3 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differnew file mode 100644 index 0000000..abc1481 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..809bcfc --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp Binary files differnew file mode 100644 index 0000000..c121dc0 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differnew file mode 100644 index 0000000..51398c2 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..fc78684 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp Binary files differnew file mode 100644 index 0000000..c6c796a --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp diff --git a/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differnew file mode 100644 index 0000000..c6ae7d3 --- /dev/null +++ b/android/SameGame/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/android/SameGame/app/src/main/res/values/colors.xml b/android/SameGame/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..7b6621e --- /dev/null +++ b/android/SameGame/app/src/main/res/values/colors.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="blue">#FF0CEBF8</color> + <color name="green">#FF11eE23</color> + <color name="magenta">#FFF41A6C</color> + <color name="navy">#FF100BCC</color> + <color name="orange">#FFE88216</color> + <color name="yellow">#FFE1E111</color> + <color name="white">#FFFFFFFF</color> + <color name="black">#FF000000</color> +</resources>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/values/string.xml b/android/SameGame/app/src/main/res/values/string.xml new file mode 100644 index 0000000..2dad5e4 --- /dev/null +++ b/android/SameGame/app/src/main/res/values/string.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<string name="string_name">text_string</string>
+</resources>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/values/strings.xml b/android/SameGame/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..e9d03d4 --- /dev/null +++ b/android/SameGame/app/src/main/res/values/strings.xml @@ -0,0 +1,14 @@ +<resources> + <string name="app_name">Same Game</string> + <string name="text_view">Choice</string> + <!-- + <string name="blue">R.color.blue</string> + <string name="green">R.color.green</string> + <string name="magenta">R.color.magenta</string> + <string name="navy">R.color.navy</string> + <string name="orange">R.color.orange</string> + <string name="yellow">R.color.yellow</string> + <string name="white">R.color.white</string> + <string name="black">R.color.black</string> + --> +</resources>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/values/themes.xml b/android/SameGame/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..47d9663 --- /dev/null +++ b/android/SameGame/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="Theme.SameGame" parent="android:Theme.Material.Light.NoActionBar" /> +</resources>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/xml/backup_rules.xml b/android/SameGame/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/android/SameGame/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Sample backup rules file; uncomment and customize as necessary. + See https://developer.android.com/guide/topics/data/autobackup + for details. + Note: This file is ignored for devices older that API 31 + See https://developer.android.com/about/versions/12/backup-restore +--> +<full-backup-content> + <!-- + <include domain="sharedpref" path="."/> + <exclude domain="sharedpref" path="device.xml"/> +--> +</full-backup-content>
\ No newline at end of file diff --git a/android/SameGame/app/src/main/res/xml/data_extraction_rules.xml b/android/SameGame/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/android/SameGame/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Sample data extraction rules file; uncomment and customize as necessary. + See https://developer.android.com/about/versions/12/backup-restore#xml-changes + for details. +--> +<data-extraction-rules> + <cloud-backup> + <!-- TODO: Use <include> and <exclude> to control what is backed up. + <include .../> + <exclude .../> + --> + </cloud-backup> + <!-- + <device-transfer> + <include .../> + <exclude .../> + </device-transfer> + --> +</data-extraction-rules>
\ No newline at end of file diff --git a/android/SameGame/app/src/test/java/com/example/samegame/ExampleUnitTest.kt b/android/SameGame/app/src/test/java/com/example/samegame/ExampleUnitTest.kt new file mode 100644 index 0000000..4e9f129 --- /dev/null +++ b/android/SameGame/app/src/test/java/com/example/samegame/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.samegame + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +}
\ No newline at end of file diff --git a/android/SameGame/build.gradle.kts b/android/SameGame/build.gradle.kts new file mode 100644 index 0000000..a0985ef --- /dev/null +++ b/android/SameGame/build.gradle.kts @@ -0,0 +1,5 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.androidApplication) apply false + alias(libs.plugins.jetbrainsKotlinAndroid) apply false +}
\ No newline at end of file diff --git a/android/SameGame/gradle.properties b/android/SameGame/gradle.properties new file mode 100644 index 0000000..20e2a01 --- /dev/null +++ b/android/SameGame/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true
\ No newline at end of file diff --git a/android/SameGame/gradle/libs.versions.toml b/android/SameGame/gradle/libs.versions.toml new file mode 100644 index 0000000..32534eb --- /dev/null +++ b/android/SameGame/gradle/libs.versions.toml @@ -0,0 +1,31 @@ +[versions] +agp = "8.3.1" +kotlin = "1.9.0" +coreKtx = "1.10.1" +junit = "4.13.2" +junitVersion = "1.1.5" +espressoCore = "3.5.1" +lifecycleRuntimeKtx = "2.6.1" +activityCompose = "1.7.0" +composeBom = "2023.08.00" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } + +[plugins] +androidApplication = { id = "com.android.application", version.ref = "agp" } +jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } + diff --git a/android/SameGame/gradle/wrapper/gradle-wrapper.jar b/android/SameGame/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/android/SameGame/gradle/wrapper/gradle-wrapper.jar diff --git a/android/SameGame/gradle/wrapper/gradle-wrapper.properties b/android/SameGame/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0daf4b8 --- /dev/null +++ b/android/SameGame/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Mar 18 21:39:20 CET 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/android/SameGame/gradlew b/android/SameGame/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/android/SameGame/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/android/SameGame/gradlew.bat b/android/SameGame/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/android/SameGame/gradlew.bat @@ -0,0 +1,89 @@ +@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android/SameGame/settings.gradle.kts b/android/SameGame/settings.gradle.kts new file mode 100644 index 0000000..f4fe2e4 --- /dev/null +++ b/android/SameGame/settings.gradle.kts @@ -0,0 +1,24 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "Same Game" +include(":app") +
\ No newline at end of file diff --git a/desktop/samegame/Changelog.txt b/desktop/samegame/Changelog.txt new file mode 100644 index 0000000..ce437bf --- /dev/null +++ b/desktop/samegame/Changelog.txt @@ -0,0 +1,12 @@ +0.240417-2 - Pakietowanie +0.240417-1 - Poprawki w naliczaniu punktacji z promowaaniem wyższych poziomów +0.240417-0 - Dodalem punktacje oraz poziomy +0.240416-0 - Plik Makefile oraz desktop +0.240414-0 - Dodanie funkcji reset - dla nowego rozdania +0.240412-3 - Chodzi po byku, można resetować grę +0.240412-2 - Prawie dobrze usuwa w pionie, prawie +0.240412-0 - Wyglada na to że już się nie zawiesza, tylko potrafi długo przeliczać +0.240411-1 - Działa czysto, choć dlugo liczy +0.240411-0 - Wychrzania się na drugim dobieraniu, daleko mu do wersji z Androida, szczerze mówiąc +0.240410-0 - Stan podobny do portu z Androida +0.240329-0 - Inicjacja diff --git a/desktop/samegame/DEBIAN/HOWTO.txt b/desktop/samegame/DEBIAN/HOWTO.txt new file mode 100644 index 0000000..a371e0b --- /dev/null +++ b/desktop/samegame/DEBIAN/HOWTO.txt @@ -0,0 +1,2 @@ +foramt zapisu nazwy pliku: + photocrop_0.221225-0~alpha.tar.gz diff --git a/desktop/samegame/DEBIAN/debian.changelog b/desktop/samegame/DEBIAN/debian.changelog new file mode 100644 index 0000000..b05edc8 --- /dev/null +++ b/desktop/samegame/DEBIAN/debian.changelog @@ -0,0 +1,5 @@ +samegame (0.240417-2) unstable; urgency=low + + * Last release + + -- Przemysław R. Pietraszczyk Wed, 17 Apr 2022 14:11:41 +0200 diff --git a/desktop/samegame/DEBIAN/debian.control b/desktop/samegame/DEBIAN/debian.control new file mode 100644 index 0000000..bb02b65 --- /dev/null +++ b/desktop/samegame/DEBIAN/debian.control @@ -0,0 +1,13 @@ +Source: samegame +Section: java +Priority: extra +Maintainer: Przemysław R. Pietraszczyk +Build-Depends: debhelper-compat (= 12), default-jdk, default-jdk-headless, fakeroot, ant +Standards-Version: 0.0000 +Homepage: https://pietraszczyk.smallhost.pl + + +Package: samegame +Architecture: all +Depends: ${misc:Depends}, default-jdk | default-jre +Description: My implementation Same Game diff --git a/desktop/samegame/DEBIAN/debian.rules b/desktop/samegame/DEBIAN/debian.rules new file mode 100644 index 0000000..b7f75b6 --- /dev/null +++ b/desktop/samegame/DEBIAN/debian.rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +export DH_VERBOSE = 1 + +clean: + ant clean + +build: + ant compile + ant jar + +binary: + mkdir -pm 0755 debian/samegame + mkdir -pm 0755 debian/samegame/usr/games + mkdir -pm 0755 debian/samegame/usr/share/samegame + mkdir -pm 0755 debian/samegame/usr/share/applications + cp build/jar/SameGame.jar debian/samegame/usr/games + cp res/samegame.png debian/samegame/usr/share/samegame + cp SameGame.desktop debian/samegame/usr/share/applications + dh_gencontrol + dh_builddeb + diff --git a/desktop/samegame/DEBIAN/format.sh b/desktop/samegame/DEBIAN/format.sh new file mode 100755 index 0000000..7a807b6 --- /dev/null +++ b/desktop/samegame/DEBIAN/format.sh @@ -0,0 +1,2 @@ +mkdir ./exec +exec /usr/lib/build/debtransform ./ ./samegame.dsc ./exec diff --git a/desktop/samegame/DEBIAN/samegame.dsc b/desktop/samegame/DEBIAN/samegame.dsc new file mode 100644 index 0000000..3e2cdc8 --- /dev/null +++ b/desktop/samegame/DEBIAN/samegame.dsc @@ -0,0 +1,40 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +Format: 1.0 +Source: samegame +Binary: samegame +Architecture: all +Version: 0.210503-2 +Maintainer: Przemysław R. Pietraszczyk <prymula76@outlook.com> +Homepage: https://pietraszczyk.smallhost.pl +DEBTRANSFORM-TAR: samegame-0.240417-2.tar.gz + +Standards-Version: 0.000000 +Build-Depends: debhelper-compat (>= 12), default-jdk, default-jdk-headless, fakeroot, ant +Package-List: +colorsmemory deb x11 optional arch=all +Files: + b31649bc23b2b7bca9ab70ea3410711a 128820 samegame-0.240417-2.tar.gz + 29e7e7e60bc81891e3da3871b9eeb549 764 samegame-0.240417-2.debian.tar.xz + +-----BEGIN PGP SIGNATURE----- + +mQENBGEf/c4BCAC2d4ymW0pRZV36qLtlt/WGb83kos5UX5UbwvkQrbUjAbOPOY8w +DT3M1neYOAPZx38924aPTFKbZPcz+rK/7Wcv1kzgfux5zXQJTLeqpkhUYAgXUg2p +oK9ZXsai82fOicTrClOyJLLYQ8C1vj8yUh7e3ERljEyp5Nxg/lY92rwcZ4WYR193 +nGDInlDl5JlWUcLlk/RFnC5bB+T6ZZr5FBX/eDnKAPEl+N3MWpDs2JLDy7EUPhcG +U/60X0wuXHPTwMoNbB3ep/bWRxwEej0sFad5GXeCh7hKCroi/kLmLTDIxSD8lsRr +Y4H/8H2lBBsQq7bRL88N6ZDGCocPo11V83kFABEBAAG0NmhvbWU6cHJ6ZW0gT0JT +IFByb2plY3QgPGhvbWU6cHJ6ZW1AYnVpbGQub3BlbnN1c2Uub3JnPokBPgQTAQgA +KAUCYR/9zgIbAwUJBB6wAAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQcXEc +NPcNefFEAAf+Kg4cs/C99kEIMv/PO85VW+p8rcTwCViOFUX5WrBhwsRyPAKrJPPG +KD6PdnvoplcNQwhQ8nRsRiiaiUtPcj8Bvi6EdPgSgXXObKKJtCyaAa1rURdlb9iW +CfvXA6oW+PGlii9BMnXOAtkeFIzZooO9oXd+wez66P+4VWFiFzxanLfLn/hwbWxQ +68rlO3QNGbrMeODBgwh9s83XGmAg47mn2fldTAmTbJDf9tMi1LhX2MmLyN9wjqsd +4IZ9JMri2JTnIhYfxWdKT9gsu7q0g8LqonaXMvlOEyHFRF1YQ0i7G6fFbvDcKCZN +W1Eja55FdN7smv5Eck6UTIIYyWPuAv45uohGBBMRAgAGBQJhH/3PAAoJEDswEbdr +nWUj4M0AniJ389dyvUjjgS91AcOb08E4moV9AJ9WDL3/7GYYUL/Azw43QucWPnXr +uw== +=+lfH +-----END PGP SIGNATURE----- diff --git a/desktop/samegame/Makefile b/desktop/samegame/Makefile new file mode 100644 index 0000000..980961a --- /dev/null +++ b/desktop/samegame/Makefile @@ -0,0 +1,25 @@ +prefix=/usr + +all: + ant compile + ant jar + +clean: + ant clean + +install: build/jar/SameGame.jar + mkdir -pm 0755 $(DESTDIR)$(prefix)/games + install -m 0644 build/jar/SameGame.jar $(DESTDIR)$(prefix)/games + mkdir -pm 0755 $(DESTDIR)$(prefix)/share/samegame + mkdir -pm 0755 $(DESTDIR)$(prefix)/share/applications + install -m 0644 res/samegame.png $(DESTDIR)$(prefix)/share/samegame + install -m 0644 SameGame.desktop $(DESTDIR)$(prefix)/share/applications + +.PHONY: install + +uninstall: + rm $(prefix)/games/SameGame.jar + rm -r $(prefix)/share/samegame + rm $(prefix)/share/applications/SameGame.desktop + +.PHONY: uninstall diff --git a/desktop/samegame/PKG/PKGBUILD b/desktop/samegame/PKG/PKGBUILD new file mode 100644 index 0000000..d0dbf59 --- /dev/null +++ b/desktop/samegame/PKG/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Przemyslaw R. Pietraszczyk <prymula76@outlook.com> + +pkgname=samegame +pkgver=0.240417 +pkgrel=2 +pkgdesc="My implementation Same Game" +arch=('any') +url="pietraszczyk.smallhost.pl" +license=('GPL3') +provides=('samegame') +depends=('jdk-openjdk') +makedepends=('jdk-openjdk' 'ant') +source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::file://${pkgname}-${pkgver}-${pkgrel}.tar.gz") +sha256sums=('fee822aff2c249ba0b93b9dad2967442de5c39a4f35fa7cfb125fe590a37d1a8') #generate with 'makepkg -g' || sha256sum +build() { + cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}" + make -f Makefile +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}" + make -f Makefile DESTDIR="${pkgdir}" install +} diff --git a/desktop/samegame/RPM/samegame.spec b/desktop/samegame/RPM/samegame.spec new file mode 100644 index 0000000..abca6c8 --- /dev/null +++ b/desktop/samegame/RPM/samegame.spec @@ -0,0 +1,67 @@ +# +# spec file for package samegame +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + +%define unmangled_version 0.240417-2 +Name: samegame +Version: 0.240417 +Release: 2 +Summary: My implementation Same Game +License: GPL +URL: https://pietraszczyk.smallhost.pl +Source0: %{name}-%{unmangled_version}.tar.gz +%if 0%{?suse_version}==1530 +BuildRequires: java-11-openjdk, ant +Requires: java-11-openjdk +%else +BuildRequires: java-11-openjdk, ant +Requires: java-11-openjdk +%endif +BuildArch: noarch + +%description + + +%prep +%setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} + +%build +ant compile +ant jar + +%install +mkdir -p %{buildroot}/usr +mkdir -p %{buildroot}/usr/games +mkdir -p %{buildroot}/usr/share +mkdir -p %{buildroot}/usr/share/samegame +mkdir -p %{buildroot}/usr/share/applications + +#%make_install + +install -m 0644 build/jar/SameGame.jar %{buildroot}/usr/games +install -m 0644 res/samegame.png %{buildroot}/usr/share/samegame +install -m 0644 SameGame.desktop %{buildroot}/usr/share/applications + +%files +%defattr(0755,root,root) +/usr/games/ +%{_datadir}/samegame/ +%defattr(0644,root,root) +/usr/games/SameGame.jar +%{_datadir}/samegame/samegame.png +%{_datadir}/applications/SameGame.desktop + +%changelog diff --git a/desktop/samegame/SameGame.desktop b/desktop/samegame/SameGame.desktop new file mode 100644 index 0000000..0463928 --- /dev/null +++ b/desktop/samegame/SameGame.desktop @@ -0,0 +1,13 @@ +#!/usr/bin/env xdg-open + +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Categories=Game; + +Name=Same Game + +Exec=java -jar /usr/games/SameGame.jar +Terminal=false +Icon=/usr/share/samegame/samegame.png + diff --git a/desktop/samegame/build.xml b/desktop/samegame/build.xml new file mode 100644 index 0000000..ddf813a --- /dev/null +++ b/desktop/samegame/build.xml @@ -0,0 +1,25 @@ +<project> + + <target name="clean"> + <delete dir="build"/> + </target> + + <target name="compile"> + <mkdir dir="build/classes"/> + <javac srcdir="src" destdir="build/classes"/> + </target> + + <target name="jar"> + <mkdir dir="build/jar"/> + <jar destfile="build/jar/SameGame.jar" basedir="build/classes"> + <manifest> + <attribute name="Main-Class" value="pietraszczyk.samegame.SameGame"/> + </manifest> + </jar> + </target> + + <target name="run"> + <java jar="build/jar/SameGame.jar" fork="true"/> + </target> + +</project> diff --git a/desktop/samegame/res/samegame.png b/desktop/samegame/res/samegame.png Binary files differnew file mode 100644 index 0000000..3a978c4 --- /dev/null +++ b/desktop/samegame/res/samegame.png diff --git a/desktop/samegame/src/pietraszczyk/samegame/Field.java b/desktop/samegame/src/pietraszczyk/samegame/Field.java new file mode 100644 index 0000000..17a82ae --- /dev/null +++ b/desktop/samegame/src/pietraszczyk/samegame/Field.java @@ -0,0 +1,331 @@ +/*
+Same Game - My first application built in Kotlin
+date: 19-III-2024
+code: Przemyslaw R. Pietraszczyk
+license: GPL v3
+IDE: Android Studio Iguana
+*/
+package pietraszczyk.samegame;
+
+import java.util.*;
+import java.lang.*;
+import javax.swing.*;
+import java.awt.*;
+
+public class Field {
+ int index;
+ int groupIndex;
+ //String color;
+ //int x, y;
+ boolean visit;
+ public java.util.List<String> groupList = new ArrayList<String>();
+ public java.util.List<Integer> listIndex = new ArrayList<Integer>();
+
+ public int value; // czy kolor (0) czy bialy (1)
+ public int resource;
+
+
+
+ JButton button;
+ private Color colorHide, color;
+ private int x,y;
+ boolean found;
+ //boolean reserve;
+ boolean postReserve;
+
+
+ public Field () {
+ postReserve=false;
+ }
+
+ public Field(int i, int j) {
+
+ visit = false;
+ value = 0;
+
+ button = new JButton("?");
+ color=new Color(255,255,255);
+ y = i;
+ x = j;
+ found=false;
+ // reserve=false;
+ postReserve=false;
+
+ }
+
+ public void reset() {
+ visit = false;
+ value = 0;
+ }
+
+ public void setIndex(int n) {
+ int index = n;
+ }
+
+ public void setGroupIndex(int n) {
+ groupIndex = n;
+ }
+
+ public void setColorName(Color c) {
+ color = c;
+ }
+
+ public void setVelocity(int _x, int _y) {
+ x = _x;
+ y = _y;
+ }
+
+ public int getGroupIndex() {
+ return groupIndex;
+ }
+
+ public int getVelocityY() {
+ return y;
+ }
+
+ public int getVelocityX() {
+ return x;
+ }
+
+ public Color getColorHide(){
+ return colorHide;
+ }
+ public Color getColor() {
+ return color;
+ }
+ public void setColorHide(int r, int g, int b){
+ color=new Color(r,g,b);
+ }
+ public void setFound(boolean f){
+ found=f;
+ }
+ public boolean getFound(){
+ return found;
+ }
+
+
+
+
+ private String toRgb(Color arg){
+ return String.format("%02X%02X%02X", arg.getRed(), arg.getGreen(), arg.getBlue());
+ }
+
+
+
+
+
+ public void like(Color color, Field [][] squares, int y, int x, int origy, int origx){
+
+ Color white = new Color(255,255, 255);
+
+ // if ( squares[y][x].getColor() != white) {
+ // if (squares[y][x].getColor() == color) {
+ //System.out.println("Adr: "+squares[y][x].getColor());
+ if (squares[y][x].visit == false) {
+ if ( (toRgb(squares[y][x].getColor()).equals(toRgb(white))) == false) {
+ if (toRgb(squares[y][x].getColor()).equals(toRgb(color))) {
+
+ //if (squares[y][x].visit == false) {
+ // squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ // squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+ //}
+
+
+ if (y >= 1) {
+ if (squares[y - 1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ squares[y][x].visit = true;
+ like(color, squares, y - 1, x, origy, origx);
+ }
+ }
+ if (x >= 1) {
+ if (squares[y][x - 1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ squares[y][x].visit = true;
+ like(color, squares, y, x - 1, origy, origx);
+ }
+ }
+
+ if (y < 8) {
+ if (squares[y + 1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ squares[y][x].visit = true;
+ like(color, squares, y + 1, x, origy, origx);
+ }
+ }
+
+ if (x < 5) {
+ if (squares[y][x + 1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].getGroupIndex()));
+ squares[origy][origx].listIndex.add(squares[y][x].getGroupIndex());
+
+ squares[y][x].visit = true;
+ like(color, squares, y, x + 1, origy, origx);
+ }
+ }
+ squares[y][x].visit = false;
+ }
+
+ }
+ }
+ }
+
+ // Mozliwe ze wogole nie potrzebne
+ public void blank() {
+ this.setColorName(new Color(255, 255, 255));
+ this.value = 1;
+
+ }
+
+ public void toUp(Field [][] squares, int y, int x) {
+
+ int n = 9;
+ Color temp; // String
+ int v; // = new Box();
+ for(int i=0; i < n; i++){
+ for(int j=1; j < (n-i); j++){
+ if(squares[j-1][x].value > squares[j][x].value) {
+ //swap elements
+ temp = squares[j-1][x].getColor();
+ v = squares[j-1][x].value;
+ squares[j-1][x].setColorName(squares[j][x].getColor());
+ squares[j-1][x].value = squares[j][x].value;
+ squares[j][x].setColorName(temp);
+ squares[j][x].value = v;
+ }
+
+ }
+ }
+ }
+
+ public void toLeft(Field [][] squares, int y, int x) {
+
+ int n = 6;
+ Color temp; //String
+ int v; // = new Box();
+ for(int i=0; i < n; i++){
+ for(int j=1; j < (n-i); j++){
+ if(squares[y][j-1].value > squares[y][j].value) {
+ //swap elements
+ temp = squares[y][j-1].getColor();
+ v = squares[y][j-1].value;
+ squares[y][j-1].setColorName(squares[y][j].getColor());
+ squares[y][j-1].value = squares[y][j].value;
+ squares[y][j].setColorName(temp);
+ squares[y][j].value = v;
+ }
+
+ }
+ }
+ }
+
+ public void removeDuplicates() {
+
+ java.util.List<String> tmp = new ArrayList<String> ();
+
+ for(String item:this.groupList){
+ boolean find = false;
+ for (String t:tmp) {
+ if (t.equals(item)){
+ find = true;
+ }
+ }
+ if (find == false) {
+ tmp.add(item);
+ }
+ }
+ this.groupList.clear();
+ this.groupList = tmp;
+ }
+
+ public void removeDuplicatesIndex() {
+
+ java.util.List<Integer> tmp = new ArrayList<Integer> ();
+
+ for(Integer item:this.listIndex){
+ boolean find = false;
+ for (Integer t:tmp) {
+ if (t.equals(item)){
+ find = true;
+ }
+ }
+ if (find == false) {
+ tmp.add(item);
+ }
+ }
+ this.listIndex.clear();
+ this.listIndex = tmp;
+ }
+
+ public void clearVisit(){
+ this.visit = false;
+ }
+
+ public void sort() {
+
+ // Zbyt nowe dopiero od API 24
+ //String[] strings = b.groupList.toArray(String[]::new);
+ String[] strings = new String[this.groupList.size()];
+ for (int i = 0; i < this.groupList.size(); i++) {
+ strings[i] = this.groupList.get(i);
+ }
+
+ Integer[] numbers = new Integer[strings.length];
+ for(int i = 0;i < strings.length;i++)
+ {
+ try
+ {
+ numbers[i] = Integer.parseInt(strings[i]);
+ }
+ catch (NumberFormatException nfe)
+ {
+ numbers[i] = null;
+ }
+ }
+
+ Arrays.sort(numbers, Collections.reverseOrder());
+
+ this.groupList.clear();
+ for(int i = 0;i < numbers.length;i++)
+ {
+ try
+ {
+ this.groupList.add(Integer.toString(numbers[i]));
+ }
+ catch (NumberFormatException nfe)
+ {
+ //numbers[i] = null;
+ }
+ }
+
+ }
+
+ public void sortReverseIndex() {
+ // Zbyt nowe dopiero od API 24
+ //String[] strings = b.groupList.toArray(String[]::new);
+ Integer[] integers = new Integer[this.listIndex.size()];
+ for (int i = 0; i < this.listIndex.size(); i++) {
+ integers[i] = this.listIndex.get(i);
+ }
+
+ Arrays.sort(integers, Collections.reverseOrder());
+
+ this.listIndex.clear();
+ for(int i = 0;i < integers.length;i++)
+ {
+ try
+ {
+ this.listIndex.add(integers[i]);
+ }
+ catch (NumberFormatException nfe)
+ {
+ }
+ }
+ }
+}
diff --git a/desktop/samegame/src/pietraszczyk/samegame/SameGame.java b/desktop/samegame/src/pietraszczyk/samegame/SameGame.java new file mode 100644 index 0000000..ae923d8 --- /dev/null +++ b/desktop/samegame/src/pietraszczyk/samegame/SameGame.java @@ -0,0 +1,408 @@ +/*
+ * Same Game - desktop - third approach to the problem
+ * 29-III-2024
+ * code: Przemyslaw R. Pietraszczyk
+ * licence: GPL v3
+ * IDE: Geany
+ */
+package pietraszczyk.samegame;
+
+import java.awt.*; // Toolkit
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+//import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.Box;
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.util.Timer;
+import java.util.*; //Timer
+import java.lang.*;
+
+public class SameGame extends JPanel
+ implements ActionListener {
+ static JMenuBar menuBar;
+ JMenu menu, info;
+ JMenuItem menuItem, menuExit, menuInfo, l1, l2, l3, l4;
+ static final int NW = 6, NH = 9; //NW=9, NH=6; // weight - height
+ static JFrame frame;
+ static Timer timer;
+ static Field [][]field = new Field[NH][NW];
+ static int []tmpi = new int[2];
+ static int []tmpj = new int[2];
+ static boolean showColor=false;
+ static boolean press=false;
+ static boolean lockClick=false;
+ static int nmove=0;
+ static int nFields; // ilosc pozostalych pol do odkrycia
+ static JLabel label = new JLabel("Witaj w Same Game - poziom 1");
+ static int score;
+ static int level;
+
+ public SameGame() {
+ super(new GridBagLayout());
+ GridBagLayout gridbag = (GridBagLayout)getLayout();
+ GridBagConstraints c = new GridBagConstraints();
+ int i;
+ int j;
+ // int x, y;
+ int k=0;
+ level = 1;
+
+ menuBar = new JMenuBar();
+ menu = new JMenu("Plik");
+ menuBar.add(menu);
+ // przenosi INFO na prawa strone
+ menuBar.add(Box.createHorizontalGlue());
+ info = new JMenu("Info");
+ info.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+ menuBar.add(info);
+ menuItem = new JMenuItem("Nowa Gra", null);
+ menuItem.setActionCommand("NewGame");
+ menuItem.addActionListener(this);
+ menuItem.setToolTipText("Rozpoczyna nowa gre");
+ menu.add(menuItem);
+
+ JMenu med = new JMenu("Poziom");
+ l1 = new JMenuItem("Dwa kolory");
+ l1.setActionCommand("L1");
+ l1.addActionListener(this);
+ med.add(l1);
+ l2 = new JMenuItem("Trzy kolory");
+ l2.setActionCommand("L2");
+ l2.addActionListener(this);
+ med.add(l2);
+ l3 = new JMenuItem("Cztery kolory");
+ l3.setActionCommand("L3");
+ l3.addActionListener(this);
+ med.add(l3);
+ l4 = new JMenuItem("Piec kolorow");
+ l4.setActionCommand("L4");
+ l4.addActionListener(this);
+ med.add(l4);
+
+ menu.add(med);
+
+ menu.addSeparator();
+ menuItem = new JMenuItem("Zakoncz", null);
+ menuItem.setActionCommand("Exit");
+ menuItem.addActionListener(this);
+ menuItem.setToolTipText("Wyjscie z programu");
+ menu.add(menuItem);
+ menuItem = new JMenuItem("O Programie", null);
+ menuItem.setActionCommand("About");
+ menuItem.addActionListener(this);
+ menuItem.setToolTipText("Informacje o programie");
+ info.add(menuItem);
+
+ for (i=0; i<NH;i++) {
+ for (j = 0; j < NW; j++, k++) {
+ field[i][j] = new Field(i, j);
+ field[i][j].button.setActionCommand("colorButton"+k);
+ field[i][j].button.addActionListener(this);
+ }
+ }
+ init();
+
+ for (i=0;i<NH;i++) {
+ for (j=0;j<NW;j++,k++) {
+ field[i][j].button.setPreferredSize(new Dimension(60, 60));
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridx = j;
+ c.gridy = i;
+ gridbag.setConstraints(field[i][j].button, c);
+ field[i][j].button.setBackground(field[i][j].getColor());
+ add(field[i][j].button);
+ field[i][j].button.setFont(new Font("Arial", Font.PLAIN, 40));
+ }
+ }
+ label.setPreferredSize(new Dimension(100, 20));
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridwidth = 6; //9;
+ c.gridx = 0;
+ c.gridy = 9; //6;
+ gridbag.setConstraints(label, c);
+ add(label);
+ }
+ private void init(){
+ int i,j,x,y,k=0;
+ Random rand = new Random();
+ int cc=-1;
+ score = 0;
+ final int []r={64,96,128,0,178,196,255};
+ final int []g={64,0,0,32,16,128,255,128};
+ final int []b={0,45,128,128,64,32,0,255};
+
+ for (i=0;i<NH;i++) {
+ for (j = 0; j < NW; j++, k++) {
+
+ cc = rand.nextInt(level+1); // max 7
+
+ field[i][j].setColorName(new Color(r[cc], g[cc], b[cc])); // 9
+ field[i][j].setGroupIndex(k);
+ }
+ }
+ nFields=k;
+
+ for (k=0, i=0;i<NH;i++) {
+ for (j = 0; j < NW; j++, k++) {
+ field[i][j].like(field[i][j].getColor(), field, i, j, i, j);
+
+ field[i][j].clearVisit();
+
+ field[i][j].removeDuplicates();
+ field[i][j].sort(); // also reverse
+
+ field[i][j].removeDuplicatesIndex();
+ field[i][j].sortReverseIndex();
+ }
+ }
+ }
+
+ public void actionPerformed(ActionEvent e){
+ int k=0;
+ int _x[] = {0,1,2,3,4,5};
+ int _y[] = {0,1,2,3,4,5,6,7,8};
+ ///if (!lockClick) {
+ for (int i = 0; i < NH; i++) {
+ for (int j = 0; j < NW; j++, k++) {
+ if (e.getActionCommand().equals("colorButton"+k)) {
+ if (field[i][j].groupList.size() > 1) {
+
+ int c = 0;
+ for (int l : field[i][j].listIndex) {
+ int y = l / 6;
+ int x = l % 6;
+ field[y][x].blank();
+ }
+ // Przesuniecie w lerwo
+ for (int l :field[i][j].listIndex) {
+ int y = l / 6;
+ int x = l % 6;
+ field[y][x].toLeft(field, y, x);
+ }
+
+ int s = 0;
+ s = field[i][j].listIndex.size();
+ s = (s * (s -1)) * level * level;
+ score += s;
+ // Usuwanie elementow
+ for (int y : _y) {
+ for (int x : _x) {
+ field[y][x].groupList.clear();
+ field[y][x].listIndex.clear();
+ }
+ }
+
+
+ for (int y=0;y<NH;y++) {
+ for (int x = 0; x < NW; x++) {
+ field[y][x].like(field[y][x].getColor(), field, y, x, y, x);
+
+ field[y][x].clearVisit();
+
+ field[y][x].removeDuplicates();
+ field[y][x].sort(); // also reverse
+
+ field[y][x].removeDuplicatesIndex();
+ field[y][x].sortReverseIndex();
+ field[y][x].button.setBackground(field[y][x].getColor());
+
+ }
+ }
+
+
+ /* Do gory */
+ for (int y=0;y<NH;y++)
+ for (int x = 0; x < NW; x++)
+ field[y][x].toUp(field, y, x);
+
+
+ for (int y : _y) {
+ for (int x : _x) {
+ field[y][x].groupList.clear();
+ field[y][x].listIndex.clear();
+ }
+ }
+
+ for (int y=0;y<NH;y++) {
+ for (int x = 0; x < NW; x++, k++) {
+ field[y][x].like(field[y][x].getColor(), field, y, x, y, x);
+
+ field[y][x].clearVisit();
+
+ field[y][x].removeDuplicates();
+ field[y][x].sort(); // also reverse
+
+ field[y][x].removeDuplicatesIndex();
+ field[y][x].sortReverseIndex();
+ field[y][x].button.setBackground(field[y][x].getColor());
+
+ }
+ }
+
+ boolean game_in_progress = false;
+ int path_to_win = 0;
+ for (int y=0;y<NH;y++) {
+ for (int x = 0; x < NW; x++, k++) {
+ if (field[y][x].groupList.size() >= 2) game_in_progress = true;
+ if (field[y][x].groupList.size() == 0) ++path_to_win;
+ }
+ }
+ if (!game_in_progress){
+ String l = new String("Nieskonczona gra, wynik: ");
+ l += String.valueOf(score * level);
+ label.setText(l);
+ }
+ if (path_to_win == 54) {
+ String l = new String("Wygrana ! wynik: ");
+ l += String.valueOf(2 * (score * level));
+ label.setText(l);
+ }
+ return;
+ }
+ }
+ }
+ }
+ if(e.getActionCommand().equals("NewGame")) {
+ int i,j;
+ for (i=0; i<NH;i++) {
+ for (j = 0; j < NW; j++, k++) {
+ field[i][j].reset();
+ }
+ }
+
+ for (int y : _y) {
+ for (int x : _x) {
+ field[y][x].groupList.clear();
+ field[y][x].listIndex.clear();
+ }
+ }
+ init();
+ for (int y=0;y<NH;y++)
+ for (int x = 0; x < NW; x++)
+ field[y][x].button.setBackground(field[y][x].getColor());
+ nmove=0;
+ score = 0;
+ String g = new String ("Nowa gra - poziom: ");
+ g += String.valueOf(level);
+ label.setText(g);
+ }
+ else if(e.getActionCommand().equals("Exit")) {
+ System.exit(0);
+ }
+ else if(e.getActionCommand().equals("About")) {
+
+ JOptionPane.showMessageDialog(frame,
+ "Moja implementacja gry Same Game\nPrzemyslaw R. Pietraszczyk\nStworzono w oparciu o OpenJDK/ANT\nLicencja: GPL v3\nWiosna 2024",
+ "Same Game 0.240417-2",
+ JOptionPane.PLAIN_MESSAGE);
+
+ }
+ else if(e.getActionCommand().equals("L1")) {
+ level = 1;
+ }
+ else if(e.getActionCommand().equals("L2")) {
+ level = 2;
+ }
+ else if(e.getActionCommand().equals("L3")) {
+ level = 3;
+ }
+ else if(e.getActionCommand().equals("L4")) {
+ level = 4;
+ }
+ }
+
+ private static void createAndShowGUI() {
+ JFrame frame = new JFrame("Same Game");
+ timer = new Timer();
+ int frameWidth = 300;
+ int frameHeight = 400;
+ // ustawia okno po prawe na dole
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ //frame.setBounds((int) screenSize.getWidth()/2 - frameWidth/2,
+ // (int) screenSize.getHeight() - frameHeight, frameWidth, frameHeight);
+ frame.setBounds((int) screenSize.getWidth() - frameWidth,
+ (int) screenSize.getHeight()/2 - frameHeight/2, frameWidth, frameHeight);
+ frame.setResizable(false);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ //Create and set up the content pane.
+ JComponent newContentPane = new SameGame();
+ newContentPane.setOpaque(true); //content panes must be opaque
+ frame.setJMenuBar(menuBar);
+ frame.setContentPane(newContentPane);
+
+
+ //Display the window.
+ frame.pack();
+ frame.setVisible(true);
+
+ //timer.schedule(new ClearField(), 2000, 3000);
+
+ }
+ public static void main(String[] args) {
+ //Schedule a job for the event-dispatching thread:
+ //creating and showing this application's GUI.
+ javax.swing.SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ createAndShowGUI();
+ }
+ });
+ }
+/*
+ static class ClearField extends TimerTask {
+ public void run() {
+ if (nFields!=0) {
+ if (showColor) {
+ System.out.println("show color");
+ press = false;
+ field[tmpi[0]][tmpj[0]].button.setBackground(field[tmpi[0]][tmpj[0]].getColor());
+ field[tmpi[1]][tmpj[1]].button.setBackground(field[tmpi[1]][tmpj[1]].getColor());
+ showColor = false;
+ lockClick = false;
+ //nmove++;
+ //System.out.println("Color 0: "+field[tmpi[0]][tmpj[0]].getColorHide().toString()+" Color 1:"+field[tmpi[1]][tmpj[1]].getColorHide().toString());
+ // zapobiega zanikaniu pojedynczego kafla
+ if (tmpi[0] != tmpi[1] || tmpj[0] != tmpj[1]) {
+ //label.setText(" Odnaleziono !");
+ // jesli te same kolory
+ if (field[tmpi[0]][tmpj[0]].getColorHide().toString().equals(field[tmpi[1]][tmpj[1]].getColorHide().toString())) {
+
+ //field[tmpi[0]][tmpj[0]].setFound(true);
+ //field[tmpi[1]][tmpj[1]].setFound(true);
+ field[tmpi[0]][tmpj[0]].button.setText(" ");
+ field[tmpi[1]][tmpj[1]].button.setText(" ");
+ //Toolkit.getDefaultToolkit().beep();
+
+ label.setText("");
+ nFields -= 2;
+ System.out.println("nFields: " + nFields);
+ } else label.setText("");
+ }
+
+
+ }
+ }
+ else {
+ JOptionPane.showMessageDialog(frame,
+ "Wykonales "+nmove+" posuniec",
+ "Podsumowanie",
+ JOptionPane.PLAIN_MESSAGE);
+ nFields=1; // aby nie wyswietlalo drugi raz
+
+ }
+
+
+ }
+
+ }
+ */
+}
+//}
diff --git a/web/samegame/.hg/00changelog.i b/web/samegame/.hg/00changelog.i Binary files differnew file mode 100644 index 0000000..22e0643 --- /dev/null +++ b/web/samegame/.hg/00changelog.i diff --git a/web/samegame/.hg/branch b/web/samegame/.hg/branch new file mode 100644 index 0000000..4ad96d5 --- /dev/null +++ b/web/samegame/.hg/branch @@ -0,0 +1 @@ +default diff --git a/web/samegame/.hg/cache/branch2-base b/web/samegame/.hg/cache/branch2-base new file mode 100644 index 0000000..1be6c74 --- /dev/null +++ b/web/samegame/.hg/cache/branch2-base @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 -1 diff --git a/web/samegame/.hg/cache/branch2-immutable b/web/samegame/.hg/cache/branch2-immutable new file mode 100644 index 0000000..1be6c74 --- /dev/null +++ b/web/samegame/.hg/cache/branch2-immutable @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 -1 diff --git a/web/samegame/.hg/cache/branch2-served b/web/samegame/.hg/cache/branch2-served new file mode 100644 index 0000000..d800641 --- /dev/null +++ b/web/samegame/.hg/cache/branch2-served @@ -0,0 +1,2 @@ +c653e48f8fe31fee3da2a1bf5161babbdaebfcce 0 +c653e48f8fe31fee3da2a1bf5161babbdaebfcce o default diff --git a/web/samegame/.hg/cache/branch2-served.hidden b/web/samegame/.hg/cache/branch2-served.hidden new file mode 100644 index 0000000..d800641 --- /dev/null +++ b/web/samegame/.hg/cache/branch2-served.hidden @@ -0,0 +1,2 @@ +c653e48f8fe31fee3da2a1bf5161babbdaebfcce 0 +c653e48f8fe31fee3da2a1bf5161babbdaebfcce o default diff --git a/web/samegame/.hg/cache/branch2-visible b/web/samegame/.hg/cache/branch2-visible new file mode 100644 index 0000000..1be6c74 --- /dev/null +++ b/web/samegame/.hg/cache/branch2-visible @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 -1 diff --git a/web/samegame/.hg/cache/branch2-visible-hidden b/web/samegame/.hg/cache/branch2-visible-hidden new file mode 100644 index 0000000..1be6c74 --- /dev/null +++ b/web/samegame/.hg/cache/branch2-visible-hidden @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 -1 diff --git a/web/samegame/.hg/cache/rbc-names-v1 b/web/samegame/.hg/cache/rbc-names-v1 new file mode 100644 index 0000000..331d858 --- /dev/null +++ b/web/samegame/.hg/cache/rbc-names-v1 @@ -0,0 +1 @@ +default
\ No newline at end of file diff --git a/web/samegame/.hg/cache/rbc-revs-v1 b/web/samegame/.hg/cache/rbc-revs-v1 Binary files differnew file mode 100644 index 0000000..3db0480 --- /dev/null +++ b/web/samegame/.hg/cache/rbc-revs-v1 diff --git a/web/samegame/.hg/dirstate b/web/samegame/.hg/dirstate Binary files differnew file mode 100644 index 0000000..49209d0 --- /dev/null +++ b/web/samegame/.hg/dirstate diff --git a/web/samegame/.hg/hgrc b/web/samegame/.hg/hgrc new file mode 100644 index 0000000..e936f00 --- /dev/null +++ b/web/samegame/.hg/hgrc @@ -0,0 +1,14 @@ +# example repository config (see 'hg help config' for more info) +[paths] +default = https://repo2.small.pl/hg/pub/pietraszczyk/samegame + +# path aliases to other clones of this repo in URLs or filesystem paths +# (see 'hg help config.paths' for more info) +# +# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork +# my-fork = ssh://jdoe@example.net/hg/jdoes-fork +# my-clone = /home/jdoe/jdoes-clone + +[ui] +# name and email (local to this repository, optional), e.g. +# username = Jane Doe <jdoe@example.com> diff --git a/web/samegame/.hg/last-message.txt b/web/samegame/.hg/last-message.txt new file mode 100644 index 0000000..9392150 --- /dev/null +++ b/web/samegame/.hg/last-message.txt @@ -0,0 +1 @@ +smaegame-0.240307-2
\ No newline at end of file diff --git a/web/samegame/.hg/requires b/web/samegame/.hg/requires new file mode 100644 index 0000000..653b649 --- /dev/null +++ b/web/samegame/.hg/requires @@ -0,0 +1 @@ +share-safe diff --git a/web/samegame/.hg/store/00changelog.i b/web/samegame/.hg/store/00changelog.i Binary files differnew file mode 100644 index 0000000..afb46a1 --- /dev/null +++ b/web/samegame/.hg/store/00changelog.i diff --git a/web/samegame/.hg/store/00manifest.i b/web/samegame/.hg/store/00manifest.i Binary files differnew file mode 100644 index 0000000..447434d --- /dev/null +++ b/web/samegame/.hg/store/00manifest.i diff --git a/web/samegame/.hg/store/data/_changelog.txt.i b/web/samegame/.hg/store/data/_changelog.txt.i Binary files differnew file mode 100644 index 0000000..5d4aad5 --- /dev/null +++ b/web/samegame/.hg/store/data/_changelog.txt.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/_m_e_t_a-_i_n_f/_m_a_n_i_f_e_s_t._m_f.i b/web/samegame/.hg/store/data/src/main/webapp/_m_e_t_a-_i_n_f/_m_a_n_i_f_e_s_t._m_f.i Binary files differnew file mode 100644 index 0000000..c66c6e0 --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/_m_e_t_a-_i_n_f/_m_a_n_i_f_e_s_t._m_f.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/_w_e_b-_i_n_f/web.xml.i b/web/samegame/.hg/store/data/src/main/webapp/_w_e_b-_i_n_f/web.xml.i Binary files differnew file mode 100644 index 0000000..112c28e --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/_w_e_b-_i_n_f/web.xml.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/display.jsp.i b/web/samegame/.hg/store/data/src/main/webapp/display.jsp.i Binary files differnew file mode 100644 index 0000000..d8739f7 --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/display.jsp.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/display__desktop.css.i b/web/samegame/.hg/store/data/src/main/webapp/display__desktop.css.i Binary files differnew file mode 100644 index 0000000..ea91c3c --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/display__desktop.css.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/display__mobile.css.i b/web/samegame/.hg/store/data/src/main/webapp/display__mobile.css.i Binary files differnew file mode 100644 index 0000000..ea91c3c --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/display__mobile.css.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/img/_same_game.png.d b/web/samegame/.hg/store/data/src/main/webapp/img/_same_game.png.d Binary files differnew file mode 100644 index 0000000..552da45 --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/img/_same_game.png.d diff --git a/web/samegame/.hg/store/data/src/main/webapp/img/_same_game.png.i b/web/samegame/.hg/store/data/src/main/webapp/img/_same_game.png.i Binary files differnew file mode 100644 index 0000000..adebd2e --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/img/_same_game.png.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/index.jsp.i b/web/samegame/.hg/store/data/src/main/webapp/index.jsp.i Binary files differnew file mode 100644 index 0000000..389a047 --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/index.jsp.i diff --git a/web/samegame/.hg/store/data/src/main/webapp/menu.jsp.i b/web/samegame/.hg/store/data/src/main/webapp/menu.jsp.i Binary files differnew file mode 100644 index 0000000..158837e --- /dev/null +++ b/web/samegame/.hg/store/data/src/main/webapp/menu.jsp.i diff --git a/web/samegame/.hg/store/fncache b/web/samegame/.hg/store/fncache new file mode 100644 index 0000000..fe7a980 --- /dev/null +++ b/web/samegame/.hg/store/fncache @@ -0,0 +1,10 @@ +data/src/main/webapp/img/SameGame.png.i +data/src/main/webapp/img/SameGame.png.d +data/src/main/webapp/META-INF/MANIFEST.MF.i +data/src/main/webapp/display.jsp.i +data/src/main/webapp/menu.jsp.i +data/src/main/webapp/display_desktop.css.i +data/src/main/webapp/WEB-INF/web.xml.i +data/src/main/webapp/display_mobile.css.i +data/src/main/webapp/index.jsp.i +data/Changelog.txt.i diff --git a/web/samegame/.hg/store/phaseroots b/web/samegame/.hg/store/phaseroots new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/web/samegame/.hg/store/phaseroots diff --git a/web/samegame/.hg/store/requires b/web/samegame/.hg/store/requires new file mode 100644 index 0000000..52fc616 --- /dev/null +++ b/web/samegame/.hg/store/requires @@ -0,0 +1,7 @@ +dotencode +fncache +generaldelta +revlog-compression-zstd +revlogv1 +sparserevlog +store diff --git a/web/samegame/.hg/store/undo b/web/samegame/.hg/store/undo new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/web/samegame/.hg/store/undo diff --git a/web/samegame/.hg/store/undo.backup.phaseroots.bck b/web/samegame/.hg/store/undo.backup.phaseroots.bck new file mode 100644 index 0000000..a27ae64 --- /dev/null +++ b/web/samegame/.hg/store/undo.backup.phaseroots.bck @@ -0,0 +1 @@ +1 c653e48f8fe31fee3da2a1bf5161babbdaebfcce diff --git a/web/samegame/.hg/store/undo.backupfiles b/web/samegame/.hg/store/undo.backupfiles Binary files differnew file mode 100644 index 0000000..a48725e --- /dev/null +++ b/web/samegame/.hg/store/undo.backupfiles diff --git a/web/samegame/.hg/undo.desc b/web/samegame/.hg/undo.desc new file mode 100644 index 0000000..2b4a95a --- /dev/null +++ b/web/samegame/.hg/undo.desc @@ -0,0 +1,3 @@ +1 +push-response +https://repo2.small.pl/hg/pub/pietraszczyk/samegame diff --git a/web/samegame/.hg/wcache/checkisexec b/web/samegame/.hg/wcache/checkisexec new file mode 100755 index 0000000..e69de29 --- /dev/null +++ b/web/samegame/.hg/wcache/checkisexec diff --git a/web/samegame/.hg/wcache/checklink b/web/samegame/.hg/wcache/checklink new file mode 120000 index 0000000..326d735 --- /dev/null +++ b/web/samegame/.hg/wcache/checklink @@ -0,0 +1 @@ +checklink-target
\ No newline at end of file diff --git a/web/samegame/.hg/wcache/checklink-target b/web/samegame/.hg/wcache/checklink-target new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/web/samegame/.hg/wcache/checklink-target diff --git a/web/samegame/.hg/wcache/manifestfulltextcache b/web/samegame/.hg/wcache/manifestfulltextcache Binary files differnew file mode 100644 index 0000000..731f57f --- /dev/null +++ b/web/samegame/.hg/wcache/manifestfulltextcache diff --git a/web/samegame/Changelog.txt b/web/samegame/Changelog.txt new file mode 100644 index 0000000..c87aaae --- /dev/null +++ b/web/samegame/Changelog.txt @@ -0,0 +1,15 @@ +0.240307-2 - Póki co nie zrzuca wyjątków, zmana nazwy na Same Game +0.230307-1 - Przebudowa ekranu powitalnego c.d oraz próba obsługi wyjąktku dla like_* +0.240307-0 - Przebudowa ekranu powitalnego +0.240306-2 - Przy pierwszym bądz również drugim wejściu na stronę gry, aplkkacja zrzuca wyjątek - poprawki w like_* +0.240306-1 - Poprawki przy orientacji +0.240306-0 - Orientacja pionowa i pozioma - finisz ? +0.240305-1 - Orientacja pionowa i pozioma - próba +0,240305-0 - Sortowanie listy 'groupList', w pierwszym rzucie usuwa prawidłowo do koloru +0.240304-1 - Prawie dobrze, zdarza się jednak że gdy kliknie się pole z dołu o nie usunie na górze +0.240304-0 - Prawie kasuje w grupie kolorów, wymaga dopracowania +0.240303-0 - Próba skasowania kilku wybranych wedlug koloru pozycji +0.240222-2 - Wypośrodkowanie, lang=pl +0.230222-0 - Dodałem proste menu z przyciskami - niestety nie można ustawić odgórnie trybu pełnoekranowego +0.240220-0 - Przynajmniej w teorii powinien rozpoznawać orenację ekranu +0.240219-0 - Inicjacja diff --git a/web/samegame/src/main/webapp/META-INF/MANIFEST.MF b/web/samegame/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000..5e94951 --- /dev/null +++ b/web/samegame/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0
+Class-Path:
+
diff --git a/web/samegame/src/main/webapp/WEB-INF/web.xml b/web/samegame/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..01ac0bc --- /dev/null +++ b/web/samegame/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://jakarta.ee/xml/ns/jakartaee" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" id="WebApp_ID" version="6.0"> + <display-name>samegame</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.jsp</welcome-file> + <welcome-file>default.htm</welcome-file> + </welcome-file-list> +</web-app>
\ No newline at end of file diff --git a/web/samegame/src/main/webapp/display.jsp b/web/samegame/src/main/webapp/display.jsp new file mode 100644 index 0000000..a67a792 --- /dev/null +++ b/web/samegame/src/main/webapp/display.jsp @@ -0,0 +1,429 @@ +<!--
+ Same Game - drugie podejscie do JSP
+ data:2024-02-19
+ IDE: Eclipse
+ napisal: Przemyslaw R. Pietraszczyk
+ licencja: GPL3
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"
+ import="java.util.*" import="java.lang.*"%>
+ <%
+ out.print("<!DOCTYPE html><html lang=\"pl\"><head><meta charset=\"UTF-8\"><title>Same Game (BETA)</title>");
+%>
+<%!
+class Box {
+ int index;
+ int groupIndex;
+ String color;
+ int x , y;
+ boolean visit;
+ public List<String> groupList = new ArrayList<String> ();
+ public Box() {
+ visit=false;
+ }
+ public void setIndex(int n) {
+ int index = n;
+ }
+ public void setGroupIndex(int n) {
+ groupIndex = n;
+ }
+ public void setColorName(String c) {
+ color = c;
+ }
+ public void setVelocity (int _x, int _y){
+ x =_x;
+ y =_y;
+ }
+ public int geGroupIndex() {
+ return groupIndex;
+ }
+ public String getColor() {
+ return color;
+ }
+// public String veloctyToString() {
+// return (String.valueOf(x)+ " " + String.valueOf(y));
+// }
+ public int getVelocityY() {
+ return y;
+ }
+ public int getVelocityX() {
+ return x;
+ }
+ public Box get(){
+ return this;
+ }
+
+}
+
+public void like_landscape(String color, Box [][] squares, int y, int x, int origy, int origx) throws StackOverflowError{
+
+ if (squares[y][x].getColor().equals(color)) {
+ if (y >= 1) {
+ if (squares[y-1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_landscape(color, squares, y-1, x, origy, origx);
+ try {
+ like_landscape(color, squares, y-1, x, origy, origx);
+ //intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_landscape(color, squares, y-1, x, origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ if (x >= 1) {
+ if (squares[y][x-1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_landscape(color, squares, y, x-1 , origy, origx);
+ try {
+ like_landscape(color, squares, y, x-1 , origy, origx);
+ //intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_landscape(color, squares, y, x-1 , origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ if (y < 4) {
+ if (squares[y+1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_landscape(color, squares, y+1, x, origy, origx);
+ try {
+ like_landscape(color, squares, y+1, x, origy, origx);
+ //intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_landscape(color, squares, y+1, x, origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ if (x < 10) {
+ if (squares[y][x+1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_landscape(color, squares, y, x+1 , origy, origx);
+ try {
+ like_landscape(color, squares, y, x+1 , origy, origx);
+ // intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_landscape(color, squares, y, x+1 , origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ squares[y][x].visit = false;
+ }
+}
+
+public void like_portrait(String color, Box [][] squares, int y, int x, int origy, int origx)throws Exception, StackOverflowError {
+
+ if (squares[y][x].getColor().equals(color)) {
+ if (y >= 1) {
+ if (squares[y-1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_portrait(color, squares, y-1, x, origy, origx);
+ try {
+ like_portrait(color, squares, y-1, x, origy, origx);
+ //intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_portrait(color, squares, y-1, x, origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ if (x >= 1) {
+ if (squares[y][x-1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_portrait(color, squares, y, x-1 , origy, origx);
+ try {
+ like_portrait(color, squares, y, x-1 , origy, origx);
+ //intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_portrait(color, squares, y, x-1 , origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+
+ if (y < 10) {
+ if (squares[y+1][x].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_portrait(color, squares, y+1, x, origy, origx);
+ try {
+ like_portrait(color, squares, y+1, x, origy, origx);
+ //intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_portrait(color, squares, y+1, x, origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ if (x < 4) {
+ if (squares[y][x+1].visit == false) {
+ squares[origy][origx].groupList.add(String.valueOf(squares[y][x].geGroupIndex()));
+ //like_portrait(color, squares, y, x+1 , origy, origx);
+ try {
+ like_portrait(color, squares, y, x+1 , origy, origx);
+ //intelligence.add("3");
+ }
+ catch (StackOverflowError s) {
+ like_portrait(color, squares, y, x+1 , origy, origx);
+ intelligence.add("4");
+ }
+ }
+ squares[y][x].visit = true;
+ }
+ squares[y][x].visit = false;
+ }
+}
+
+
+public void removeDuplicates(Box b) {
+ List<String> tmp = new ArrayList<String> ();
+
+ for(String item:b.groupList){
+ boolean find = false;
+ for (String t:tmp) {
+ if (t.equals(item)){
+ find = true;
+ }
+ }
+ if (find == false) {
+ tmp.add(item);
+ }
+ }
+ b.groupList.clear();
+ b.groupList = tmp;
+}
+
+public void clearVisit(Box[][] b, int y, int x){
+ b[y][x].visit = false;
+}
+
+public void sort(Box b) {
+
+ String[] strings = b.groupList.toArray(String[]::new);
+
+ Integer[] numbers = new Integer[strings.length];
+ for(int i = 0;i < strings.length;i++)
+ {
+ try
+ {
+ numbers[i] = Integer.parseInt(strings[i]);
+ }
+ catch (NumberFormatException nfe)
+ {
+ numbers[i] = null;
+ }
+ }
+
+ int n = numbers.length;
+ int temp = 0;
+ for(int i=0; i < n; i++){
+ for(int j=1; j < (n-i); j++){
+ if(numbers[j-1] > numbers[j]){
+ //swap elements
+ temp = numbers[j-1];
+ numbers[j-1] = numbers[j];
+ numbers[j] = temp;
+ }
+
+ }
+ }
+ b.groupList.clear();
+ for(int i = 0;i < numbers.length;i++)
+ {
+ try
+ {
+ b.groupList.add(Integer.toString(numbers[i]));
+ }
+ catch (NumberFormatException nfe)
+ {
+ //numbers[i] = null;
+ }
+ }
+
+}
+//public int intelligence = 0;
+public List<String> intelligence = new ArrayList<String> ();
+
+
+%>
+<%
+String userAgent = request.getHeader("User-Agent");
+boolean isMobile = (userAgent != null && !userAgent.isEmpty() && userAgent.toLowerCase().contains("android"));
+
+if (isMobile) {
+ out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"display_mobile.css\">");
+
+}
+else {
+ out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"display_desktop.css\">");
+}
+
+
+%>
+
+ <script type="text/javascript">
+ const colors = new Array("green", "red", "pink", "aqua", "blue", "lime", "fuchsia", "maroon", "olive");
+ function launchFullScreen(element) {
+ if(element.requestFullScreen) {
+ element.requestFullScreen();
+ } else if(element.mozRequestFullScreen) {
+ element.mozRequestFullScreen();
+ } else if(element.webkitRequestFullScreen) {
+ element.webkitRequestFullScreen();
+ }
+ }
+ <%
+ //List<Box> squares = new ArrayList<Box> ();
+ List<String> list = new ArrayList<String> ();
+ Random rand = new Random();
+ String[] colors = { "green", "red", "pink", "aqua", "blue", "lime", "fuchsia", "maroon", "olive"};
+
+
+ //Iterator<String> ite = list.iterator();
+ //while (ite.hasNext()) {
+ // Object o = ite.next();
+ //some condition
+// ite.remove();
+// }
+ //int r = rand.nextInt(8 - 1) + 1;; // 8
+ int r = rand.nextInt(2);
+ list.add(colors[r]);
+ out.print("function change(list) { if (list.length >= 2) {list.forEach((n) => { document.getElementById(\"group\"+n).remove()})}}");
+ %>
+
+ </script>
+
+
+</head>
+
+
+
+<%
+
+String orient = request.getParameter("data");
+Box[][] squares;
+
+ //orient = "portrait";
+ //while (true) {
+ int x = 0;
+ int y = 0;
+ List<Integer> tmp = new ArrayList<Integer> ();
+ int orientX = 5;
+ int orientY = 5;
+ //boolean landscape = true;
+
+ if (orient.equals("landscape")) {
+ orientX = 11;
+ orientY = 5;
+ //landscape = true;
+ }
+ else if (orient.equals("portrait")) {
+ orientX = 5;
+ orientY = 11;
+ //landscape = false;
+ }
+
+ squares = new Box[orientY][orientX];
+
+ int k = 0;
+ for (int i = 0; i < orientY; i++) {
+ for (int j = 0; j < orientX; j++) {
+ squares[i][j] = new Box();
+
+ squares[i][j].setColorName(colors[rand.nextInt(3)]); // 9
+ //squares[i][j].incrementGroupIndex();
+ squares[i][j].setGroupIndex(k++);
+ squares[i][j].setVelocity(i, j);
+
+ }
+ }
+ out.print("<body>");
+
+ out.print("<table class=\"center\">");
+ k = 0;
+ for (int i = 0; i < orientY; i++) {
+ out.print("<tr>");
+
+
+ for (int j = 0; j < orientX; j++, k++) {
+ List<String> ids = new ArrayList<String> ();
+
+ //like (squares[i][j].getColor(), squares, squares[i][j].getVelocityY(), squares[i][j].getVelocityX(), ids, i, j);
+ if (orient.equals("landscape")) {
+ //if (landscape == true) {
+
+ try {
+ like_landscape(squares[i][j].getColor(), squares, i,j, i, j);
+ }
+ catch (Exception e) {
+ //exejava.lang.StackOverflowError
+ try {
+ like_landscape(squares[i][j].getColor(), squares, i,j, i, j);
+ // intelligence.add("1");
+ }
+ catch (StackOverflowError s) {
+ like_landscape(squares[i][j].getColor(), squares, i,j, i, j);
+ intelligence.add("2");
+ }
+ }
+ }
+ else if (orient.equals("portrait")) {
+ //else {
+ try {
+ like_portrait(squares[i][j].getColor(), squares, i,j, i, j);
+ }
+ catch (Exception e) {
+ //exejava.lang.StackOverflowError
+ try {
+ like_portrait(squares[i][j].getColor(), squares, i,j, i, j);
+ // intelligence.add("1");
+ }
+ catch (StackOverflowError s) {
+ like_portrait(squares[i][j].getColor(), squares, i,j, i, j);
+ intelligence.add("2");
+ }
+ }
+ }
+
+ clearVisit(squares, i, j);
+
+ removeDuplicates(squares[i][j]);
+ sort(squares[i][j]);
+ //out.print("<td class=\""+squares[i][j].getColor()+"\" id=\"group"+k+"\" onclick=\"change("+squares[i][j].groupList.toString()+")\">"+squares[i][j].getColor()+"</td>");
+ //out.print("<td class=\""+squares[i][j].getColor()+"\" id=\"group"+k+"\" onclick=\"change("+squares[i][j].groupList.toString()+")\">"+squares[i][j].groupList.toString()+"</td>");
+ out.print("<td class=\""+squares[i][j].getColor()+"\" id=\"group"+k+"\" onclick=\"change("+squares[i][j].groupList.toString()+")\">"+orient+squares[i][j].groupList.toString()+"</td>");
+
+ //++k;
+
+
+
+ }
+ out.print("</tr>");
+ out.print(">"+intelligence.toString()+"<");
+
+ }
+
+
+
+ out.print("</table>");
+
+ out.print("</body>\n</html>");
+
+%>
\ No newline at end of file diff --git a/web/samegame/src/main/webapp/display_desktop.css b/web/samegame/src/main/webapp/display_desktop.css new file mode 100644 index 0000000..c472f0e --- /dev/null +++ b/web/samegame/src/main/webapp/display_desktop.css @@ -0,0 +1,53 @@ +body { + background-color: grey; +} +.green { + width: 10rem; + height: 10rem; + background-color: green; +} +.red { + width: 10rem; + height: 10rem; + background-color: red; +} +.pink { + width: 10rem; + height: 10rem; + background-color: pink; +} +.aqua { + width: 10rem; + height: 10rem; + background-color: aqua; +} +.blue { + width: 10rem; + height: 10rem; + background-color: blue; +} +.lime { + width: 10rem; + height: 10rem; + background-color: lime; +} +.fuchsia { + width: 10rem; + height: 10rem; + background-color: fuchsia; +} +.maroon { + width: 10rem; + height: 10rem; + background-color: maroon; +} +.olive { + width: 10rem; + height: 10rem; + background-color: olive; +} +.center { + margin-left: auto; + margin-right: auto; + margin-top: auto; +}
\ No newline at end of file diff --git a/web/samegame/src/main/webapp/display_mobile.css b/web/samegame/src/main/webapp/display_mobile.css new file mode 100644 index 0000000..c472f0e --- /dev/null +++ b/web/samegame/src/main/webapp/display_mobile.css @@ -0,0 +1,53 @@ +body { + background-color: grey; +} +.green { + width: 10rem; + height: 10rem; + background-color: green; +} +.red { + width: 10rem; + height: 10rem; + background-color: red; +} +.pink { + width: 10rem; + height: 10rem; + background-color: pink; +} +.aqua { + width: 10rem; + height: 10rem; + background-color: aqua; +} +.blue { + width: 10rem; + height: 10rem; + background-color: blue; +} +.lime { + width: 10rem; + height: 10rem; + background-color: lime; +} +.fuchsia { + width: 10rem; + height: 10rem; + background-color: fuchsia; +} +.maroon { + width: 10rem; + height: 10rem; + background-color: maroon; +} +.olive { + width: 10rem; + height: 10rem; + background-color: olive; +} +.center { + margin-left: auto; + margin-right: auto; + margin-top: auto; +}
\ No newline at end of file diff --git a/web/samegame/src/main/webapp/img/SameGame.png b/web/samegame/src/main/webapp/img/SameGame.png Binary files differnew file mode 100644 index 0000000..0616614 --- /dev/null +++ b/web/samegame/src/main/webapp/img/SameGame.png diff --git a/web/samegame/src/main/webapp/index.jsp b/web/samegame/src/main/webapp/index.jsp new file mode 100644 index 0000000..db94d27 --- /dev/null +++ b/web/samegame/src/main/webapp/index.jsp @@ -0,0 +1,20 @@ +<!--
+ Same Game - drugie podejscie do JSP
+ data:2024-02-19
+ IDE: Eclipse
+ napisal: Przemyslaww R. Pietraszczyk
+ licencja: GPL3
+ -->
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Same Game</title>
+</head>
+<body>
+<script>
+if (window.matchMedia("(orientation: landscape)").matches) { document.location.href = "menu.jsp?data="+"landscape"; } // you're in LANDSCAPE mode
+else { document.location.href = "menu.jsp?data="+"portrait"; }
+</script>
+</body>
+</html>
\ No newline at end of file diff --git a/web/samegame/src/main/webapp/menu.jsp b/web/samegame/src/main/webapp/menu.jsp new file mode 100644 index 0000000..8847e89 --- /dev/null +++ b/web/samegame/src/main/webapp/menu.jsp @@ -0,0 +1,103 @@ +<!--
+ Same Game - drugie podejście do JSP
+ data:2024-02-19
+ IDE: Eclipse
+ napisał: Przemysłąw R. Pietraszczyk
+ licencja: GPL3
+ -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html lang="pl">
+<head>
+<title>Same Game</title>
+
+<style>
+ body {
+ background-color: brown;
+ }
+ .about {
+ padding: 5rem 8rem;
+ width: 30rem;
+ height: 10rem;
+ background-color: green;
+ }
+ .play {
+ padding: 1rem 8rem;
+ width: 30rem;
+ height: 10rem;
+ background-color: blue;
+ font-size: 5rem;
+ }
+ .center {
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: cener;;
+ margin-bottom: auto;
+ border-collapse:separate;
+ border-spacing: 0 1em;
+ }
+ .center_img {
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: center;
+ margin-bottom: 10rem;
+ border-collapse:separate;
+ border-spacing: 0 1em;
+ }
+ a.button {
+ padding: 1px 6px;
+ border: 1px outset buttonborder;
+ border-radius: 3px;
+ color: buttontext;
+ background-color: buttonface;
+ text-decoration: none;
+ }
+</style>
+
+ <script type="text/javascript">
+ function launchFullScreen(element) {
+ if(element.requestFullScreen) {
+ element.requestFullScreen();
+ } else if(element.mozRequestFullScreen) {
+ element.mozRequestFullScreen();
+ } else if(element.webkitRequestFullScreen) {
+ element.webkitRequestFullScreen();
+ }
+ }
+</script>
+
+</head>
+<body>
+<%
+String orient = request.getParameter("data");
+if (orient.equals("landscape")) {
+
+
+ out.print("<table class=\"center_img\"><tr>");
+ out.print("<td><img src=\"img/SameGame.png\" alt=\"Same Game\"></td></tr>");
+ out.print("</tablae>");
+ out.print("<table class=\"center\"><tr>");
+ //out.print("td><button class=\"about\" type=\"button\" onclick=\"location.href='about.jsp?data=landscape'\">O MNIE...</button><td>");
+ out.print("<td><button class=\"play\" type=\"button\" onclick=\"location.href='display.jsp?data=landscape'\">GRAJ</button><td>");
+ // przykłąd
+ // out.print("<td><a href=\"display.jsp?data=landscape\" class=\"button\" onclick=\"launchFullScreen(document.documentElement)\">Play</a></td>");
+ out.print("</tr></table>");
+
+}
+else if (orient.equals("portrait")) {
+ out.print("<table class=\"center_img\"><tr>");
+ out.print("<td><img src=\"img/SameGame.png\" alt=\"Same Game\"></td></tr>");
+ out.print("</tablae>");
+ out.print("<table class=\"center\"><tr>");
+ //out.print("<td><button class=\"about\" type=\"button\" onclick=\"location.href='about.jsp?data=portrait'\">O MNIE...</button><td></tr>");
+ out.print("<td><button class=\"play\" type=\"button\" onclick=\"location.href='display.jsp?data=portrait'\">GRAJ</button><td>");
+ // przykłąd
+ // out.print("<td><a href=\"display.jsp?data=portraid\" class=\"button\" onclick=\"launchFullScreen(document.documentElement)\"O mnie...</a></td>");
+ out.print("</tr></table>");
+}
+%>
+
+
+</body>
+</html>
\ No newline at end of file |
