Merge pull request #2 from shaulascr/gracia

button styles + toko saya activity
This commit is contained in:
Gracia Hotmauli
2025-02-02 06:03:50 +07:00
committed by GitHub
13 changed files with 408 additions and 29 deletions

1
.idea/misc.xml generated
View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" />

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/blue_500" />
<corners android:radius="5dp" />
</shape>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_100" />
<corners android:radius="5dp" />
</shape>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dp" />
<stroke
android:width="2dp"
android:color="@color/blue_500" />
</shape>

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.TokoSayaActivity">
<include layout="@layout/header" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_profile"
android:layout_width="match_parent"
android:layout_height="143dp"
android:paddingHorizontal="@dimen/horizontal_safe_area"
android:paddingVertical="@dimen/vertical_safe_area">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/iv_profile"
android:layout_width="72dp"
android:layout_height="72dp"
android:src="@drawable/placeholder_image"
android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:shapeAppearanceOverlay="@style/circular_image"/>
<TextView
android:id="@+id/tv_store_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Nama Toko"
android:layout_marginStart="8dp"
style="@style/body_large"
android:textFontWeight="700"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_profile"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</LinearLayout>

View File

@ -1,18 +1,182 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.TokoSayaActivity">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="halo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<include layout="@layout/header" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_profile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/horizontal_safe_area"
android:paddingVertical="@dimen/vertical_safe_area">
<LinearLayout
android:id="@+id/layout_profile_preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/iv_profile"
android:layout_width="72dp"
android:layout_height="72dp"
android:src="@drawable/placeholder_image"
android:scaleType="centerCrop"
app:shapeAppearanceOverlay="@style/circular_image"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginStart="8dp">
<TextView
android:id="@+id/tv_store_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Nama Toko"
style="@style/body_large"
android:fontFamily="@font/dmsans_bold"/>
<TextView
android:id="@+id/tv_store_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Jenis Toko"
style="@style/body_small" />
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/btn_edit_profile"
android:text="Ubah Profil Toko"
android:textColor="@color/blue_500"
style="@style/button.small.secondary.short"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/line_profile"/>
<View
android:id="@+id/line_profile"
android:layout_width="380dp"
android:layout_height="1dp"
android:layout_marginTop="10dp"
android:background="@color/black_50"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_profile_preview"/>
<RelativeLayout
android:id="@+id/layout_balance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@id/line_profile"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/tv_balance_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Saldo Toko"
style="@style/label_large"
android:layout_centerVertical="true"/>
<TextView
android:id="@+id/tv_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/label_large_prominent"
android:layout_toStartOf="@id/iv_balance"
android:text="Rp1.252.000"
android:layout_centerVertical="true"/>
<ImageView
android:id="@+id/iv_balance"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_navigate_next"
app:tint="@color/blue_500"
android:layout_alignParentEnd="true"/>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@color/black_50"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_sells"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/horizontal_safe_area"
android:paddingVertical="@dimen/vertical_safe_area">
<RelativeLayout
android:id="@+id/layout_sells_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/tv_sells_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Penjualan"
style="@style/body_large"
android:layout_centerVertical="true"/>
<TextView
android:id="@+id/tv_history"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/label_small"
android:fontFamily="@font/dmsans_bold"
android:layout_toStartOf="@id/iv_history"
android:text="Lihat Riwayat"
android:textColor="@color/blue_500"
android:layout_centerVertical="true"/>
<ImageView
android:id="@+id/iv_history"
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_navigate_next"
app:tint="@color/blue_500"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"/>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>

View File

@ -3,14 +3,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="40dp"
android:background="@drawable/bg_header"
android:paddingHorizontal="@dimen/horizontal_safe_area"
android:paddingVertical="@dimen/vertical_safe_area">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@drawable/header_bg"
android:paddingHorizontal="@dimen/horizontal_safe_area"
android:paddingVertical="@dimen/vertical_safe_area">
android:layout_height="match_parent"
android:background="@color/white">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/header"

View File

