UI updates and fixes

This commit is contained in:
M M Arif 2023-03-11 16:40:35 +05:00
parent 959049891c
commit aa0e315dd2
39 changed files with 73 additions and 69 deletions

View file

@ -17,11 +17,6 @@ import androidx.appcompat.widget.SearchView;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
import org.gitnex.tea4j.v2.models.ContentsResponse; import org.gitnex.tea4j.v2.models.ContentsResponse;
import org.mian.gitnex.R; import org.mian.gitnex.R;
import org.mian.gitnex.activities.FileViewActivity; import org.mian.gitnex.activities.FileViewActivity;
@ -35,6 +30,11 @@ import org.mian.gitnex.helpers.AppUtil;
import org.mian.gitnex.helpers.Path; import org.mian.gitnex.helpers.Path;
import org.mian.gitnex.helpers.contexts.RepositoryContext; import org.mian.gitnex.helpers.contexts.RepositoryContext;
import org.mian.gitnex.viewmodels.FilesViewModel; import org.mian.gitnex.viewmodels.FilesViewModel;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
/** /**
* @author M M Arif * @author M M Arif

View file

@ -10,7 +10,7 @@
android:top="2dp"> android:top="2dp">
<shape> <shape>
<corners android:radius="10dp"/> <corners android:radius="10dp"/>
<solid android:color="?attr/inputBackgroundColor"/> <solid android:color="?attr/primaryBackgroundColor"/>
</shape> </shape>
</item> </item>

View file

@ -95,7 +95,7 @@
android:textSize="@dimen/dimen16sp"/> android:textSize="@dimen/dimen16sp"/>
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen28dp" android:layout_width="@dimen/dimen28dp"
android:layout_height="@dimen/dimen28dp" android:layout_height="@dimen/dimen28dp"
app:cardCornerRadius="@dimen/dimen16dp" app:cardCornerRadius="@dimen/dimen16dp"

View file

@ -93,7 +93,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/titleCard" android:id="@+id/titleCard"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen12dp" android:layout_marginBottom="@dimen/dimen12dp"
@ -122,7 +122,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/mainThreadCard" android:id="@+id/mainThreadCard"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/titleCard" android:layout_below="@+id/titleCard"
@ -144,7 +144,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
app:cardCornerRadius="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen12dp"

View file

@ -70,7 +70,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/appVersionBuild" android:text="@string/appVersionBuild"
android:textColor="@color/iconPrMergedColor" android:textColor="@color/retroThemeColorSecondary"
android:textIsSelectable="true" android:textIsSelectable="true"
android:paddingTop="@dimen/dimen8dp" android:paddingTop="@dimen/dimen8dp"
android:paddingBottom="@dimen/dimen8dp" android:paddingBottom="@dimen/dimen8dp"

View file

@ -71,7 +71,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_marginBottom="@dimen/dimen4dp" android:layout_marginBottom="@dimen/dimen4dp"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -18,7 +18,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_margin="@dimen/dimen8dp" android:layout_margin="@dimen/dimen8dp"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
@ -36,8 +36,8 @@
android:saveEnabled="false" android:saveEnabled="false"
android:text="@string/filesBreadcrumbRoot" android:text="@string/filesBreadcrumbRoot"
app:CustomTextSize="@dimen/dimen16sp" app:CustomTextSize="@dimen/dimen16sp"
app:SelectedTextColor="?attr/primaryTextColor" app:SelectedTextColor="?attr/inputSelectedColor"
app:UnSelectedTextColor="@color/lightGray"/> app:UnSelectedTextColor="?attr/primaryTextColor" />
</LinearLayout> </LinearLayout>
@ -57,7 +57,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@ -69,12 +69,12 @@
android:id="@+id/noDataFiles" android:id="@+id/noDataFiles"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="15dp" android:layout_margin="@dimen/dimen16dp"
android:gravity="center" android:gravity="center"
android:text="@string/noDataFound" android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="18sp" android:textSize="@dimen/dimen18sp"
android:visibility="gone"/> android:visibility="gone" />
<com.google.android.material.progressindicator.LinearProgressIndicator <com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progress_bar" android:id="@+id/progress_bar"
@ -83,6 +83,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@id/filesFrame" android:layout_alignTop="@id/filesFrame"
android:indeterminate="true" android:indeterminate="true"
app:indicatorColor="?attr/progressIndicatorColor"/> app:indicatorColor="?attr/progressIndicatorColor" />
</RelativeLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -16,7 +16,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -33,7 +33,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -423,7 +423,7 @@
android:id="@+id/fileContentsFrameHeader" android:id="@+id/fileContentsFrameHeader"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_marginTop="@dimen/dimen8dp" android:layout_marginTop="@dimen/dimen8dp"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">

View file

@ -9,7 +9,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -9,7 +9,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -9,7 +9,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -31,7 +31,7 @@
android:id="@+id/userAccountAvatar" android:id="@+id/userAccountAvatar"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp" app:cardElevation="@dimen/dimen0dp"
android:layout_gravity="center" android:layout_gravity="center"
app:cardCornerRadius="@dimen/dimen12dp"> app:cardCornerRadius="@dimen/dimen12dp">

View file

@ -10,7 +10,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -9,7 +9,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -24,7 +24,7 @@
android:id="@+id/avatarFrame" android:id="@+id/avatarFrame"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp" app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen12dp" android:layout_marginEnd="@dimen/dimen12dp"
app:cardCornerRadius="@dimen/dimen12dp"> app:cardCornerRadius="@dimen/dimen12dp">

View file

@ -8,7 +8,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">

View file

@ -11,7 +11,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -51,7 +51,7 @@
android:id="@+id/commitAuthorAvatarFrame" android:id="@+id/commitAuthorAvatarFrame"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp" app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen6dp" android:layout_marginEnd="@dimen/dimen6dp"
app:cardCornerRadius="@dimen/dimen12dp"> app:cardCornerRadius="@dimen/dimen12dp">
@ -69,7 +69,7 @@
android:id="@+id/commitCommitterAvatarFrame" android:id="@+id/commitCommitterAvatarFrame"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp" app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen6dp" android:layout_marginEnd="@dimen/dimen6dp"
app:cardCornerRadius="@dimen/dimen12dp"> app:cardCornerRadius="@dimen/dimen12dp">

View file

@ -13,7 +13,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -12,7 +12,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -13,7 +13,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -25,7 +25,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/comment_view" android:id="@+id/comment_view"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
@ -45,7 +45,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
app:cardCornerRadius="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen12dp"
@ -165,7 +165,7 @@
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen28dp" android:layout_width="@dimen/dimen28dp"
android:layout_height="@dimen/dimen28dp" android:layout_height="@dimen/dimen28dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

View file

@ -12,7 +12,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -33,7 +33,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp" app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen12dp" android:layout_marginEnd="@dimen/dimen12dp"
app:cardCornerRadius="@dimen/dimen12dp"> app:cardCornerRadius="@dimen/dimen12dp">

View file

@ -12,7 +12,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -27,7 +27,7 @@
android:id="@+id/labelView" android:id="@+id/labelView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardCornerRadius="@dimen/dimen16dp" app:cardCornerRadius="@dimen/dimen16dp"
app:cardElevation="@dimen/dimen0dp" app:cardElevation="@dimen/dimen0dp"
app:contentPaddingBottom="@dimen/dimen4dp" app:contentPaddingBottom="@dimen/dimen4dp"

View file

@ -12,7 +12,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -50,7 +50,7 @@
android:indeterminate="false" android:indeterminate="false"
android:progress="50" android:progress="50"
android:progressDrawable="@drawable/progress_bar" android:progressDrawable="@drawable/progress_bar"
android:progressTint="@color/btnBackground"/> android:progressTint="?attr/fabColor" />
</LinearLayout> </LinearLayout>

View file

@ -9,7 +9,7 @@
android:paddingBottom="@dimen/dimen4dp"> android:paddingBottom="@dimen/dimen4dp">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">

View file

@ -11,7 +11,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -11,7 +11,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -7,7 +7,7 @@
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
app:cardCornerRadius="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen12dp"

View file

@ -12,7 +12,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -12,7 +12,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -13,7 +13,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -34,7 +34,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp" app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen12dp" android:layout_marginEnd="@dimen/dimen12dp"
app:cardCornerRadius="@dimen/dimen12dp"> app:cardCornerRadius="@dimen/dimen12dp">

View file

@ -14,7 +14,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen12dp" android:layout_marginEnd="@dimen/dimen12dp"

View file

@ -9,7 +9,7 @@
android:paddingBottom="@dimen/dimen4dp"> android:paddingBottom="@dimen/dimen4dp">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
@ -69,7 +69,7 @@
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen24dp" android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp" android:layout_height="@dimen/dimen24dp"
app:cardCornerRadius="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen12dp"

View file

@ -19,7 +19,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -11,7 +11,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -13,7 +13,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -10,7 +10,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout
@ -54,6 +54,8 @@
android:paddingEnd="@dimen/dimen2dp" android:paddingEnd="@dimen/dimen2dp"
android:text="@string/userName" android:text="@string/userName"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:ellipsize="end"
android:maxLines="2"
android:textSize="14sp"/> android:textSize="14sp"/>
<TextView <TextView
@ -64,6 +66,8 @@
android:paddingEnd="@dimen/dimen2dp" android:paddingEnd="@dimen/dimen2dp"
android:text="@string/userName" android:text="@string/userName"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/dimen12sp"/> android:textSize="@dimen/dimen12sp"/>
</LinearLayout> </LinearLayout>

View file

@ -11,7 +11,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
app:cardElevation="@dimen/dimen0dp"> app:cardElevation="@dimen/dimen0dp">
<LinearLayout <LinearLayout

View file

@ -27,7 +27,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="@dimen/dimen60dp" android:layout_width="@dimen/dimen60dp"
android:layout_height="@dimen/dimen60dp" android:layout_height="@dimen/dimen60dp"
app:cardCornerRadius="@dimen/dimen32dp" app:cardCornerRadius="@dimen/dimen32dp"
@ -51,7 +51,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/userAccountsFrame" android:id="@+id/userAccountsFrame"
style="?attr/materialCardViewFilledStyle" style="?attr/materialCardViewElevatedStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dimen40dp" android:layout_height="@dimen/dimen40dp"
android:layout_gravity="end" android:layout_gravity="end"

View file

@ -58,9 +58,9 @@
<item name="colorSecondary">@android:color/system_accent1_200</item> <item name="colorSecondary">@android:color/system_accent1_200</item>
<item name="colorOnSurface">@android:color/system_accent2_900</item> <item name="colorOnSurface">@android:color/system_accent2_900</item>
<item name="diffAddedColor">@color/diffAddedColor</item> <item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
<item name="diffRemovedColor">@color/diffRemovedColor</item> <item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
<item name="diffSelectedColor">@color/diffSelectedColor</item> <item name="diffSelectedColor">@color/lightThemeDiffSelectedColor</item>
<item name="primaryTextColor">@android:color/system_accent2_900</item> <item name="primaryTextColor">@android:color/system_accent2_900</item>
<item name="primaryBackgroundColor">@android:color/system_neutral1_10</item> <item name="primaryBackgroundColor">@android:color/system_neutral1_10</item>
<item name="hintColor">@android:color/system_accent1_800</item> <item name="hintColor">@android:color/system_accent1_800</item>