Skip to content

Revert "Alondras branch" #2

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Alondras branch" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions .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.

2 changes: 0 additions & 2 deletions app/src/main/java/com/ottogo/weekly/api/WeeklyApiService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ private val retrofit = Retrofit.Builder()
interface WeeklyApiService {
@POST("api/account/login/")
suspend fun login(@Body body: Map<String, String>)
@POST("api/account/create/")
suspend fun signup(@Body body: Map<String, String>) : Map<String, String>

}

Expand Down
58 changes: 13 additions & 45 deletions app/src/main/java/com/ottogo/weekly/ui/login/LandingPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,43 @@
package com.ottogo.weekly.ui.login

import android.graphics.Color
import android.os.Bundle
import android.util.Log
import android.widget.TextView
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.*
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.focusModifier
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.navigation.NavController
import com.ottogo.weekly.api.WeeklyApi
import com.ottogo.weekly.ui.components.CustomButton
import com.ottogo.weekly.ui.theme.nunitoFamily
import kotlinx.coroutines.runBlocking
import java.time.format.TextStyle

@Composable
fun LandingPage(navController: NavController) {


Column(modifier = Modifier.padding(24.dp)){

displayTitle("Weekly")
displayGreeting("Make your best memories")
Column(){

CustomButton(buttonText = "Sign up"){
runBlocking {
navController.navigate("signupBirthdayPage")


Spacer(modifier = Modifier.padding(187.dp))
CustomButton(buttonText = "Sign up") {
runBlocking {
navController.navigate("signupBirthdayPage")
}
Modifier.height(48.dp)
}
}
CustomButton(buttonText = "Login"){
runBlocking {
navController.navigate("loginPage")

Spacer(modifier = Modifier.height(15.dp))
CustomButton(buttonText = "Login") {
runBlocking {
navController.navigate("loginPage")
}
}
}
}

@Composable
fun displayTitle(appName: String) {
Spacer(modifier = Modifier.height(65.dp))
Text(text = appName,
fontSize = 48.sp,
fontWeight = FontWeight(700),
fontFamily = nunitoFamily
)
}
@Composable
fun displayGreeting(greeting: String) {
Spacer(modifier = Modifier.height(17.dp))
Text(text = greeting,
fontSize = 24.sp,
fontWeight = FontWeight(700),
fontFamily = nunitoFamily)
}
}
}
11 changes: 1 addition & 10 deletions app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
Expand All @@ -17,8 +16,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.ottogo.weekly.ui.components.CustomButton
import kotlinx.coroutines.runBlocking

/*
*
Expand All @@ -36,13 +33,7 @@ fun SignupBirthdayPage(navController: NavController) {


Column(){
Text(text ="birthday page")
CustomButton(buttonText = "Sign up") {
runBlocking {
navController.navigate("signupPage/{dob}")
}
Modifier.width(27.dp)
}


}
}
Loading