Skip to content
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.

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

Revert "Add the required pages" #17

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ dependencies {
implementation("com.google.android.gms:play-services-basement:18.3.0")
// json helper
implementation("com.google.code.gson:gson:2.10")
// progress indicators
implementation("com.tbuonomo:dotsindicator:5.0")


testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
Expand Down
38 changes: 14 additions & 24 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,26 @@
android:supportsRtl="true"
android:theme="@style/Theme.Modarb"
tools:targetApi="31">
<!-- <activity-->
<!-- android:name=".ui.workout.activites.ExcersiceInfoActivity"-->
<!-- android:exported="false" />-->
<activity
android:name=".ui.menu.activities.NotificationActivity"
android:name=".ui.home.ui.more.activities.EditProfileActivity"
android:exported="false" />
<activity
android:name=".ui.menu.activities.SettingActivity"
android:exported="false" />
<activity
android:name=".ui.menu.activities.AppAppearanceActivity"
android:exported="false" />
<activity
android:name=".ui.menu.activities.MenuActivity"
android:exported="false" />
<activity
android:name=".ui.menu.activities.EditProfileActivity"
android:exported="false" />
<activity
android:name=".ui.menu.activities.ProfileActivity"
android:exported="false" />
<activity
android:name=".ui.home.HomeActivity"
android:exported="false" />
<activity
android:name=".ui.workout.activites.TodayWorkoutActivity"
android:exported="false" />
<activity
android:name=".ui.onboarding.activities.WelcomeScreenActivity"
android:name=".ui.home.ui.more.activities.ProfileActivity"
android:exported="false" />
<!-- <activity-->
<!-- android:name=".ui.home.HomeActivity"-->
<!-- android:exported="false" />-->

<activity
android:name=".ui.onboarding.activities.RegisterScreenActivity"
android:exported="false" />

<!-- <activity-->
<!-- android:name=".ui.home.HomeActivity"-->
<!-- android:exported="false" />-->
<activity
android:name=".ui.onboarding.activities.OnBoardingSplashActivity"
android:exported="false" />
Expand All @@ -54,7 +44,7 @@
android:name=".MainActivity"
android:exported="false" />
<activity
android:name=".ui.menu.activities.ReminderActivity"
android:name=".ui.home.HomeActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
12 changes: 2 additions & 10 deletions app/src/main/java/com/modarb/android/ui/home/HomeActivity.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.modarb.android.ui.home

import android.content.Intent
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.findNavController
import androidx.navigation.ui.setupWithNavController
import com.modarb.android.R
import com.modarb.android.databinding.ActivityHomeBinding
import com.modarb.android.ui.menu.activities.NotificationActivity


class HomeActivity : AppCompatActivity() {

Expand All @@ -31,13 +29,7 @@ class HomeActivity : AppCompatActivity() {
// )
//setupActionBarWithNavController(navController, appBarConfiguration)

navView.setupWithNavController(navController)


val imageView = findViewById<View>(R.id.notificationBtn)
imageView.setOnClickListener {
val intent = Intent(this, NotificationActivity::class.java)
startActivity(intent)
}
navView.setupWithNavController(navController)
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.modarb.android.ui.menu.activities
package com.modarb.android.ui.home.ui.more.activities

import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.ArrayAdapter
import android.widget.Button
import android.widget.ListView
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import com.modarb.android.R

class EditProfileActivity : AppCompatActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.modarb.android.ui.menu.activities
package com.modarb.android.ui.home.ui.more.activities

import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import com.modarb.android.R

class ProfileActivity : AppCompatActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.modarb.android.ui.home.ui.more.fragments

import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.modarb.android.R
import com.modarb.android.ui.home.ui.more.activities.ProfileActivity

class MoreFragment : Fragment() {

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.fragment_more, container, false)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

val cardView = view.findViewById<View>(R.id.cardView)
cardView.setOnClickListener {
startActivity(Intent(requireContext(), ProfileActivity::class.java))
}
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading