GitNex/GitNex
GitNex/GitNex
2
5
Fork 0
mirror of https://codeberg.org/gitnex/GitNex.git synced 2023-12-13 20:50:18 +01:00
Code Issues 1 Projects Releases Wiki Activity

New Material UI for user profile

Browse source
This commit is contained in:
M M Arif 2022-08-10 21:54:07 +05:00
parent 387089fb26
commit 6bd56c5f19
15 changed files with 294 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
View file

@ -11,7 +11,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@ -48,11 +47,8 @@ public class MyProfileEmailsFragment extends Fragment {
noDataEmails = fragmentProfileEmailsBinding.noDataEmails;
mRecyclerView = fragmentProfileEmailsBinding.recyclerView;
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
mRecyclerView.addItemDecoration(dividerItemDecoration);
mProgressBar = fragmentProfileEmailsBinding.progressBar;

3
app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
View file

@ -10,7 +10,6 @@ import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import org.gitnex.tea4j.v2.models.User;
import org.mian.gitnex.R;
@ -64,9 +63,7 @@ public class MyProfileFollowersFragment extends Fragment {
}
}));
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, DividerItemDecoration.VERTICAL);
viewBinding.recyclerView.setHasFixedSize(true);
viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
viewBinding.recyclerView.setAdapter(adapter);

3
app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
View file

@ -10,7 +10,6 @@ import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import org.gitnex.tea4j.v2.models.User;
import org.mian.gitnex.R;
@ -63,9 +62,7 @@ public class MyProfileFollowingFragment extends Fragment {
}
}));
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, DividerItemDecoration.VERTICAL);
viewBinding.recyclerView.setHasFixedSize(true);
viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
viewBinding.recyclerView.setAdapter(adapter);

2
app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
View file

@ -156,7 +156,7 @@ public class MyProfileFragment extends Fragment {
userFullName.setText(Html.fromHtml(account.getFullName()));
userLogin.setText(getString(R.string.usernameWithAt, account.getAccount().getUserName()));
int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 60);
PicassoService.getInstance(ctx).get().load(account.getUserInfo().getAvatarUrl()).transform(new RoundedTransformation(avatarRadius, 0)).placeholder(R.drawable.loader_animated).resize(120, 120).centerCrop().into(userAvatar);

3
app/src/main/res/layout/activity_login.xml
View file

@ -232,9 +232,10 @@
<Button
android:id="@+id/login_button"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen60dp"
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/btnLogin"
android:textStyle="bold"
android:textColor="@color/btnTextColor" />
<TextView

137
app/src/main/res/layout/fragment_profile.xml
View file