@ -13,7 +13,7 @@
<style name="display_large">
<item name="android:textSize">57sp</item>
<item name="android:lineSpacingExtra">64sp</item>
<item name="android:letterSpacing">-0.25</item>
<item name="android:letterSpacing">-0.025</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_regular</item>
</style>
@ -63,7 +63,7 @@
<style name="title_medium">
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">24sp</item>
<item name="android:letterSpacing">0.15</item>
<item name="android:letterSpacing">0.015</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_medium</item>
</style>
@ -71,7 +71,7 @@
<style name="title_small">
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">20sp</item>
<item name="android:letterSpacing">0.1</item>
<item name="android:letterSpacing">0.01</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_medium</item>
</style>
@ -79,7 +79,7 @@
<style name="label_large_prominent">
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">20sp</item>
<item name="android:letterSpacing">0.1</item>
<item name="android:letterSpacing">0.01</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_semibold</item>
</style>
@ -87,7 +87,7 @@
<style name="label_large">
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">20sp</item>
<item name="android:letterSpacing">0.1</item>
<item name="android:letterSpacing">0.01</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_medium</item>
</style>
@ -95,7 +95,7 @@
<style name="label_medium_prominent">
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">16sp</item>
<item name="android:letterSpacing">0.5</item>
<item name="android:letterSpacing">0.05</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_semibold</item>
</style>
@ -103,7 +103,7 @@
<style name="label_medium">
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">16sp</item>
<item name="android:letterSpacing">0.5</item>
<item name="android:letterSpacing">0.05</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_medium</item>
</style>
@ -111,7 +111,7 @@
<style name="label_small">
<item name="android:textSize">11sp</item>
<item name="android:lineSpacingExtra">16sp</item>
<item name="android:letterSpacing">0.5</item>
<item name="android:letterSpacing">0.05</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_medium</item>
</style>
@ -119,7 +119,7 @@
<style name="body_large">
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">24sp</item>
<item name="android:letterSpacing">0.5</item>
<item name="android:letterSpacing">0.05</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_regular</item>
</style>
@ -135,9 +135,150 @@
<style name="body_small">
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">16sp</item>
<item name="android:letterSpacing">0.4</item>
<item name="android:letterSpacing">0.04</item>
<item name="android:textColor">@color/black</item>
<item name="android:fontFamily">@font/dmsans_regular</item>
</style>
<!-- Buttons -->
<style name="button.large" parent="label_large_prominent">
<item name="android:padding">10.91dp</item>
<item name="android:layout_height">40dp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="button.large.active">
<item name="android:background">@drawable/bg_button_active</item>
</style>
<style name="button.large.active.long">
<item name="android:layout_width">380dp</item>
</style>
<style name="button.large.active.medium">
<item name="android:layout_width">185dp</item>
</style>
<style name="button.large.active.short">
<item name="android:layout_width">144dp</item>
</style>
<style name="button.large.active.short.only_icon">
<item name="android:layout_width">40dp</item>
</style>
<style name="button.large.secondary">
<item name="android:background">@drawable/bg_button_secondary</item>
</style>
<style name="button.large.secondary.long">
<item name="android:layout_width">380dp</item>
</style>
<style name="button.large.secondary.medium">
<item name="android:layout_width">185dp</item>
</style>
<style name="button.large.secondary.short">
<item name="android:layout_width">144dp</item>
</style>
<style name="button.large.secondary.short.only_icon">
<item name="android:layout_width">40dp</item>
</style>
<style name="button.large.disabled">
<item name="android:background">@drawable/bg_button_disabled</item>
</style>
<style name="button.large.disabled.long">
<item name="android:layout_width">380dp</item>
</style>
<style name="button.large.disabled.medium">
<item name="android:layout_width">185dp</item>
</style>
<style name="button.large.disabled.short">
<item name="android:layout_width">144dp</item>
</style>
<style name="button.large.disabled.short.only_icon">
<item name="android:layout_width">40dp</item>
</style>
<style name="button.small" parent="label_medium_prominent">
<item name="android:padding">7dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="button.small.active">
<item name="android:background">@drawable/bg_button_active</item>
</style>
<style name="button.small.active.long">
<item name="android:layout_width">380dp</item>
</style>
<style name="button.small.active.medium">
<item name="android:layout_width">185dp</item>
</style>
<style name="button.small.active.short">
<item name="android:layout_width">144dp</item>
</style>
<style name="button.small.active.short.only_icon">
<item name="android:layout_width">40dp</item>
</style>
<style name="button.small.secondary">
<item name="android:background">@drawable/bg_button_secondary</item>
</style>
<style name="button.small.secondary.long">
<item name="android:layout_width">380dp</item>
</style>
<style name="button.small.secondary.medium">
<item name="android:layout_width">185dp</item>
</style>
<style name="button.small.secondary.short">
<item name="android:layout_width">144dp</item>
</style>
<style name="button.small.secondary.short.only_icon">
<item name="android:layout_width">40dp</item>
</style>
<style name="button.small.disabled">
<item name="android:background">@drawable/bg_button_disabled</item>
</style>
<style name="button.small.disabled.long">
<item name="android:layout_width">380dp</item>
</style>
<style name="button.small.disabled.medium">
<item name="android:layout_width">185dp</item>
</style>
<style name="button.small.disabled.short">
<item name="android:layout_width">144dp</item>
</style>
<style name="button.small.disabled.short.only_icon">
<item name="android:layout_width">40dp</item>
</style>
<!-- Styles -->
<style name="circular_image">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>
</style>
</resources>

View File

@ -1,14 +1,14 @@
[versions]
agp = "8.5.2"
agp = "8.7.3"
kotlin = "1.9.0"
coreKtx = "1.10.1"
coreKtx = "1.15.0"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
appcompat = "1.7.0"
material = "1.12.0"
activity = "1.9.2"
constraintlayout = "2.1.4"
activity = "1.10.0"
constraintlayout = "2.2.0"
[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

View File

@ -1,6 +1,6 @@
#Wed Oct 16 14:37:43 ICT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists