Skip to content

Fix UI #11

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
anangkur wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix UI #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80c6588
Merge branch 'main' of https://github.com/SkyExplorer-Team/android-dev
wildanfatah22 Jan 15, 2024
6d2c576
Merge branch 'main' of https://github.com/SkyExplorer-Team/android-dev
wildanfatah22 Jan 15, 2024
25c0a12
fix sign up method UI, add back nav
wildanfatah22 Jan 17, 2024
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
15 changes: 14 additions & 1 deletion .idea/deploymentTargetDropDown.xml
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id ("kotlin-kapt")
id("kotlin-kapt")
id("com.google.dagger.hilt.android")
}

Expand Down Expand Up @@ -46,9 +46,9 @@ android {
}

dependencies {
val retrofitVersion = "2.9.0"
val loggingInterceptorVersion = "5.0.0-alpha.11"
val daggerHiltVersion = "2.46"
val retrofitVersion = "2.9.0"
val loggingInterceptorVersion = "5.0.0-alpha.11"
val daggerHiltVersion = "2.46"
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
Expand All @@ -61,7 +61,7 @@ dependencies {
// Navigation
implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
implementation ("androidx.navigation:navigation-fragment-ktx:2.7.6")
implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
//Retrofit
implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")
Expand All @@ -70,7 +70,7 @@ dependencies {
implementation("androidx.datastore:datastore-preferences:1.0.0")
//Dagger Hilt
implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
annotationProcessor("com.google.dagger:hilt-android-compiler:$daggerHiltVersion")
kapt("com.google.dagger:hilt-android-compiler:$daggerHiltVersion")
//Chucker
debugImplementation("com.github.chuckerteam.chucker:library:4.0.0")
releaseImplementation("com.github.chuckerteam.chucker:library-no-op:4.0.0")
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:icon="@drawable/ic_logo_white"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@drawable/ic_logo_white"
android:supportsRtl="true"
android:theme="@style/Theme.SkyExplorer"
tools:targetApi="31">
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SecondOnboardingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SecondOnboardingFragment : Fragment() {
private fun slideToNextFragment(){
val onboardingViewpagerContainer = activity?.findViewById<ViewPager2>(R.id.onBoardingContainer)
binding.btnNext.setOnClickListener {
onboardingViewpagerContainer?.currentItem = 1
onboardingViewpagerContainer?.currentItem = 2
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...ion/ui/onboarding/SpalshScreenFragment.kt → ...ion/ui/onboarding/SplashScreenFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import android.view.ViewGroup
import androidx.navigation.fragment.findNavController
import com.capstone.skyexplorer.R

class SpalshScreenFragment : Fragment() {
class SplashScreenFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/capstone/skyexplorer/presentation/ui/signin/SignInFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class SignInFragment : Fragment() {
R.id.action_signInFragment_to_forgotEmailFragment
)
}
btnBack.setOnClickListener {
findNavController().popBackStack()
}
}
}
}
3 changes: 3 additions & 0 deletions app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SetPasswordFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class SetPasswordFragment : Fragment() {
btnSignIn.setOnClickListener {

}
btnBack.setOnClickListener {
findNavController().popBackStack()
}
}
}
}
3 changes: 3 additions & 0 deletions app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpCheckFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ class SignUpCheckFragment : Fragment() {
btnSignIn.setOnClickListener {
findNavController().navigate(R.id.action_signUpCheckFragment_to_signUpOtpFragment)
}
btnBack.setOnClickListener {
findNavController().popBackStack()
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpContactFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ class SignUpContactFragment : Fragment() {
btnSignIn.setOnClickListener {
findNavController().navigate(R.id.action_signUpContactFragment_to_signUpCheckFragment)
}
btnBack.setOnClickListener {
findNavController().popBackStack()
}
}
}
}
3 changes: 3 additions & 0 deletions app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpPersonalFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ class SignUpPersonalFragment : Fragment() {
btnNext.setOnClickListener {
findNavController().navigate(R.id.action_signUpPersonalFragment_to_signUpContactFragment)
}
btnBack.setOnClickListener {
findNavController().popBackStack()
}
}
}
}
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/ic_logo_white.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="58dp"
android:height="58dp"
android:viewportWidth="58"
android:viewportHeight="58">
<path
android:pathData="M29.363,29.363m-27,0a27,27 0,1 1,54 0a27,27 0,1 1,-54 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M40.162,37.079L37.066,29.078L36.367,27.305C36.274,27.018 36.362,26.601 36.579,26.388L40.265,22.772C41.422,21.638 41.956,19.436 41.47,17.88C41.297,17.341 40.871,16.907 40.336,16.723C38.801,16.219 36.577,16.722 35.42,17.857L31.734,21.472C31.517,21.685 31.099,21.765 30.813,21.666L21.126,17.694C20.069,17.242 18.514,17.561 17.695,18.365L16.105,19.925C15.081,20.929 15.331,22.196 16.674,22.746L25.196,26.23C25.862,26.499 25.987,27.133 25.469,27.641L24.132,28.952L21.963,31.079C21.686,31.351 21.135,31.584 20.753,31.58L15.205,31.539C14.632,31.533 13.936,31.956 13.656,32.49L12.549,34.639C12.051,35.553 12.505,36.691 13.493,37.023L18.714,37.527C19.513,37.595 20.21,38.306 20.262,39.105L20.665,44.336C20.99,45.318 22.107,45.806 23.054,45.35L25.224,44.285C25.751,44.027 26.2,43.328 26.205,42.755L26.271,37.207C26.263,36.813 26.507,36.266 26.784,35.995L30.29,32.556C30.808,32.048 31.415,32.185 31.695,32.856L35.013,41.444C35.536,42.798 36.799,43.072 37.823,42.068L39.413,40.508C40.232,39.705 40.581,38.157 40.162,37.079Z"
android:fillColor="#38A993"/>
</vector>
28 changes: 13 additions & 15 deletions app/src/main/res/layout/fragment_sign_up_check.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/primary_500"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle2"
app:layout_constraintStart_toEndOf="@id/circle1"
app:layout_constraintTop_toTopOf="@id/circle1" />

