mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-29 03:32:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix last commit

Browse Source
This commit is contained in:
Sylvia van Os
2021-08-05 20:35:44 +02:00
parent 15f6bd86a1
commit c3345a1a15
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -41,6 +41,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.appcompat.widget.Toolbar;
import androidx.constraintlayout.widget.Guideline;
import androidx.core.graphics.drawable.DrawableCompat;
@@ -64,7 +65,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
TextView groupsView;
TextView balanceView;
TextView expiryView;
TextView storeName;
AppCompatTextView storeName;
ImageButton maximizeButton;
ImageView barcodeImage;
ImageButton minimizeButton;

2
app/src/main/res/layout/loyalty_card_view_layout.xml
View File

@@ -275,7 +275,7 @@
app:expandedTitleMarginEnd="64dp"
app:contentScrim="?colorPrimary"
app:expandedTitleGravity="top">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/storeName"
android:layout_width="match_parent"
android:layout_height="wrap_content"

1
app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
View File

@@ -1157,7 +1157,6 @@ public class LoyaltyCardViewActivityTest
TextViewCompat.getAutoSizeMaxTextSize(storeName);
TextViewCompat.getAutoSizeMaxTextSize(storeName);
assertEquals(LARGE_FONT_SIZE, (int)storeName.getTextSize());
assertEquals(LARGE_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));
shadowOf(activity).clickMenuItem(android.R.id.home);