@ -5,26 +5,24 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:orientation="vertical">
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/loadingIndicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="gone"
android:layout_height="wrap_content"/>
android:visibility="gone" />
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay"
app:elevation="0dp">
app:elevation="@dimen/dimen0dp">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="200dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
android:layout_height="@dimen/dimen320dp">
<ImageView
android:id="@+id/userAvatarBackground"
@ -36,10 +34,11 @@
<LinearLayout
android:id="@+id/layoutFrameAccount"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp">
android:layout_marginTop="@dimen/dimen8dp"
android:padding="@dimen/dimen16dp">
<com.google.android.material.card.MaterialCardView
android:layout_width="@dimen/dimen60dp"
@ -64,22 +63,22 @@
android:layout_height="wrap_content"
android:textColor="@color/colorWhite"
android:textIsSelectable="true"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/userLogin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginBottom="@dimen/dimen10dp"
android:textColor="@color/colorWhite"
android:textIsSelectable="true"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
<View
android:id="@+id/divider"
android:layout_width="50dp"
android:layout_height="1dp"
android:layout_marginBottom="10dp"
android:layout_width="@dimen/dimen50dp"
android:layout_height="@dimen/dimen1dp"
android:layout_marginBottom="@dimen/dimen10dp"
android:background="@color/colorWhite" />
<LinearLayout
@ -91,8 +90,8 @@
<ImageView
android:id="@+id/userLanguageIcon"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginEnd="2dp"
android:layout_height="@dimen/dimen18dp"
android:layout_marginEnd="@dimen/dimen2dp"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_language"
app:tint="@color/colorWhite" />
@ -103,7 +102,7 @@
android:layout_height="wrap_content"
android:textColor="@color/colorWhite"
android:textIsSelectable="true"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
@ -111,42 +110,80 @@
</FrameLayout>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/primaryBackgroundColor"
app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
app:tabMode="auto"
app:tabTextAppearance="@style/customTabLayout"
app:tabTextColor="?attr/primaryTextColor">
<com.google.android.material.tabs.TabItem
android:id="@+id/profileTabFollowers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profileTabFollowers" />
<com.google.android.material.tabs.TabItem
android:id="@+id/profileTabFollowing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profileTabFollowing" />
<com.google.android.material.tabs.TabItem
android:id="@+id/profileTabEmails"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profileTabEmails" />
</com.google.android.material.tabs.TabLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/container"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
android:layout_marginTop="@dimen/dimen200dp">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CustomMaterCardViewStyle"
app:strokeWidth="@dimen/dimen0dp"
app:strokeColor="?attr/colorPrimary">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.card.MaterialCardView
android:id="@+id/fragmentProfileCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dimen12dp"
app:strokeWidth="@dimen/dimen2dp"
app:cardCornerRadius="@dimen/dimen32dp"
app:strokeColor="?attr/colorPrimary"
style="?attr/materialCardViewFilledStyle">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabTextAppearance="@android:style/TextAppearance.Material.Widget.TabWidget"
app:tabIndicatorGravity="stretch"
app:tabMode="fixed"
app:tabIndicatorColor="?attr/colorPrimary"
app:tabIndicatorFullWidth="true"
app:tabSelectedTextColor="@android:color/white"
app:tabTextColor="?attr/colorPrimary">
<com.google.android.material.tabs.TabItem
android:id="@+id/profileTabFollowers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profileTabFollowers" />
<com.google.android.material.tabs.TabItem
android:id="@+id/profileTabFollowing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profileTabFollowing" />
<com.google.android.material.tabs.TabItem
android:id="@+id/profileTabEmails"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profileTabEmails" />
</com.google.android.material.tabs.TabLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen72dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</com.google.android.material.card.MaterialCardView>
</FrameLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

145
app/src/main/res/layout/fragment_profile_detail.xml
View file

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:background="?attr/primaryBackgroundColor"
android:layout_width="match_parent"
android:layout_height="match_parent"
<LinearLayout
xmlns:tools="http://schemas.android.com/tools"
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"
android:id="@+id/userInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:orientation="vertical"
android:id="@+id/userInfoLayout"
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="gone"
style="@style/Widget.Material3.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/profileFrame"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_height="@dimen/dimen320dp"
android:gravity="top"
android:orientation="vertical">
@ -38,10 +38,10 @@
<LinearLayout
android:id="@+id/layoutFrameAccount"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
tools:ignore="UseCompoundDrawables">
<com.google.android.material.card.MaterialCardView
@ -49,6 +49,7 @@
android:layout_height="@dimen/dimen60dp"
style="?attr/materialCardViewFilledStyle"
android:layout_marginBottom="@dimen/dimen8dp"
android:layout_marginTop="@dimen/dimen16dp"
app:cardElevation="@dimen/dimen0dp"
app:cardCornerRadius="@dimen/dimen32dp">
@ -65,10 +66,10 @@
android:id="@+id/userFullName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:textColor="@color/colorWhite"
android:textIsSelectable="true"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/userLogin"
@ -76,65 +77,74 @@
android:layout_height="wrap_content"
android:textColor="@color/colorWhite"
android:textIsSelectable="true"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:orientation="vertical"
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="15dp">
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dimen200dp"
style="@style/CustomMaterCardViewStyle"
app:strokeWidth="@dimen/dimen0dp"
android:elevation="@dimen/dimen0dp"
app:strokeColor="?attr/colorPrimary">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<ImageView
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_email" />
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/dimen16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:gravity="center_vertical"
android:orientation="vertical">
android:layout_marginTop="32dp"
android:orientation="horizontal"
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp">
<TextView
<ImageView
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/userEmail"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_email" />
<TextView
android:id="@+id/userEmail"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.9"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
</LinearLayout>
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:orientation="vertical">
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/userEmail"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen16sp" />
<TextView
android:id="@+id/userEmail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.9"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginTop="@dimen/dimen32dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp">
<ImageView
android:layout_gravity="center"
@ -146,7 +156,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:orientation="vertical">
@ -155,7 +165,7 @@
android:layout_height="wrap_content"
android:text="@string/settingsLanguageSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
<TextView
android:id="@+id/userLang"
@ -163,7 +173,7 @@
android:layout_height="wrap_content"
android:alpha="0.9"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
</LinearLayout>
@ -171,10 +181,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginTop="@dimen/dimen32dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp">
<ImageView
android:layout_gravity="center"
@ -195,7 +205,7 @@
android:layout_height="wrap_content"
android:text="@string/joined"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
<TextView
android:id="@+id/userJoinedOn"
@ -203,14 +213,15 @@
android:layout_height="wrap_content"
android:alpha="0.9"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</ScrollView>
</FrameLayout>
</LinearLayout>