<ImageView
android:id="@+id/circle1"
android:layout_width="wrap_content"
Expand All @@ -44,16 +54,15 @@
app:layout_constraintTop_toBottomOf="@id/circle1" />

<View
android:id="@+id/line"
android:id="@id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/primary_500"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle2"
app:layout_constraintStart_toEndOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle3"
app:layout_constraintStart_toEndOf="@id/circle2"
app:layout_constraintTop_toTopOf="@id/circle1" />


<ImageView
android:id="@+id/circle2"
android:layout_width="wrap_content"
Expand All @@ -76,16 +85,6 @@
app:layout_constraintStart_toStartOf="@id/circle2"
app:layout_constraintTop_toBottomOf="@id/circle2" />

<View
android:id="@id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/primary_500"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle3"
app:layout_constraintStart_toEndOf="@id/circle2"
app:layout_constraintTop_toTopOf="@id/circle1" />

<ImageView
android:id="@+id/circle3"
android:layout_width="wrap_content"
Expand Down Expand Up @@ -346,6 +345,5 @@
app:layout_constraintStart_toStartOf="@id/tvPersonalInformation"
app:layout_constraintTop_toBottomOf="@id/subscribe" />


</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
29 changes: 14 additions & 15 deletions app/src/main/res/layout/fragment_sign_up_contact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/primary_500"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle2"
app:layout_constraintStart_toEndOf="@id/circle1"
app:layout_constraintTop_toTopOf="@id/circle1" />

<ImageView
android:id="@+id/circle1"
android:layout_width="wrap_content"
Expand All @@ -40,16 +50,15 @@
app:layout_constraintTop_toBottomOf="@id/circle1" />

<View
android:id="@+id/line"
android:id="@id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/primary_500"
android:background="@color/neutral_100"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle2"
app:layout_constraintStart_toEndOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle3"
app:layout_constraintStart_toEndOf="@id/circle2"
app:layout_constraintTop_toTopOf="@id/circle1" />


<ImageView
android:id="@+id/circle2"
android:layout_width="wrap_content"
Expand All @@ -72,16 +81,6 @@
app:layout_constraintStart_toStartOf="@id/circle2"
app:layout_constraintTop_toBottomOf="@id/circle2" />

<View
android:id="@id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/neutral_100"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle3"
app:layout_constraintStart_toEndOf="@id/circle2"
app:layout_constraintTop_toTopOf="@id/circle1" />

<ImageView
android:id="@+id/circle3"
android:layout_width="wrap_content"
Expand Down
27 changes: 13 additions & 14 deletions app/src/main/res/layout/fragment_sign_up_personal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/neutral_100"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle2"
app:layout_constraintStart_toEndOf="@id/circle1"
app:layout_constraintTop_toTopOf="@id/circle1" />

<ImageView
android:id="@+id/circle1"
android:layout_width="wrap_content"
Expand All @@ -44,16 +54,15 @@
app:layout_constraintTop_toBottomOf="@id/circle1" />

<View
android:id="@+id/line"
android:id="@id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/neutral_100"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle2"
app:layout_constraintStart_toEndOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle3"
app:layout_constraintStart_toEndOf="@id/circle2"
app:layout_constraintTop_toTopOf="@id/circle1" />


<ImageView
android:id="@+id/circle2"
android:layout_width="wrap_content"
Expand All @@ -77,16 +86,6 @@
app:layout_constraintStart_toStartOf="@id/circle2"
app:layout_constraintTop_toBottomOf="@id/circle2" />

<View
android:id="@id/line"
android:layout_width="105dp"
android:layout_height="6dp"
android:background="@color/neutral_100"
app:layout_constraintBottom_toBottomOf="@id/circle1"
app:layout_constraintEnd_toStartOf="@id/circle3"
app:layout_constraintStart_toEndOf="@id/circle2"
app:layout_constraintTop_toTopOf="@id/circle1" />

<ImageView
android:id="@+id/circle3"
android:layout_width="wrap_content"
Expand Down
Loading