diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..3b637d0 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +cubelab \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 624a536..af93cb4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7ccc8c6..1049b0f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,9 +19,7 @@ - + - + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/example/cubelab/MainActivity.kt b/app/src/main/java/com/example/cubelab/MainActivity.kt index e31d36c..356be4f 100644 --- a/app/src/main/java/com/example/cubelab/MainActivity.kt +++ b/app/src/main/java/com/example/cubelab/MainActivity.kt @@ -8,6 +8,7 @@ import android.view.MenuInflater import android.view.animation.Animation import android.view.animation.AnimationUtils import com.example.cubelab.R +import com.example.cubelab.category.Category import kotlinx.android.synthetic.main.* import kotlinx.android.synthetic.main.activity_login.* import java.util.* @@ -18,8 +19,9 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_login) + val intent = Intent(this, Category::class.java) + btn_login.setOnClickListener({ - val intent = Intent(this, Locale.Category::class.java) startActivity(intent) }) // Handler().postDelayed({ diff --git a/app/src/main/java/com/example/cubelab/category/Category.kt b/app/src/main/java/com/example/cubelab/category/Category.kt index 0dcf6cc..e95d47f 100644 --- a/app/src/main/java/com/example/cubelab/category/Category.kt +++ b/app/src/main/java/com/example/cubelab/category/Category.kt @@ -1,14 +1,24 @@ package com.example.cubelab.category +import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import com.example.cubelab.R +import kotlinx.android.synthetic.main.activity_category.* +import kotlinx.android.synthetic.main.activity_login.* +import java.util.* class Category : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_category) + val intent = Intent(this, Category1::class.java) + + btn_1.setOnClickListener({ + startActivity(intent) + }) + } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category.xml b/app/src/main/res/layout/activity_category.xml index 4e30cfe..1c49f45 100644 --- a/app/src/main/res/layout/activity_category.xml +++ b/app/src/main/res/layout/activity_category.xml @@ -53,7 +53,8 @@ android:padding="15dp" android:weightSum="100"> - - - - - - - - - - - - - - - + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category10.xml b/app/src/main/res/layout/activity_category10.xml index e6e84f9..4d2b0e9 100644 --- a/app/src/main/res/layout/activity_category10.xml +++ b/app/src/main/res/layout/activity_category10.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category10"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category11.xml b/app/src/main/res/layout/activity_category11.xml index 37b9b38..2fa5e02 100644 --- a/app/src/main/res/layout/activity_category11.xml +++ b/app/src/main/res/layout/activity_category11.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category11"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category12.xml b/app/src/main/res/layout/activity_category12.xml index 2c5dd39..7120404 100644 --- a/app/src/main/res/layout/activity_category12.xml +++ b/app/src/main/res/layout/activity_category12.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category12"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category13.xml b/app/src/main/res/layout/activity_category13.xml index f7b68a6..b3d0f03 100644 --- a/app/src/main/res/layout/activity_category13.xml +++ b/app/src/main/res/layout/activity_category13.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category13"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category14.xml b/app/src/main/res/layout/activity_category14.xml index 28d30ea..b8e70e5 100644 --- a/app/src/main/res/layout/activity_category14.xml +++ b/app/src/main/res/layout/activity_category14.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category14"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category15.xml b/app/src/main/res/layout/activity_category15.xml index ec01197..282246a 100644 --- a/app/src/main/res/layout/activity_category15.xml +++ b/app/src/main/res/layout/activity_category15.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category15"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category2.xml b/app/src/main/res/layout/activity_category2.xml index 402e6fd..cfcf8a9 100644 --- a/app/src/main/res/layout/activity_category2.xml +++ b/app/src/main/res/layout/activity_category2.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category2"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category3.xml b/app/src/main/res/layout/activity_category3.xml index f233cce..d536306 100644 --- a/app/src/main/res/layout/activity_category3.xml +++ b/app/src/main/res/layout/activity_category3.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category3"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category4.xml b/app/src/main/res/layout/activity_category4.xml index 53fdd50..60c16d9 100644 --- a/app/src/main/res/layout/activity_category4.xml +++ b/app/src/main/res/layout/activity_category4.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category4"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category5.xml b/app/src/main/res/layout/activity_category5.xml index 4d5b784..64fb05a 100644 --- a/app/src/main/res/layout/activity_category5.xml +++ b/app/src/main/res/layout/activity_category5.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category5"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category6.xml b/app/src/main/res/layout/activity_category6.xml index 0df0009..efbddfd 100644 --- a/app/src/main/res/layout/activity_category6.xml +++ b/app/src/main/res/layout/activity_category6.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category6"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category7.xml b/app/src/main/res/layout/activity_category7.xml index 5bf3145..0488360 100644 --- a/app/src/main/res/layout/activity_category7.xml +++ b/app/src/main/res/layout/activity_category7.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category7"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category8.xml b/app/src/main/res/layout/activity_category8.xml index bdc8906..04a475d 100644 --- a/app/src/main/res/layout/activity_category8.xml +++ b/app/src/main/res/layout/activity_category8.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category8"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_category9.xml b/app/src/main/res/layout/activity_category9.xml index 274af80..cc44118 100644 --- a/app/src/main/res/layout/activity_category9.xml +++ b/app/src/main/res/layout/activity_category9.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".category.Category9"> + tools:context=".category.Category1"> + - - + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file