7
app/src/main/res/layout/fragment_profile_emails.xml
View file

@ -13,7 +13,6 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:scrollbars="vertical" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@ -23,18 +22,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
style="@style/Widget.Material3.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
<TextView
android:id="@+id/noDataEmails"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</RelativeLayout>

9
app/src/main/res/layout/fragment_profile_followers_following.xml
View file

@ -12,8 +12,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:layout_height="wrap_content"
android:scrollbars="vertical" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@ -23,6 +22,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
style="@style/Widget.Material3.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
@ -30,11 +31,11 @@
android:id="@+id/noData"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</RelativeLayout>

4
app/src/main/res/layout/fragment_repo_info.xml
View file

@ -388,8 +388,8 @@
<Button
android:id="@+id/repoAdditionalButton"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen54dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"
android:layout_marginBottom="20dp"

55
app/src/main/res/layout/list_profile_emails.xml
View file

@ -1,30 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="16dp"
android:paddingStart="@dimen/dimen12dp"
android:paddingEnd="@dimen/dimen12dp"
android:paddingBottom="@dimen/dimen4dp"
android:paddingTop="@dimen/dimen4dp"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/userEmail"
android:layout_width="wrap_content"
<com.google.android.material.card.MaterialCardView
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/profileEmailTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
app:cardBackgroundColor="?attr/primaryBackgroundColor"
style="?attr/materialCardViewFilledStyle">
<ImageView
android:id="@+id/emailPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="2dp"
android:contentDescription="@string/emailTypeText"
android:paddingStart="20dp"
android:paddingEnd="2dp"
tools:src="@drawable/ic_verified_user" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dimen12dp"
android:orientation="horizontal">
<TextView
android:id="@+id/userEmail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profileEmailTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen16sp" />
<ImageView
android:id="@+id/emailPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="@dimen/dimen2dp"
android:contentDescription="@string/emailTypeText"
android:paddingStart="@dimen/dimen20dp"
android:paddingEnd="@dimen/dimen2dp"
tools:src="@drawable/ic_verified_user" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>

96
app/src/main/res/layout/list_users.xml
View file

@ -4,49 +4,69 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:padding="@dimen/dimen16dp">
android:paddingStart="@dimen/dimen12dp"
android:paddingEnd="@dimen/dimen12dp"
android:paddingBottom="@dimen/dimen4dp"
android:paddingTop="@dimen/dimen4dp">
<com.google.android.material.card.MaterialCardView
android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle"
app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen12dp"
app:cardCornerRadius="@dimen/dimen12dp">
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?attr/primaryBackgroundColor"
style="?attr/materialCardViewFilledStyle">
<ImageView
android:id="@+id/userAvatar"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
android:padding="@dimen/dimen12dp"
android:orientation="horizontal">
<com.google.android.material.card.MaterialCardView
android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle"
app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen12dp"
app:cardCornerRadius="@dimen/dimen12dp">
<ImageView
android:id="@+id/userAvatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/generalImgContentText"
android:src="@drawable/ic_android" />
</com.google.android.material.card.MaterialCardView>
<LinearLayout
android:id="@+id/userInfoSection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/userFullName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/userName"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/userName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/userName"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<LinearLayout
android:id="@+id/userInfoSection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/userFullName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/userName"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/userName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/userName"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/values-v23/themes.xml
View file

