Skip to content

Commit

Permalink
Organise UI structure
Browse files Browse the repository at this point in the history
  • Loading branch information
itsyourap committed Oct 14, 2024
1 parent 5c2b8e8 commit 5e27844
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 12 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
android:supportsRtl="true"
android:theme="@style/Theme.Numplex">
<activity
android:name=".SignInActivity"
android:name=".ui.activity.SignInActivity"
android:exported="true">

</activity>

<activity
android:name=".MainActivity"
android:name=".ui.activity.MainActivity"
android:exported="true"
android:theme="@style/Theme.Numplex.MySplash">
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sayan.apps.numplex
package sayan.apps.numplex.ui.activity

import android.content.Intent
import android.os.Bundle
Expand All @@ -24,6 +24,10 @@ import androidx.fragment.app.Fragment
import com.google.android.material.navigation.NavigationView
import com.google.firebase.auth.FirebaseAuth
import com.squareup.picasso.Picasso
import sayan.apps.numplex.R
import sayan.apps.numplex.ui.fragment.ClassificationsFragment
import sayan.apps.numplex.ui.fragment.FeedbackFragment
import sayan.apps.numplex.ui.fragment.NumplexFragment
import java.util.concurrent.Executors

class MainActivity : AppCompatActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sayan.apps.numplex
package sayan.apps.numplex.ui.activity

import android.content.Intent
import android.os.Bundle
Expand All @@ -18,6 +18,7 @@ import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.auth.GoogleAuthProvider
import sayan.apps.numplex.R
import java.util.concurrent.Executors


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sayan.apps.numplex
package sayan.apps.numplex.ui.fragment

import android.content.Intent
import android.net.Uri
Expand All @@ -9,6 +9,7 @@ import android.view.ViewGroup
import android.widget.Button
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.Fragment
import sayan.apps.numplex.R

class ClassificationsFragment : Fragment(), View.OnClickListener {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sayan.apps.numplex
package sayan.apps.numplex.ui.fragment

import android.content.Context
import android.os.Bundle
Expand All @@ -14,6 +14,7 @@ import androidx.fragment.app.Fragment
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.database.DatabaseReference
import com.google.firebase.database.FirebaseDatabase
import sayan.apps.numplex.R

class FeedbackFragment : Fragment(), View.OnClickListener {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sayan.apps.numplex
package sayan.apps.numplex.ui.fragment

import android.content.Context
import android.os.Bundle
Expand All @@ -10,6 +10,39 @@ import android.widget.Button
import android.widget.EditText
import android.widget.TextView
import androidx.fragment.app.Fragment
import sayan.apps.numplex.R
import sayan.apps.numplex.decimalToBin
import sayan.apps.numplex.decimalToHex
import sayan.apps.numplex.decimalToOct
import sayan.apps.numplex.digitCount
import sayan.apps.numplex.digitSum
import sayan.apps.numplex.factors
import sayan.apps.numplex.isAbundantNumber
import sayan.apps.numplex.isArmstrongNumber
import sayan.apps.numplex.isAutomorphicNumber
import sayan.apps.numplex.isCircularPrimeNumber
import sayan.apps.numplex.isDisariumNumber
import sayan.apps.numplex.isDuckNumber
import sayan.apps.numplex.isEmirpNumber
import sayan.apps.numplex.isEven
import sayan.apps.numplex.isFermatNumber
import sayan.apps.numplex.isFibonacciNumber
import sayan.apps.numplex.isHappyNumber
import sayan.apps.numplex.isKaprekarNumber
import sayan.apps.numplex.isLucasNumber
import sayan.apps.numplex.isNeonNumber
import sayan.apps.numplex.isNivenNumber
import sayan.apps.numplex.isPalindrome
import sayan.apps.numplex.isPrimeNumber
import sayan.apps.numplex.isPronicNumber
import sayan.apps.numplex.isSmithNumber
import sayan.apps.numplex.isSpecialNumber
import sayan.apps.numplex.isSpyNumber
import sayan.apps.numplex.isTechNumber
import sayan.apps.numplex.isUglyNumber
import sayan.apps.numplex.primeFactorization
import sayan.apps.numplex.primeFactors
import sayan.apps.numplex.reverse
import kotlin.math.pow
import kotlin.random.Random

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical"
tools:context=".MainActivity">
tools:context=".ui.activity.MainActivity">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_signin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".MainActivity">
tools:context=".ui.activity.MainActivity">


<ImageView
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_classifications.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ClassificationsFragment">
tools:context=".ui.fragment.ClassificationsFragment">


<androidx.constraintlayout.widget.ConstraintLayout
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_feedback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".FeedbackFragment">
tools:context=".ui.fragment.FeedbackFragment">

<LinearLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_numplex.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".NumplexFragment">
tools:context=".ui.fragment.NumplexFragment">

<LinearLayout
android:id="@+id/numplexPage"
Expand Down

0 comments on commit 5e27844

Please sign in to comment.