Skip to content

tasarim1.2 #28

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

tasarim1.2 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1981a03
tasarim1.2
haldunbektas May 7, 2025
d076519
tasarim1.3
haldunbektas May 7, 2025
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/misc.xml
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion app/src/main/res/layout/activity_aktivite_sec.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
android:layout_marginBottom="20dp"
android:clickable="false"
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/acikyesil"
app:cardCornerRadius="12dp"
app:cardElevation="6dp"
app:layout_constraintBottom_toTopOf="@+id/aktivitelerRecyclerView"
Expand Down Expand Up @@ -45,8 +46,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Aktiviteni Seç"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/black"
android:textSize="18sp" />
android:textSize="24sp" />
</LinearLayout>

</androidx.cardview.widget.CardView>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_altin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:clickable="true"
app:backgroundTint="@android:color/holo_orange_light"
app:layout_constraintBottom_toTopOf="@+id/textViewTumAtlinVarlik"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -49,10 +50,9 @@
android:layout_height="396dp"
app:layout_constraintBottom_toTopOf="@+id/fabAltinEkle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_bias="0.925"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView5"
app:layout_constraintVertical_bias="0.5" />
app:layout_constraintTop_toBottomOf="@+id/textView5" />

</androidx.constraintlayout.widget.ConstraintLayout>

1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_ders_takip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
android:layout_marginBottom="68dp"
android:clickable="true"
android:src="@drawable/add"
app:backgroundTint="@color/aciksari"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_doviz.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
android:layout_marginTop="8dp"
android:backgroundTint="@android:color/holo_green_dark"
android:text="Varlık Ekle"
app:layout_constraintTop_toBottomOf="@+id/ToplamBakiyeBilgiText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/ToplamBakiyeBilgiText" />

<ImageView
android:id="@+id/imageView"
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/layout/activity_fitness.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
android:layout_marginStart="6dp"
android:layout_marginTop="40dp"
android:text="Fiziksel Aktivite Takip"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -29,6 +30,7 @@
android:layout_marginEnd="16dp"
android:clickable="true"
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/acikyesil"
app:cardCornerRadius="12dp"
app:cardElevation="6dp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -57,6 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Aktivite Ekle"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/black"
android:textSize="18sp" />
</LinearLayout>
Expand All @@ -72,6 +75,7 @@
android:layout_marginEnd="16dp"
android:clickable="true"
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/acikyesil"
app:cardCornerRadius="12dp"
app:cardElevation="6dp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -100,6 +104,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Geçmiş Aktiviteler"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/black"
android:textSize="18sp" />
</LinearLayout>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/activity_gecmis_aktiviteler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
android:layout_marginTop="48dp"
android:layout_marginEnd="16dp"
android:elevation="4dp"
app:cardBackgroundColor="@color/acikyesil"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/gecmisAktivitelerGeriTusu"
Expand All @@ -50,7 +51,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Geçmiş Aktivitelerim"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp"
android:textStyle="bold" />

</LinearLayout>
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_kalori.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:backgroundTint="@color/sari"
android:backgroundTint="@color/material_dynamic_tertiary40"
android:text="Kalori Ekle"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/Toplamkalroitext" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_kalori_ekle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="167dp"
android:background="@color/sari">
android:background="@color/material_dynamic_tertiary40">

<TextView
android:id="@+id/GelenYemek"
Expand Down Expand Up @@ -104,7 +104,7 @@
android:layout_width="146dp"
android:layout_height="46dp"
android:layout_marginBottom="32dp"
android:backgroundTint="@color/sari"
android:backgroundTint="@color/material_dynamic_tertiary40"
android:text="Ekle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/card_view_aktivite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_margin="16dp"
app:cardBackgroundColor="#FDFAFA"
app:cardBackgroundColor="@color/acikyesil"
app:cardCornerRadius="12dp"
app:cardElevation="6dp"
app:cardUseCompatPadding="false">
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/res/layout/card_view_aktivite_ekle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/aktiviteEkleCard"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_margin="8dp"
android:clickable="true"
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/acikyesil"
app:cardCornerRadius="12dp"
app:cardElevation="6dp">

Expand All @@ -23,10 +23,9 @@
android:id="@+id/aktiviteIcon"
android:layout_width="32dp"
android:layout_height="32dp"
android:src="@drawable/icon_fitness"
android:contentDescription="Aktivite Icon"
android:layout_marginEnd="12dp"
/>
android:contentDescription="Aktivite Icon"
android:src="@drawable/icon_fitness" />

<TextView
android:id="@+id/aktiviteEkleText"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/layout/card_view_altin_tasarimi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
android:id="@+id/cardViewAltin"
android:layout_width="match_parent"
android:layout_height="75dp"
app:cardBackgroundColor="@android:color/holo_orange_light"
app:cardCornerRadius="12dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"
Expand All @@ -25,6 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="Altın Türü"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -36,6 +38,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="Altın Miktarı"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/textViewAltinTuru"
Expand All @@ -48,6 +51,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="Altın Tutarı"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/textViewAltinMiktar"
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/card_view_gecmis_aktiviteler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:elevation="4dp"
app:cardBackgroundColor="@color/acikyesil"
app:cardCornerRadius="8dp">

<LinearLayout
Expand All @@ -34,7 +35,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Geçmiş Aktivitelerim"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp"
android:textStyle="bold" />

</LinearLayout>
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/ders_rec_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
android:id="@+id/dersCardview"
android:layout_width="match_parent"
android:layout_height="105dp"
android:backgroundTint="@color/acikmav2"
android:layout_margin="8dp"
android:backgroundTint="@color/aciksari"
app:cardCornerRadius="25dp"
app:cardElevation="6dp"
android:layout_margin="8dp">
app:cardElevation="6dp">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand All @@ -24,6 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:text="TextView"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_add_pages.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
android:id="@+id/kaloritext"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/material_dynamic_tertiary40"
android:background="@color/material_dynamic_tertiary60"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:text="Kalori Takip Et"
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/layout/gelen_yemk_rev_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
android:id="@+id/GelenYemekCardView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/sari"
android:layout_marginBottom="15dp"
android:backgroundTint="@color/material_dynamic_tertiary60"
app:cardCornerRadius="25dp"
app:cardElevation="6dp"
android:layout_marginBottom="15dp">
app:cardElevation="6dp">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand All @@ -24,7 +24,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Bitcoin"
android:textColor="@color/gri"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="@color/acikBeyaz"
android:textSize="34sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/layout/yemek_list_recview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
android:id="@+id/KaloriCardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/sari"
android:layout_marginBottom="15dp"
android:backgroundTint="@color/material_dynamic_tertiary60"
app:cardCornerRadius="25dp"
app:cardElevation="6dp"
android:layout_marginBottom="15dp">
app:cardElevation="6dp">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand All @@ -24,7 +24,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Bitcoin"
android:textColor="@color/gri"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="@color/acikBeyaz"
android:textSize="34sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
Expand Down