@ -10,6 +10,7 @@
<item name="android:textColorSecondary">@color/lightThemeTextColor</item>
<item name="colorPrimary">@color/darkGreen</item>
<item name="colorSecondary">@color/lightThemeTextColor</item>
<item name="colorOnSurfaceVariant">@color/lightThemeTextColor</item>
<item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
<item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
@ -54,6 +55,7 @@
<item name="android:textColorPrimary">@color/retroThemeTextColor</item>
<item name="colorPrimary">@color/retroThemeColorPrimary</item>
<item name="colorSecondary">@color/retroThemeColorSecondary</item>
<item name="colorOnSurfaceVariant">@color/retroThemeTextColor</item>
<item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
<item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>

2
app/src/main/res/values/dimens.xml
View file

@ -34,6 +34,8 @@
<dimen name="dimen140dp">140dp</dimen>
<dimen name="dimen150dp">150dp</dimen>
<dimen name="dimen180dp">180dp</dimen>
<dimen name="dimen200dp">200dp</dimen>
<dimen name="dimen320dp">320dp</dimen>
<dimen name="dimen480dp">480dp</dimen>
<!--SP-->

16
app/src/main/res/values/themes.xml
View file

@ -10,6 +10,7 @@
<item name="android:textColorPrimary">@color/colorWhite</item>
<item name="colorPrimary">@color/darkGreen</item>
<item name="colorSecondary">@color/colorWhite</item>
<item name="colorOnSurfaceVariant">@color/colorWhite</item>
<item name="diffAddedColor">@color/diffAddedColor</item>
<item name="diffRemovedColor">@color/diffRemovedColor</item>
@ -54,6 +55,7 @@
<item name="android:textColorPrimary">@color/lightThemeTextColor</item>
<item name="colorPrimary">@color/darkGreen</item>
<item name="colorSecondary">@color/lightThemeTextColor</item>
<item name="colorOnSurfaceVariant">@color/lightThemeTextColor</item>
<item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
<item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
@ -97,6 +99,7 @@
<item name="android:textColorPrimary">@color/retroThemeTextColor</item>
<item name="colorPrimary">@color/retroThemeColorPrimary</item>
<item name="colorSecondary">@color/retroThemeColorSecondary</item>
<item name="colorOnSurfaceVariant">@color/retroThemeTextColor</item>
<item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
<item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>
@ -140,6 +143,7 @@
<item name="android:textColorPrimary">@color/pitchBlackThemeTextColor</item>
<item name="colorPrimary">@color/darkGreen</item>
<item name="colorSecondary">@color/pitchBlackThemeTextColor</item>
<item name="colorOnSurfaceVariant">@color/pitchBlackThemeTextColor</item>
<item name="diffAddedColor">@color/diffAddedColor</item>
<item name="diffRemovedColor">@color/diffRemovedColor</item>
@ -174,6 +178,18 @@
</style>
<!-- Pitch black theme -->
<style name="CustomMaterCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.card.custom.corners</item>
</style>
<style name="ShapeAppearanceOverlay.card.custom.corners" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeTopRight">@dimen/dimen32dp</item>
<item name="cornerSizeTopLeft">@dimen/dimen32dp</item>
<item name="cornerSizeBottomRight">0dp</item>
<item name="cornerSizeBottomLeft">0dp</item>
</style>
<!-- Material switch style -->
<style name="MaterialSwitch" parent="Widget.Material3.CompoundButton.Switch">
<item name="switchMinWidth">@dimen/dimen32dp</item>