Skip to content

Commit 5c56fb4

Browse files
foreA-adoxidforeA-adoxid
authored
Merge pull request #1 from VectorVanguard/main
merge main into home-page
2 parents b52c479 + 46331f5 commit 5c56fb4

14 files changed

Lines changed: 91 additions & 61 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
104
.DS_Store
115
/build
126
/captures
137
.externalNativeBuild
148
.cxx
159
local.properties
10+
.idea

‎.idea/.name‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/material_theme_project_new.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<activity android:name=".Activity.WelcomeActivity"/>
2626
<activity android:name=".Activity.LogActivity"/>
2727
<activity android:name=".Activity.RegActivity"/>
28+
<activity android:name=".Activity.HomeActivity"/>
2829
<activity android:name=".Activity.ForgetPasswordActivity"/>
2930

3031
<meta-data

‎app/src/main/java/com/example/projectfigma/Activity/BottomPanelActivity.kt‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎app/src/main/java/com/example/projectfigma/Activity/ForgetPasswordActivity.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Bundle
55
import android.widget.Toast
66
import androidx.appcompat.app.AppCompatActivity
77
import com.example.projectfigma.DataBase.DataBase
8+
import com.example.projectfigma.Fragments.BottomPanelFragment
89
import com.example.projectfigma.R
910
import com.example.projectfigma.Util.Password
1011
import com.example.projectfigma.databinding.ActivityForgetPasswordBinding
@@ -22,7 +23,7 @@ class ForgetPasswordActivity : AppCompatActivity() {
2223
val dateBase = DataBase.getDb(this)
2324

2425
supportFragmentManager.beginTransaction()
25-
.replace(R.id.buttonPanel, BottomPanelActivity())
26+
.replace(R.id.buttonPanel, BottomPanelFragment())
2627
.commit()
2728

2829
Password.setIsVisable(binding.passwordEditText)

‎app/src/main/java/com/example/projectfigma/Activity/HomeActivity.kt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.example.projectfigma.Activity
2+
3+
import android.os.Bundle
4+
import androidx.appcompat.app.AppCompatActivity
5+
import com.example.projectfigma.Fragments.BottomPanelFragment
6+
import com.example.projectfigma.R
7+
8+
class HomeActivity : AppCompatActivity() {
9+
10+
override fun onCreate(savedInstanceState: Bundle?) {
11+
super.onCreate(savedInstanceState)
12+
setContentView(R.layout.activity_home)
13+
14+
supportFragmentManager.beginTransaction()
15+
.replace(R.id.buttonPanel, BottomPanelFragment())
16+
.commit()
17+
}
18+
19+
}

‎app/src/main/java/com/example/projectfigma/Activity/LogActivity.kt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
package com.example.projectfigma.Activity
22

3-
import android.annotation.SuppressLint
43
import android.content.Intent
54
import android.os.Bundle
6-
import android.provider.ContactsContract.Data
7-
import android.text.InputType
8-
import android.view.MotionEvent
9-
import android.widget.Button
105
import android.widget.Toast
116
import androidx.appcompat.app.AppCompatActivity
127
import com.example.projectfigma.DataBase.DataBase
8+
import com.example.projectfigma.Fragments.BottomPanelFragment
139
import com.example.projectfigma.R
1410
import com.example.projectfigma.Util.Password
1511
import com.example.projectfigma.databinding.ActivityLogBinding
16-
import kotlin.concurrent.Volatile
1712

1813
class LogActivity : AppCompatActivity() {
1914

@@ -29,7 +24,7 @@ class LogActivity : AppCompatActivity() {
2924
val dataBase = DataBase.getDb(this)
3025

3126
supportFragmentManager.beginTransaction()
32-
.replace(R.id.buttonPanel, BottomPanelActivity())
27+
.replace(R.id.buttonPanel, BottomPanelFragment())
3328
.commit()
3429

3530
Password.setIsVisable(binding.passwordEditText)

0 commit comments

Comments
 (0)