moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页 UI问题

Browse Source
This commit is contained in:
wzq
2023-10-08 17:41:27 +08:00
parent d4e4759994
commit c0ea66522a
18 changed files with 81 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/yizhuan/erban/home/adapter/RoomNewFriendsAdapter.kt
View File

@@ -57,8 +57,8 @@ class RoomNewFriendsAdapter :
tvGenderAge.setGender(item.gender)
//设置星座
val star = StarUtils.getConstellationString(Date(item.birth))
helper.setText(R.id.tv_constellation, star)
val star = StarUtils.getConstellation(Date(item.birth))
helper.setImageResource(R.id.iv_constellation, star)
val tvTalk = helper.getView<TextView>(R.id.tv_talk)

13
app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java
View File

@@ -306,12 +306,6 @@ public class LoginPasswordActivity extends BaseActivity {
}
private void login() {
//发起登录
HashMap<String, Object> map = new HashMap<>(3);
map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE);
map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN);
ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map);
getDialogManager().showProgressDialog(this, getString(R.string.login_is_logining));
AuthModel.get().login(
"",
@@ -344,6 +338,13 @@ public class LoginPasswordActivity extends BaseActivity {
dealWithLoginError(e);
}
});
//发起登录
HashMap<String, Object> map = new HashMap<>(3);
map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE);
map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN);
ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map);
}
/**

4
app/src/main/java/com/yizhuan/erban/ui/user/adapter/MainIndicatorAdapter.java
View File

@@ -3,6 +3,7 @@ package com.yizhuan.erban.ui.user.adapter;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.LinearGradient;
import android.util.TypedValue;
import android.widget.TextView;
import androidx.core.content.ContextCompat;
@@ -44,7 +45,7 @@ public class MainIndicatorAdapter extends CommonNavigatorAdapter {
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_767585));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_1F1A4E));
scaleTransitionPagerTitleView.setMinScale(minScale);
scaleTransitionPagerTitleView.setTextSize(textSize);
scaleTransitionPagerTitleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources().getDimensionPixelSize(R.dimen.sp_16));
int padding = UIUtil.dip2px(context, 12);
scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0);
scaleTransitionPagerTitleView.setText(mTitleList.get(i));
@@ -114,6 +115,7 @@ public class MainIndicatorAdapter extends CommonNavigatorAdapter {
indicator.setLineHeight(context.getResources().getDimensionPixelOffset(R.dimen.dp_8));
indicator.setLineWidth(context.getResources().getDimensionPixelOffset(R.dimen.dp_35));
indicator.setRoundRadius(context.getResources().getDimensionPixelOffset(R.dimen.dp_5));
indicator.setYOffset(context.getResources().getDimensionPixelOffset(R.dimen.dp_4));
return indicator;
}

BIN
app/src/main/res/drawable-xhdpi/bg_home_top.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_masking_party.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

14
app/src/main/res/drawable/bg_mask_home_item.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="90"
android:endColor="@color/transparent"
android:startColor="@color/black_transparent_40" />
<corners
android:radius="@dimen/dp_16"
android:topLeftRadius="@dimen/dp_0"
android:topRightRadius="@dimen/dp_0" />
</shape>

15
app/src/main/res/drawable/bg_masking_party.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:radius="@dimen/dp_30"
android:topLeftRadius="@dimen/dp_0"
android:topRightRadius="@dimen/dp_0" />
<gradient
android:angle="90"
android:centerColor="@color/color_A974FF"
android:endColor="@color/transparent"
android:startColor="@color/color_C2A66FFF" />
</shape>

3
app/src/main/res/drawable/shape_home_online.xml
View File

@@ -2,7 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke
android:width="2dp"
android:width="@dimen/dp_1"
android:color="@color/white" />
<solid android:color="#ff6ce19a" />
</shape>

7
app/src/main/res/layout/fragment_home.xml
View File

@@ -8,7 +8,7 @@
<View
android:layout_width="match_parent"
android:layout_height="336dp"
android:layout_height="@dimen/dp_300"
android:background="@drawable/bg_home_top" />
<LinearLayout
@@ -125,14 +125,15 @@
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_height="@dimen/dp_22"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_12" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_8" />
</LinearLayout>

1
app/src/main/res/layout/fragment_recommend.xml
View File

@@ -21,7 +21,6 @@
android:id="@+id/mRecyclerRoom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:overScrollMode="never"

34
app/src/main/res/layout/item_room_new_friends.xml
View File

@@ -38,11 +38,11 @@
app:layout_constraintStart_toStartOf="@+id/view_aperture"
app:layout_constraintTop_toTopOf="@+id/view_aperture" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_mask_party"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/bg_masking_party"
<View
android:id="@+id/v_mask_party"
android:layout_width="0dp"
android:layout_height="@dimen/dp_30"
android:background="@drawable/bg_masking_party"
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
app:layout_constraintEnd_toEndOf="@+id/iv_avatar"
app:layout_constraintStart_toStartOf="@+id/iv_avatar" />
@@ -53,16 +53,16 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_2"
android:src="@drawable/iv_party"
app:layout_constraintBottom_toBottomOf="@+id/iv_mask_party"
app:layout_constraintEnd_toEndOf="@+id/iv_mask_party"
app:layout_constraintStart_toStartOf="@+id/iv_mask_party" />
app:layout_constraintBottom_toBottomOf="@+id/v_mask_party"
app:layout_constraintEnd_toEndOf="@+id/v_mask_party"
app:layout_constraintStart_toStartOf="@+id/v_mask_party" />
<androidx.constraintlayout.widget.Group
android:id="@+id/group_party"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
app:constraint_referenced_ids="iv_mask_party,iv_party,view_aperture"
app:constraint_referenced_ids="v_mask_party,iv_party,view_aperture"
tools:visibility="visible" />
<View
@@ -126,8 +126,8 @@
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_constellation"
<ImageView
android:id="@+id/iv_constellation"
android:layout_width="@dimen/dp_46"
android:layout_height="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_4"
@@ -148,15 +148,15 @@
android:layout_marginEnd="@dimen/dp_24"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_constellation"
app:layout_constraintBottom_toBottomOf="@id/iv_constellation"
app:layout_constraintEnd_toStartOf="@+id/tv_talk"
app:layout_constraintStart_toEndOf="@id/tv_constellation"
app:layout_constraintTop_toTopOf="@id/tv_constellation" />
app:layout_constraintStart_toEndOf="@id/iv_constellation"
app:layout_constraintTop_toTopOf="@id/iv_constellation" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_26"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/dp_24"
@@ -172,7 +172,7 @@
android:textSize="@dimen/sp_10"
app:layout_constraintEnd_toStartOf="@id/tv_talk"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toBottomOf="@id/tv_constellation" />
app:layout_constraintTop_toBottomOf="@id/iv_constellation" />
<LinearLayout
android:id="@+id/llAudio"
@@ -187,7 +187,7 @@
android:paddingEnd="@dimen/dp_12"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toBottomOf="@id/tv_constellation"
app:layout_constraintTop_toBottomOf="@id/iv_constellation"
tools:visibility="visible">
<ImageView

13
app/src/main/res/layout/item_room_recommend.xml
View File

@@ -14,20 +14,27 @@
android:id="@+id/iv_room_image"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_2"
android:layout_margin="@dimen/dp_1"
android:src="@drawable/default_cover"
app:borderRadius="@dimen/dp_14"
app:borderRadius="@dimen/dp_16"
app:layout_constraintDimensionRatio="170:174"
app:layout_constraintEnd_toEndOf="@+id/iv_top_list"
app:layout_constraintStart_toStartOf="@+id/iv_top_list"
app:layout_constraintTop_toTopOf="@+id/iv_top_list"
app:type="round" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_66"
android:layout_margin="@dimen/dp_1"
android:background="@drawable/bg_mask_home_item"
app:layout_constraintBottom_toBottomOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_top_list"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:background="@drawable/bg_recommend_weekly_list"
android:background="@drawable/bg_recommend_hour_list"
android:visibility="invisible"
app:layout_constraintDimensionRatio="174:178"
app:layout_constraintEnd_toEndOf="parent"

8
app/src/main/res/layout/item_user_info_label.xml
View File

@@ -2,14 +2,14 @@
<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tv_user_tag"
android:textColor="@color/color_selector_user_info_label"
android:textSize="@dimen/sp_10"
android:layout_marginEnd="@dimen/dp_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_5"
android:background="@drawable/selector_user_info_label"
android:paddingStart="@dimen/dp_6"
android:paddingTop="@dimen/dp_2"
android:paddingEnd="@dimen/dp_6"
android:paddingBottom="@dimen/dp_2"
android:background="@drawable/selector_user_info_label"
android:textColor="@color/color_selector_user_info_label"
android:textSize="@dimen/sp_10"
tools:text="上班族" />

4
app/src/main/res/values/colors.xml
View File

@@ -624,6 +624,7 @@
<color name="color_13E2F5">#13E2F5</color>
<color name="color_CC66FF">#CC66FF</color>
<color name="color_9168FA">#9168FA</color>
<color name="color_339168FA">#339168FA</color>
<color name="color_0D344D">#0D344D</color>
<color name="color_75FBE2">#75FBE2</color>
<color name="color_A8041D">#A8041D</color>
@@ -689,7 +690,6 @@
<color name="color_8651E0">#8651E0</color>
<color name="color_7748C7">#7748C7</color>
<color name="color_a974ff">#A974FF</color>
<color name="color_339168FA">#339168FA</color>
<color name="color_ff80cc">#ff80cc</color>
<color name="color_6bb3ff">#6bb3ff</color>
<color name="color_7147E6">#7147E6</color>
@@ -697,5 +697,7 @@
<color name="color_A3A0AD">#A3A0AD</color>
<color name="color_5CF1FF">#5CF1FF</color>
<color name="color_CF70FF">#CF70FF</color>
<color name="color_A974FF">#A974FF</color>
<color name="color_C2A66FFF">#C2A66FFF</color>
</resources>