Skip to content

Mh1 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MinHyun1783 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Mh1 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfa1777
commit first round
MinHyun1783 Nov 26, 2021
4fc207c
commit first round
MinHyun1783 Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/.name
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 21 additions & 4 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
<activity
android:name=".MainActivity"
android:exported="false" />
<activity
android:name=".category.Category"
android:exported="false" />

<activity
android:name=".Intro"
android:label="@string/app_name"
Expand All @@ -32,7 +30,26 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".loading" />
<activity android:name=".category.Category">

</activity>
<activity android:name=".category.Category1"></activity>
<activity android:name=".category.Category2"></activity>
<activity android:name=".category.Category3"></activity>
<activity android:name=".category.Category4"></activity>
<activity android:name=".category.Category5"></activity>
<activity android:name=".category.Category6"></activity>
<activity android:name=".category.Category7"></activity>
<activity android:name=".category.Category8"></activity>
<activity android:name=".category.Category9"></activity>
<activity android:name=".category.Category10"></activity>
<activity android:name=".category.Category11"></activity>
<activity android:name=".category.Category12"></activity>
<activity android:name=".category.Category13"></activity>
<activity android:name=".category.Category14"></activity>
<activity android:name=".category.Category15"></activity>


</application>

</manifest>
4 changes: 3 additions & 1 deletion app/src/main/java/com/example/cubelab/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand All @@ -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({
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/example/cubelab/category/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
})


}
}
45 changes: 30 additions & 15 deletions app/src/main/res/layout/activity_category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -86,7 +87,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -117,7 +119,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -147,7 +150,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -177,7 +181,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -207,7 +212,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -236,7 +242,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -265,7 +272,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -294,7 +302,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -324,7 +333,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -354,7 +364,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -383,7 +394,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -413,7 +425,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -443,7 +456,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down Expand Up @@ -472,7 +486,8 @@
android:padding="15dp"
android:weightSum="100">

<TextView
<Button
android:id="@+id/btn_15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="90"
Expand Down
117 changes: 101 additions & 16 deletions app/src/main/res/layout/activity_category1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,110 @@
android:text="1. F/APRON"
android:textSize="40dp" />
</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:orientation="vertical">
<com.airbnb.lottie.LottieAnimationView
android:layout_marginTop="200dp"
android:layout_marginBottom="100dp"
android:id="@+id/animation_view_gradle4"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:visibility="gone"
app:lottie_autoPlay="true"
app:lottie_fileName="load.json"
app:lottie_loop="true" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view_grid1"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.airbnb.lottie.LottieAnimationView
android:layout_marginTop="200dp"
android:layout_marginBottom="100dp"
android:id="@+id/animation_view_gradle4"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:visibility="gone"
app:lottie_autoPlay="true"
app:lottie_fileName="load.json"
app:lottie_loop="true" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view_grid1"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
</LinearLayout>

<TableLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#999999">


<TextView
android:layout_width="match_parent"
android:layout_height="77dp"
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:layout_marginBottom="1dp"
android:background="#DCDCDC"
android:gravity="center"
android:padding="3dp"
android:elevation="20dp"
android:text="제품명" />


<TableRow
android:layout_width="match_parent"
android:layout_height="53dp">

<TextView
android:layout_width="190dp"
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:layout_marginBottom="1dp"
android:background="#DCDCDC"
android:gravity="center"
android:padding="3dp"
android:elevation="20dp"
android:text="조립 가능한 물품" />

<TextView
android:layout_width="206dp"
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:layout_marginBottom="1dp"
android:background="#DCDCDC"
android:gravity="center"
android:padding="3dp"
android:elevation="20dp"
android:text="물품명" />
</TableRow>
</TableLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="제품 상세 설명"
android:elevation="20dp"
android:textSize="20dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
Loading