fimkov/OmniCards
1
0
Fork 0
forked from omni/OmniCards
Code Pull Requests Activity

feat: added showing card name in title bar

Browse Source
This commit is contained in:
omni
2026-06-09 14:51:48 +03:00
parent 635b1f3bac
commit fd6fe1b989
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/java/ru/omni_devel/cards/ShowCardActivity.kt
+4
View File
@@ -3,6 +3,7 @@ package ru.omni_devel.cards
import android.os.Bundle import android.os.Bundle
import android.view.WindowManager import android.view.WindowManager
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
@@ -50,6 +51,9 @@ class ShowCardActivity : AppCompatActivity() {
} }
val cardCodeView: ImageView = findViewById(R.id.cardCodeView) val cardCodeView: ImageView = findViewById(R.id.cardCodeView)
val cardNameElement: TextView = findViewById(R.id.cardName)
cardNameElement.text = cardInfo.name
val code = generateCode(cardInfo.codeValue, cardInfo.codeType) val code = generateCode(cardInfo.codeValue, cardInfo.codeType)
mobile/src/main/res/layout/activity_add_card.xml
+2 -2
View File
@@ -19,11 +19,11 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/cardName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="OmniCards" android:text="Adding card"
android:textColor="@color/text_primary" android:textColor="@color/text_primary"
android:textSize="24sp" android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="@+id/toolbar2" app:layout_constraintBottom_toBottomOf="@+id/toolbar2"
mobile/src/main/res/layout/activity_show_card.xml
+8 -17
View File
@@ -19,34 +19,25 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/cardName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="OmniCards" android:text="Card name"
android:textColor="@color/text_primary" android:textColor="@color/text_primary"
android:textSize="24sp" android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="@+id/toolbar2" app:layout_constraintBottom_toBottomOf="@+id/toolbar2"
app:layout_constraintStart_toStartOf="@+id/toolbar2" app:layout_constraintStart_toStartOf="@+id/toolbar2"
app:layout_constraintTop_toTopOf="@+id/toolbar2" /> app:layout_constraintTop_toTopOf="@+id/toolbar2" />
<LinearLayout <ImageView
android:layout_width="0dp" android:id="@+id/cardCodeView"
android:layout_height="0dp" android:layout_width="match_parent"
android:layout_marginStart="8dp" android:layout_height="300dp"
android:layout_marginEnd="8dp" android:scaleType="fitCenter"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar2" app:layout_constraintTop_toBottomOf="@+id/toolbar2" />
app:layout_constraintVertical_bias="0.0">
<ImageView
android:id="@+id/cardCodeView"
android:layout_width="match_parent"
android:layout_height="300dp"
android:scaleType="fitCenter"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>