格式化

This commit is contained in:
BA7LZD 2020-06-07 23:02:33 +08:00
parent c3df1e1d75
commit 14e89027bf
71 changed files with 245 additions and 265 deletions

View File

@ -2,13 +2,13 @@ package com.yuxihan.sdu;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import static org.junit.Assert.assertEquals;
/**
* Instrumented test, which will execute on an Android device.

View File

@ -2,13 +2,13 @@ package com.yuxihan.sdu;
import android.os.Bundle;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.yuxihan.sdu.comm.BaseActivity;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.navigation.ui.NavigationUI;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.yuxihan.sdu.comm.BaseActivity;
public class MainActivity extends BaseActivity {
@Override

View File

@ -4,12 +4,12 @@ import android.annotation.SuppressLint;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.gyf.immersionbar.ImmersionBar;
import com.yuxihan.sdu.R;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
public class BaseActivity extends AppCompatActivity {
@SuppressLint("SourceLockedOrientationActivity")
@Override

View File

@ -7,11 +7,6 @@ import android.graphics.drawable.Drawable;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.BitmapImageViewTarget;
@ -24,6 +19,11 @@ import com.luck.picture.lib.widget.longimage.ImageViewState;
import com.luck.picture.lib.widget.longimage.SubsamplingScaleImageView;
import com.yuxihan.sdu.R;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
/**
* @describeGlide加载引擎
*/

View File

@ -13,8 +13,8 @@ public class URIUtils {
public static Uri getImageContentUri(Context context, String path) {
Cursor cursor =
context.getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
new String[]{MediaStore.Images.Media._ID}, MediaStore.Images.Media.DATA + "=? ",
new String[]{path}, null);
new String[]{MediaStore.Images.Media._ID}, MediaStore.Images.Media.DATA + "=? ",
new String[]{path}, null);
if (cursor != null && cursor.moveToFirst()) {
int id = cursor.getInt(cursor.getColumnIndex(MediaStore.MediaColumns._ID));
Uri baseUri = Uri.parse("content://media/external/images/media");

View File

@ -6,7 +6,6 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;

View File

@ -20,11 +20,11 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.yuxihan.sdu.R;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatDialog;
import com.yuxihan.sdu.R;
public class InputTextMsgDialog extends AppCompatDialog {
private Context mContext;
private InputMethodManager imm;

View File

@ -3,27 +3,27 @@ package com.yuxihan.sdu.comm.widget;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.ScrollView;
/**
* 自定义ScrollView
*/
public class MyScrollView extends ScrollView {
private OnScrollListener mOnScrollListener;
public MyScrollView(Context context) {
super(context);
}
public MyScrollView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public MyScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
/**
* 监听ScroView的滑动情况
*
@ -39,8 +39,8 @@ public class MyScrollView extends ScrollView {
mOnScrollListener.onScroll(t);
}
}
/**
* 设置滚动接口
*
@ -49,7 +49,7 @@ public class MyScrollView extends ScrollView {
public void setOnScrollListener(OnScrollListener listener) {
this.mOnScrollListener = listener;
}
/**
* 滚动的回调接口
*/
@ -60,6 +60,6 @@ public class MyScrollView extends ScrollView {
* @param scrollY
*/
void onScroll(int scrollY);
}
}

View File

@ -2,7 +2,6 @@ package com.yuxihan.sdu.comm.widget.selector;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
@ -78,7 +77,7 @@ public abstract class Selector extends FrameLayout implements View.OnClickListen
return this;
}
public String getGroupTag(){
public String getGroupTag() {
return groupTag;
}

View File

@ -22,7 +22,7 @@ public class PostDetailBean implements Serializable {
public PostDetailBean(String postId, String userName, String userHead, String userId,
long postTime, String postTextContent, String postVideoUrl,
ArrayList<String> postPicUrls, int postLikeCount,
boolean isLikedByCurAccount,int commentCount) {
boolean isLikedByCurAccount, int commentCount) {
this.postId = postId;
this.userName = userName;
this.userHead = userHead;

View File

@ -8,7 +8,7 @@ public class RegParams extends BaseRequestParams {
private String password;
private String verificationCode;
public RegParams(String userName, String password,String verificationCode) {
public RegParams(String userName, String password, String verificationCode) {
super.setUserName(userName);
this.password = password;
this.verificationCode = verificationCode;

View File

@ -5,8 +5,6 @@ import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import androidx.appcompat.app.AppCompatActivity;
import com.bumptech.glide.Glide;
import com.shuyu.gsyvideoplayer.GSYVideoManager;
import com.shuyu.gsyvideoplayer.utils.OrientationUtils;
@ -14,6 +12,8 @@ import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.Urls;
import androidx.appcompat.app.AppCompatActivity;
public class SimplePlayer extends AppCompatActivity {

View File

@ -7,11 +7,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.lzy.ninegrid.ImageInfo;
import com.lzy.ninegrid.NineGridView;
@ -33,6 +28,11 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.Date;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* 帖子详情页
*/

View File

@ -3,9 +3,6 @@ package com.yuxihan.sdu.post;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.data.Result;
@ -13,6 +10,8 @@ import com.yuxihan.sdu.data.UpdateService;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -7,9 +7,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.util.CommViewHolder;
@ -18,6 +15,9 @@ import com.yuxihan.sdu.post.CommentListModel;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
public class CommentListAdapter extends RecyclerView.Adapter {
private CommentListModel commentListModel;

View File

@ -10,11 +10,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.bumptech.glide.Glide;
import com.luck.picture.lib.tools.ToastUtils;
import com.yuxihan.sdu.R;
@ -35,6 +30,9 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import androidx.annotation.NonNull;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import de.hdodenhof.circleimageview.CircleImageView;
public class AccountFragment extends BaseFragment implements View.OnClickListener {
@ -171,7 +169,7 @@ public class AccountFragment extends BaseFragment implements View.OnClickListene
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(ExitHomeEvent event) {
accountViewModel.deleteFamily(event.getFamilyBean().getFamilyId()+"");
accountViewModel.deleteFamily(event.getFamilyBean().getFamilyId() + "");
}
@Override

View File

@ -3,10 +3,6 @@ package com.yuxihan.sdu.ui.account;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.comm.network.BaseRequestParams;
@ -16,6 +12,9 @@ import com.yuxihan.sdu.ui.account.home.RefreshHomeListEvent;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -4,7 +4,6 @@ import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.opengl.Visibility;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;

View File

@ -1,13 +1,12 @@
package com.yuxihan.sdu.ui.account.adapter;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ListAdapter;
import com.yuxihan.sdu.data.model.PostDetailBean;
import com.yuxihan.sdu.ui.account.HomeBean;
import java.util.List;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ListAdapter;
/**
* 介绍核心类 用来判断 新旧Item是否相等
* 作者zhangxutong

View File

@ -1,7 +1,5 @@
package com.yuxihan.sdu.ui.account.home;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
@ -23,7 +21,7 @@ public class CreateHomeActivity extends BaseActivity implements View.OnClickList
@Override
public void onClick(View v) {
switch (v.getId()){
switch (v.getId()) {
case R.id.iv_back:
finish();
break;

View File

@ -8,9 +8,6 @@ import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
import androidx.lifecycle.ViewModelProvider;
import com.google.android.exoplayer2.C;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.BaseActivity;
@ -18,6 +15,8 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import androidx.lifecycle.ViewModelProvider;
public class InputCodeActivity extends BaseActivity implements View.OnClickListener {
EditText et_input_code;
TextView btn_submit;

View File

@ -2,8 +2,6 @@ package com.yuxihan.sdu.ui.account.home;
import android.widget.Toast;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.data.Result;
@ -11,6 +9,7 @@ import com.yuxihan.sdu.data.UpdateService;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -8,8 +8,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.lifecycle.ViewModelProvider;
import com.blankj.utilcode.util.TimeUtils;
import com.bumptech.glide.Glide;
import com.luck.picture.lib.PictureSelector;
@ -36,6 +34,8 @@ import java.io.File;
import java.util.Calendar;
import java.util.List;
import androidx.lifecycle.ViewModelProvider;
public class AddBabyActivity extends BaseActivity implements View.OnClickListener,
DatePickerDialog.OnDateSetListener {

View File

@ -3,9 +3,6 @@ package com.yuxihan.sdu.ui.baby;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.tencent.cos.xml.exception.CosXmlClientException;
import com.tencent.cos.xml.exception.CosXmlServiceException;
import com.tencent.cos.xml.listener.CosXmlProgressListener;
@ -24,6 +21,8 @@ import com.yuxihan.sdu.ui.info.UpdateUserHeadState;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -4,12 +4,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.BaseActivity;
import com.yuxihan.sdu.ui.baby.adapter.BabyListAdapter;
@ -19,6 +13,12 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
public class BabyListActivity extends BaseActivity implements View.OnClickListener {
BabyListViewModel babyListViewModel;
RecyclerView rv_baby_list;
@ -76,6 +76,7 @@ public class BabyListActivity extends BaseActivity implements View.OnClickListen
public void onMessageEvent(AddBabySuccessEvent event) {
babyListViewModel.getBabyList();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(RefreshListEvent event) {
babyListViewModel.getBabyList();

View File

@ -2,9 +2,6 @@ package com.yuxihan.sdu.ui.baby;
import android.widget.Toast;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.comm.network.BaseRequestParams;
@ -14,6 +11,8 @@ import com.yuxihan.sdu.ui.baby.model.BabyInfoModel;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -4,8 +4,6 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import com.yuxihan.sdu.ui.login.LoginViewModel;
/**
* ViewModel provider factory to instantiate LoginViewModel.
* Required given LoginViewModel has a non-empty constructor

View File

@ -7,9 +7,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.util.CommViewHolder;
@ -20,6 +17,9 @@ import com.yuxihan.sdu.ui.home.adapter.HomeListAdapter;
import org.greenrobot.eventbus.EventBus;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
public class BabyListAdapter extends RecyclerView.Adapter {
private BabyInfoModel babyInfoModel;
private Context mContext;

View File

@ -7,9 +7,6 @@ import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.blankj.utilcode.util.TimeUtils;
import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
import com.yuxihan.sdu.R;
@ -27,6 +24,9 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
public class AddNewRecordActivity extends BaseActivity implements View.OnClickListener,
DatePickerDialog.OnDateSetListener {

View File

@ -2,9 +2,6 @@ package com.yuxihan.sdu.ui.grow;
import android.widget.Toast;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.data.Result;
@ -13,6 +10,8 @@ import com.yuxihan.sdu.ui.baby.model.BabyInfoModel;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -7,13 +7,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
import com.yuxihan.sdu.R;
@ -21,6 +14,13 @@ import com.yuxihan.sdu.comm.BaseFragment;
import com.yuxihan.sdu.ui.grow.adapter.GrowRecordListAdapter;
import com.yuxihan.sdu.ui.grow.model.BabyGrowModel;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
public class GrowFragment extends BaseFragment implements View.OnClickListener {
private GrowViewModel growViewModel;

View File

@ -2,15 +2,14 @@ package com.yuxihan.sdu.ui.grow;
import android.widget.Toast;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.data.Result;
import com.yuxihan.sdu.data.UpdateService;
import com.yuxihan.sdu.ui.grow.model.BabyGrowModel;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -7,9 +7,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.util.CommViewHolder;
@ -17,6 +14,9 @@ import com.yuxihan.sdu.ui.grow.model.BabyGrowModel;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
public class GrowRecordListAdapter extends RecyclerView.Adapter {
private BabyGrowModel postModel;

View File

@ -8,12 +8,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
import com.yuxihan.sdu.R;
@ -26,6 +20,12 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import androidx.annotation.NonNull;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
public class HomeFragment extends BaseFragment implements View.OnClickListener {
private HomeViewModel homeViewModel;

View File

@ -3,15 +3,14 @@ package com.yuxihan.sdu.ui.home;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.comm.network.BaseRequestParams;
import com.yuxihan.sdu.data.Result;
import com.yuxihan.sdu.data.UpdateService;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -14,14 +14,6 @@ import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.TimeUtils;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.broadcast.BroadcastAction;
@ -57,6 +49,14 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
public class NewPostActivity extends BaseActivity implements View.OnClickListener,
DatePickerDialog.OnDateSetListener {
private GridImageAdapter mAdapter;

View File

@ -3,8 +3,6 @@ package com.yuxihan.sdu.ui.home;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.data.Result;
@ -12,6 +10,7 @@ import com.yuxihan.sdu.data.UpdateService;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -10,8 +10,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.luck.picture.lib.config.PictureMimeType;
@ -24,6 +22,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.RecyclerView;
public class GridImageAdapter extends
RecyclerView.Adapter<GridImageAdapter.ViewHolder> {

View File

@ -10,9 +10,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.lzy.ninegrid.ImageInfo;
import com.lzy.ninegrid.NineGridView;
@ -25,9 +22,11 @@ import com.yuxihan.sdu.post.PostDetailActivity;
import com.yuxihan.sdu.ui.home.PostModel;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
public class HomeListAdapter extends RecyclerView.Adapter {
private PostModel mDataSet;

View File

@ -8,9 +8,6 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.bumptech.glide.Glide;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
@ -29,6 +26,8 @@ import com.yuxihan.sdu.comm.widget.CommonDialog;
import java.io.File;
import java.util.List;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import de.hdodenhof.circleimageview.CircleImageView;
public class InfoEditActivity extends BaseActivity implements View.OnClickListener {

View File

@ -3,9 +3,6 @@ package com.yuxihan.sdu.ui.info;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.tencent.cos.xml.exception.CosXmlClientException;
import com.tencent.cos.xml.exception.CosXmlServiceException;
import com.tencent.cos.xml.listener.CosXmlProgressListener;
@ -23,6 +20,8 @@ import com.yuxihan.sdu.data.model.DataBean;
import com.yuxihan.sdu.data.model.UpdateNicknameParams;
import com.yuxihan.sdu.data.model.UpdateUserHeadParams;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -16,19 +16,18 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.gyf.immersionbar.ImmersionBar;
import com.yuxihan.sdu.MainActivity;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.BaseActivity;
import com.yuxihan.sdu.data.model.LoggedInUser;
import com.yuxihan.sdu.ui.info.InfoEditViewModelFactory;
import com.yuxihan.sdu.ui.reg.RegActivity;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
public class LoginActivity extends BaseActivity {
private LoginViewModel loginViewModel;

View File

@ -3,10 +3,6 @@ package com.yuxihan.sdu.ui.login;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.comm.util.AccountUtils;
@ -16,6 +12,9 @@ import com.yuxihan.sdu.data.model.DataBean;
import com.yuxihan.sdu.data.model.LoggedInUser;
import com.yuxihan.sdu.data.model.LoginParams;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -16,11 +16,6 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.gyf.immersionbar.ImmersionBar;
import com.yuxihan.sdu.R;
import com.yuxihan.sdu.comm.BaseActivity;
@ -29,6 +24,11 @@ import com.yuxihan.sdu.data.model.LoggedInUser;
import com.yuxihan.sdu.data.model.SendSMSResult;
import com.yuxihan.sdu.ui.login.LoginActivity;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
public class RegActivity extends BaseActivity {
private RegViewModel regViewModel;
@ -69,7 +69,7 @@ public class RegActivity extends BaseActivity {
regViewModel.getSendSMSResult().observe(this, new Observer<SendSMSResult>() {
@Override
public void onChanged(SendSMSResult sendSMSResult) {
if (sendSMSResult.isSendSuccess()){
if (sendSMSResult.isSendSuccess()) {
loadingProgressBar.setVisibility(View.GONE);
Toast.makeText(SDUApp.getAppContext(), "验证码发送成功", Toast.LENGTH_SHORT).show();
btGetVerification.setText("验证码已发送");

View File

@ -47,6 +47,7 @@ class RegFormState {
public void setPhoneNumberValid(boolean phoneNumberValid) {
isPhoneNumberValid = phoneNumberValid;
}
public void setVerificationCodeValid(boolean isVerificationCodeValid) {
this.isVerificationCodeValid = isVerificationCodeValid;
}

View File

@ -4,10 +4,6 @@ import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.yuxihan.sdu.comm.Const;
import com.yuxihan.sdu.comm.SDUApp;
import com.yuxihan.sdu.comm.util.FormatUtils;
@ -18,6 +14,9 @@ import com.yuxihan.sdu.data.model.RegParams;
import com.yuxihan.sdu.data.model.SMSParams;
import com.yuxihan.sdu.data.model.SendSMSResult;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/actionsheet_bottom_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/actionsheet_bottom_normal"/>
<item android:drawable="@drawable/actionsheet_bottom_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/actionsheet_bottom_normal" />
</selector>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/actionsheet_middle_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/actionsheet_middle_normal"/>
<item android:drawable="@drawable/actionsheet_middle_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/actionsheet_middle_normal" />
</selector>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/actionsheet_single_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/actionsheet_single_normal"/>
<item android:drawable="@drawable/actionsheet_single_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/actionsheet_single_normal" />
</selector>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/actionsheet_top_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/actionsheet_top_normal"/>
<item android:drawable="@drawable/actionsheet_top_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/actionsheet_top_normal" />
</selector>

View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle" >
<shape android:shape="rectangle">
<gradient
android:endColor="#000000"
android:startColor="#000000" />
</shape>
</item>
<item android:bottom="2dp">
<shape android:shape="rectangle" >
<shape android:shape="rectangle">
<gradient
android:endColor="#eeeeee"
android:startColor="#eeeeee" />

View File

@ -3,7 +3,7 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M610.5,576.9c3,-13.7 -3.9,-27.3 -16,-33.3 29.8,-11.4 57.1,-29.1 80.4,-52.3 43.5,-43.5 67.5,-101.4 67.5,-162.9s-24,-119.4 -67.5,-162.9S573.5,98 512,98s-119.4,24 -162.9,67.5 -67.5,101.4 -67.5,162.9 24,119.4 67.5,162.9c22.9,22.9 49.8,40.4 79,51.8 -12.9,3.2 -25.6,7 -38.1,11.7 -37.7,13.9 -72.5,34.1 -103.5,59.9 -62.3,52 -105,124.2 -120.3,203.5 -3.1,16.3 7.5,32 23.8,35.1 1.9,0.4 3.8,0.5 5.7,0.5 14.1,0 26.7,-10 29.4,-24.3C251.6,692.4 372.2,593 512,593c21.2,0 42.3,2.3 62.8,6.8 16.2,3.5 32.1,-6.8 35.7,-22.9zM341.6,328.4C341.6,234.5 418,158 512,158s170.4,76.4 170.4,170.4S605.9,498.7 512,498.7s-170.4,-76.4 -170.4,-170.3zM907.3,736.9c-11,-7.5 -17.6,-20 -17.6,-33.3 0,-13.2 6.5,-25.6 17.3,-33.1l12.6,-8.8 -5.2,-14.4c-7,-19.6 -17.5,-37.6 -31.2,-53.4l-9.9,-11.4 -13.7,6.4c-5.4,2.5 -11.1,3.8 -17,3.8 -21,0 -38.3,-15.7 -40.2,-36.6L801,541l-14.9,-2.8c-20.3,-3.8 -41.5,-3.8 -61.8,0l-14.9,2.8 -1.4,15.1c-1.9,20.9 -19.2,36.6 -40.2,36.6 -5.9,0 -11.7,-1.3 -17,-3.8l-13.7,-6.4 -9.9,11.4c-13.7,15.8 -24.1,33.8 -31.2,53.4l-5.2,14.4 12.6,8.8c10.9,7.6 17.3,20 17.3,33.1 0,13.3 -6.6,25.8 -17.6,33.3l-12.6,8.6 5,14.5c6.8,19.6 17.1,37.6 30.6,53.5l10,11.8 14,-6.8c5.5,-2.7 11.4,-4 17.6,-4 21.2,0 38.9,16.5 40.3,37.6l1,15.5 15.3,2.8c10.1,1.9 20.5,2.8 30.8,2.8s20.7,-0.9 30.8,-2.8l15.3,-2.8 1,-15.5c1.4,-21.1 19.1,-37.6 40.3,-37.6 6.2,0 12.1,1.4 17.6,4l14,6.8 10,-11.8c13.5,-15.9 23.8,-33.9 30.6,-53.5l5,-14.5 -12.4,-8.6zM862,776.9c-6.3,-1.5 -12.7,-2.3 -19.3,-2.3 -36.4,0 -67.7,24.6 -77.3,58.4 -6.7,0.5 -13.5,0.5 -20.2,0 -9.6,-33.8 -40.9,-58.4 -77.3,-58.4 -6.6,0 -13,0.8 -19.3,2.3 -3.8,-5.6 -7.2,-11.5 -10.1,-17.6 14.2,-14.8 22.4,-34.7 22.4,-55.6 0,-20.7 -8,-40.4 -21.9,-55.1 3,-6.3 6.5,-12.3 10.5,-18 6,1.4 12.2,2.1 18.4,2.1 20.2,0 39.5,-7.5 54.3,-21.1 10.7,-9.8 18.4,-22.1 22.5,-35.7 7,-0.6 14,-0.6 21,0 4.2,13.6 11.9,25.9 22.5,35.7 14.9,13.6 34.1,21.1 54.3,21.1 6.3,0 12.4,-0.7 18.4,-2.1 4,5.7 7.5,11.7 10.5,18 -13.9,14.8 -21.9,34.5 -21.9,55.1 0,21 8.2,40.8 22.4,55.6 -2.7,6.1 -6.1,12 -9.9,17.6zM755.3,633.2c-39.2,0 -71.2,31.9 -71.2,71.2 0,39.2 31.9,71.2 71.2,71.2s71.2,-31.9 71.2,-71.2c0,-39.3 -32,-71.2 -71.2,-71.2zM755.3,735.5c-17.2,0 -31.2,-14 -31.2,-31.2s14,-31.2 31.2,-31.2 31.2,14 31.2,31.2 -14,31.2 -31.2,31.2z"/>
<path
android:fillColor="#FF000000"
android:pathData="M610.5,576.9c3,-13.7 -3.9,-27.3 -16,-33.3 29.8,-11.4 57.1,-29.1 80.4,-52.3 43.5,-43.5 67.5,-101.4 67.5,-162.9s-24,-119.4 -67.5,-162.9S573.5,98 512,98s-119.4,24 -162.9,67.5 -67.5,101.4 -67.5,162.9 24,119.4 67.5,162.9c22.9,22.9 49.8,40.4 79,51.8 -12.9,3.2 -25.6,7 -38.1,11.7 -37.7,13.9 -72.5,34.1 -103.5,59.9 -62.3,52 -105,124.2 -120.3,203.5 -3.1,16.3 7.5,32 23.8,35.1 1.9,0.4 3.8,0.5 5.7,0.5 14.1,0 26.7,-10 29.4,-24.3C251.6,692.4 372.2,593 512,593c21.2,0 42.3,2.3 62.8,6.8 16.2,3.5 32.1,-6.8 35.7,-22.9zM341.6,328.4C341.6,234.5 418,158 512,158s170.4,76.4 170.4,170.4S605.9,498.7 512,498.7s-170.4,-76.4 -170.4,-170.3zM907.3,736.9c-11,-7.5 -17.6,-20 -17.6,-33.3 0,-13.2 6.5,-25.6 17.3,-33.1l12.6,-8.8 -5.2,-14.4c-7,-19.6 -17.5,-37.6 -31.2,-53.4l-9.9,-11.4 -13.7,6.4c-5.4,2.5 -11.1,3.8 -17,3.8 -21,0 -38.3,-15.7 -40.2,-36.6L801,541l-14.9,-2.8c-20.3,-3.8 -41.5,-3.8 -61.8,0l-14.9,2.8 -1.4,15.1c-1.9,20.9 -19.2,36.6 -40.2,36.6 -5.9,0 -11.7,-1.3 -17,-3.8l-13.7,-6.4 -9.9,11.4c-13.7,15.8 -24.1,33.8 -31.2,53.4l-5.2,14.4 12.6,8.8c10.9,7.6 17.3,20 17.3,33.1 0,13.3 -6.6,25.8 -17.6,33.3l-12.6,8.6 5,14.5c6.8,19.6 17.1,37.6 30.6,53.5l10,11.8 14,-6.8c5.5,-2.7 11.4,-4 17.6,-4 21.2,0 38.9,16.5 40.3,37.6l1,15.5 15.3,2.8c10.1,1.9 20.5,2.8 30.8,2.8s20.7,-0.9 30.8,-2.8l15.3,-2.8 1,-15.5c1.4,-21.1 19.1,-37.6 40.3,-37.6 6.2,0 12.1,1.4 17.6,4l14,6.8 10,-11.8c13.5,-15.9 23.8,-33.9 30.6,-53.5l5,-14.5 -12.4,-8.6zM862,776.9c-6.3,-1.5 -12.7,-2.3 -19.3,-2.3 -36.4,0 -67.7,24.6 -77.3,58.4 -6.7,0.5 -13.5,0.5 -20.2,0 -9.6,-33.8 -40.9,-58.4 -77.3,-58.4 -6.6,0 -13,0.8 -19.3,2.3 -3.8,-5.6 -7.2,-11.5 -10.1,-17.6 14.2,-14.8 22.4,-34.7 22.4,-55.6 0,-20.7 -8,-40.4 -21.9,-55.1 3,-6.3 6.5,-12.3 10.5,-18 6,1.4 12.2,2.1 18.4,2.1 20.2,0 39.5,-7.5 54.3,-21.1 10.7,-9.8 18.4,-22.1 22.5,-35.7 7,-0.6 14,-0.6 21,0 4.2,13.6 11.9,25.9 22.5,35.7 14.9,13.6 34.1,21.1 54.3,21.1 6.3,0 12.4,-0.7 18.4,-2.1 4,5.7 7.5,11.7 10.5,18 -13.9,14.8 -21.9,34.5 -21.9,55.1 0,21 8.2,40.8 22.4,55.6 -2.7,6.1 -6.1,12 -9.9,17.6zM755.3,633.2c-39.2,0 -71.2,31.9 -71.2,71.2 0,39.2 31.9,71.2 71.2,71.2s71.2,-31.9 71.2,-71.2c0,-39.3 -32,-71.2 -71.2,-71.2zM755.3,735.5c-17.2,0 -31.2,-14 -31.2,-31.2s14,-31.2 31.2,-31.2 31.2,14 31.2,31.2 -14,31.2 -31.2,31.2z" />
</vector>

View File

@ -3,7 +3,7 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#C6C7CB"
android:pathData="M902.53,567.69l-335.82,0 0,335.82c0,30.91 -25.06,55.96 -55.97,55.96 -30.91,0 -55.97,-25.06 -55.97,-55.96l0,-335.82 -335.82,0c-30.91,0 -55.97,-25.06 -55.97,-55.98 0,-30.91 25.06,-55.96 55.97,-55.96l335.82,0 0,-335.82c0,-30.91 25.06,-55.97 55.97,-55.97 30.91,0 55.97,25.06 55.97,55.97l0,335.82 335.82,0c30.91,0 55.97,25.05 55.97,55.96C958.5,542.63 933.45,567.69 902.53,567.69z"/>
<path
android:fillColor="#C6C7CB"
android:pathData="M902.53,567.69l-335.82,0 0,335.82c0,30.91 -25.06,55.96 -55.97,55.96 -30.91,0 -55.97,-25.06 -55.97,-55.96l0,-335.82 -335.82,0c-30.91,0 -55.97,-25.06 -55.97,-55.98 0,-30.91 25.06,-55.96 55.97,-55.96l335.82,0 0,-335.82c0,-30.91 25.06,-55.97 55.97,-55.97 30.91,0 55.97,25.06 55.97,55.97l0,335.82 335.82,0c30.91,0 55.97,25.05 55.97,55.96C958.5,542.63 933.45,567.69 902.53,567.69z" />
</vector>

View File

@ -3,7 +3,7 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF888888"
android:pathData="M364.47,511.68l378.21,378.21c15.9,15.88 15.9,41.67 0,57.55 -15.88,15.9 -41.67,15.9 -57.55,0l-406.99,-406.99c-15.9,-15.88 -15.9,-41.67 0,-57.55l406.99,-406.99c7.94,-7.95 18.36,-11.92 28.77,-11.92s20.83,3.98 28.77,11.92c15.9,15.88 15.9,41.67 0,57.55l-378.21,378.21z"/>
<path
android:fillColor="#FF888888"
android:pathData="M364.47,511.68l378.21,378.21c15.9,15.88 15.9,41.67 0,57.55 -15.88,15.9 -41.67,15.9 -57.55,0l-406.99,-406.99c-15.9,-15.88 -15.9,-41.67 0,-57.55l406.99,-406.99c7.94,-7.95 18.36,-11.92 28.77,-11.92s20.83,3.98 28.77,11.92c15.9,15.88 15.9,41.67 0,57.55l-378.21,378.21z" />
</vector>

View File

@ -3,7 +3,7 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF888888"
android:pathData="M273.88,9.48 L775.43,502.52 273.88,995.56 219.47,942.08 666.62,502.52 219.47,62.96 273.88,9.48Z"/>
<path
android:fillColor="#FF888888"
android:pathData="M273.88,9.48 L775.43,502.52 273.88,995.56 219.47,942.08 666.62,502.52 219.47,62.96 273.88,9.48Z" />
</vector>

View File

@ -3,16 +3,16 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M850.88,96.42l-676.3,0c-60.68,0 -110.05,49.37 -110.05,110.05l0,446.2c0,60.68 49.37,110.05 110.05,110.05l90.31,0L396.94,931.13c3.79,4.84 9.6,7.66 15.75,7.66s11.95,-2.83 15.75,-7.66l132.05,-168.41 290.4,0c60.68,0 110.05,-49.37 110.05,-110.05L960.93,206.47C960.93,145.78 911.56,96.42 850.88,96.42zM920.91,652.67c0,38.61 -31.42,70.03 -70.03,70.03L550.74,722.7c-6.15,0 -11.95,2.83 -15.75,7.66L412.68,886.36l-122.32,-156c-3.79,-4.84 -9.6,-7.66 -15.75,-7.66l-100.05,0c-38.61,0 -70.03,-31.42 -70.03,-70.03L104.55,206.47c0,-38.61 31.42,-70.03 70.03,-70.03l676.3,0c38.61,0 70.03,31.42 70.03,70.03L920.91,652.67z"
android:fillColor="#888888"/>
<path
android:pathData="M272.62,344.53c-44.13,0 -80.04,35.9 -80.04,80.04 0,44.13 35.9,80.04 80.04,80.04s80.04,-35.9 80.04,-80.04C352.66,380.43 316.75,344.53 272.62,344.53zM272.62,464.58c-22.07,0 -40.02,-17.95 -40.02,-40.02 0,-22.07 17.95,-40.02 40.02,-40.02 22.07,0 40.02,17.95 40.02,40.02C312.64,446.63 294.69,464.58 272.62,464.58z"
android:fillColor="#888888"/>
<path
android:pathData="M512.73,344.53c-44.13,0 -80.04,35.9 -80.04,80.04 0,44.13 35.9,80.04 80.04,80.04 44.13,0 80.04,-35.9 80.04,-80.04C592.76,380.43 556.86,344.53 512.73,344.53zM512.73,464.58c-22.07,0 -40.02,-17.95 -40.02,-40.02 0,-22.07 17.95,-40.02 40.02,-40.02 22.07,0 40.02,17.95 40.02,40.02C552.75,446.63 534.79,464.58 512.73,464.58z"
android:fillColor="#888888"/>
<path
android:pathData="M752.84,344.53c-44.13,0 -80.04,35.9 -80.04,80.04 0,44.13 35.9,80.04 80.04,80.04s80.04,-35.9 80.04,-80.04C832.87,380.43 796.97,344.53 752.84,344.53zM752.84,464.58c-22.07,0 -40.02,-17.95 -40.02,-40.02 0,-22.07 17.95,-40.02 40.02,-40.02s40.02,17.95 40.02,40.02C792.85,446.63 774.9,464.58 752.84,464.58z"
android:fillColor="#888888"/>
<path
android:pathData="M850.88,96.42l-676.3,0c-60.68,0 -110.05,49.37 -110.05,110.05l0,446.2c0,60.68 49.37,110.05 110.05,110.05l90.31,0L396.94,931.13c3.79,4.84 9.6,7.66 15.75,7.66s11.95,-2.83 15.75,-7.66l132.05,-168.41 290.4,0c60.68,0 110.05,-49.37 110.05,-110.05L960.93,206.47C960.93,145.78 911.56,96.42 850.88,96.42zM920.91,652.67c0,38.61 -31.42,70.03 -70.03,70.03L550.74,722.7c-6.15,0 -11.95,2.83 -15.75,7.66L412.68,886.36l-122.32,-156c-3.79,-4.84 -9.6,-7.66 -15.75,-7.66l-100.05,0c-38.61,0 -70.03,-31.42 -70.03,-70.03L104.55,206.47c0,-38.61 31.42,-70.03 70.03,-70.03l676.3,0c38.61,0 70.03,31.42 70.03,70.03L920.91,652.67z"
android:fillColor="#888888" />
<path
android:pathData="M272.62,344.53c-44.13,0 -80.04,35.9 -80.04,80.04 0,44.13 35.9,80.04 80.04,80.04s80.04,-35.9 80.04,-80.04C352.66,380.43 316.75,344.53 272.62,344.53zM272.62,464.58c-22.07,0 -40.02,-17.95 -40.02,-40.02 0,-22.07 17.95,-40.02 40.02,-40.02 22.07,0 40.02,17.95 40.02,40.02C312.64,446.63 294.69,464.58 272.62,464.58z"
android:fillColor="#888888" />
<path
android:pathData="M512.73,344.53c-44.13,0 -80.04,35.9 -80.04,80.04 0,44.13 35.9,80.04 80.04,80.04 44.13,0 80.04,-35.9 80.04,-80.04C592.76,380.43 556.86,344.53 512.73,344.53zM512.73,464.58c-22.07,0 -40.02,-17.95 -40.02,-40.02 0,-22.07 17.95,-40.02 40.02,-40.02 22.07,0 40.02,17.95 40.02,40.02C552.75,446.63 534.79,464.58 512.73,464.58z"
android:fillColor="#888888" />
<path
android:pathData="M752.84,344.53c-44.13,0 -80.04,35.9 -80.04,80.04 0,44.13 35.9,80.04 80.04,80.04s80.04,-35.9 80.04,-80.04C832.87,380.43 796.97,344.53 752.84,344.53zM752.84,464.58c-22.07,0 -40.02,-17.95 -40.02,-40.02 0,-22.07 17.95,-40.02 40.02,-40.02s40.02,17.95 40.02,40.02C792.85,446.63 774.9,464.58 752.84,464.58z"
android:fillColor="#888888" />
</vector>

View File

@ -3,7 +3,7 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M799.2,874.4c0,34.4 -28,62.4 -62.4,62.4L287.2,936.8c-34.4,0 -62.4,-28 -62.4,-62.4L224.8,212h574.4v662.4zM349.6,100c0,-7.2 5.6,-12.8 12.8,-12.8h300c7.2,0 12.8,5.6 12.8,12.8v37.6L349.6,137.6L349.6,100zM986.4,137.6L749.6,137.6L749.6,100c0,-48 -39.2,-87.2 -87.2,-87.2h-300c-48,0 -87.2,39.2 -87.2,87.2v37.6L37.6,137.6C16.8,137.6 0,154.4 0,175.2s16.8,37.6 37.6,37.6h112v661.6c0,76 61.6,137.6 137.6,137.6h449.6c76,0 137.6,-61.6 137.6,-137.6L874.4,212h112c20.8,0 37.6,-16.8 37.6,-37.6s-16.8,-36.8 -37.6,-36.8zM512,824c20.8,0 37.6,-16.8 37.6,-37.6v-400c0,-20.8 -16.8,-37.6 -37.6,-37.6s-37.6,16.8 -37.6,37.6v400c0,20.8 16.8,37.6 37.6,37.6m-175.2,0c20.8,0 37.6,-16.8 37.6,-37.6v-400c0,-20.8 -16.8,-37.6 -37.6,-37.6s-37.6,16.8 -37.6,37.6v400c0.8,20.8 17.6,37.6 37.6,37.6m350.4,0c20.8,0 37.6,-16.8 37.6,-37.6v-400c0,-20.8 -16.8,-37.6 -37.6,-37.6s-37.6,16.8 -37.6,37.6v400c0,20.8 16.8,37.6 37.6,37.6"
android:fillColor="#C6C7CB"/>
<path
android:pathData="M799.2,874.4c0,34.4 -28,62.4 -62.4,62.4L287.2,936.8c-34.4,0 -62.4,-28 -62.4,-62.4L224.8,212h574.4v662.4zM349.6,100c0,-7.2 5.6,-12.8 12.8,-12.8h300c7.2,0 12.8,5.6 12.8,12.8v37.6L349.6,137.6L349.6,100zM986.4,137.6L749.6,137.6L749.6,100c0,-48 -39.2,-87.2 -87.2,-87.2h-300c-48,0 -87.2,39.2 -87.2,87.2v37.6L37.6,137.6C16.8,137.6 0,154.4 0,175.2s16.8,37.6 37.6,37.6h112v661.6c0,76 61.6,137.6 137.6,137.6h449.6c76,0 137.6,-61.6 137.6,-137.6L874.4,212h112c20.8,0 37.6,-16.8 37.6,-37.6s-16.8,-36.8 -37.6,-36.8zM512,824c20.8,0 37.6,-16.8 37.6,-37.6v-400c0,-20.8 -16.8,-37.6 -37.6,-37.6s-37.6,16.8 -37.6,37.6v400c0,20.8 16.8,37.6 37.6,37.6m-175.2,0c20.8,0 37.6,-16.8 37.6,-37.6v-400c0,-20.8 -16.8,-37.6 -37.6,-37.6s-37.6,16.8 -37.6,37.6v400c0.8,20.8 17.6,37.6 37.6,37.6m350.4,0c20.8,0 37.6,-16.8 37.6,-37.6v-400c0,-20.8 -16.8,-37.6 -37.6,-37.6s-37.6,16.8 -37.6,37.6v400c0,20.8 16.8,37.6 37.6,37.6"
android:fillColor="#C6C7CB" />
</vector>

View File

@ -3,7 +3,7 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M309.18,563.78a8.42,8.42 0,0 0,-1.57 2.75l-49.92,183.07a31.42,31.42 0,0 0,7.97 30.27,31.3 31.3,0 0,0 30.11,7.87l181.7,-49.57c0.29,0 0.42,0.26 0.64,0.26a7.9,7.9 0,0 0,5.7 -2.37l485.82,-486.08A77.6,77.6 0,0 0,992 194.43c0,-24.26 -10.3,-48.54 -28.32,-66.56l-45.86,-45.98a95.14,95.14 0,0 0,-66.53 -28.35c-21.44,0 -41.09,7.94 -55.58,22.34L309.92,562.11c-0.51,0.48 -0.35,1.15 -0.74,1.7M922.11,202.43l-48.26,48.22 -78.24,-79.52 47.58,-47.58c7.49,-7.55 22.11,-6.46 30.72,2.18l45.89,45.98c4.8,4.83 7.55,11.17 7.55,17.44a18.62,18.62 0,0 1,-5.25 13.28M395.58,571.42L746.14,220.61l78.27,79.62 -349.89,350.11 -78.94,-78.91zM331.71,713.66l25.34,-93.06 67.55,67.62 -92.9,25.44zM952.9,395.04c-18.4,0 -33.5,14.98 -33.57,33.6v453.18c0,23.78 -19.26,43.04 -43.04,43.04L110.11,924.86a43.14,43.14 0,0 1,-43.1 -43.04L67.01,142.14c0,-23.78 19.36,-43.1 43.1,-43.1h493.47a33.5,33.5 0,0 0,0 -67.04L105.02,32A105.15,105.15 0,0 0,0 137.09v749.86A105.12,105.12 0,0 0,105.02 992h776.32a105.12,105.12 0,0 0,105.06 -105.06L986.4,428.45a33.6,33.6 0,0 0,-33.5 -33.41z"
android:fillColor="#C6C7CB"/>
<path
android:pathData="M309.18,563.78a8.42,8.42 0,0 0,-1.57 2.75l-49.92,183.07a31.42,31.42 0,0 0,7.97 30.27,31.3 31.3,0 0,0 30.11,7.87l181.7,-49.57c0.29,0 0.42,0.26 0.64,0.26a7.9,7.9 0,0 0,5.7 -2.37l485.82,-486.08A77.6,77.6 0,0 0,992 194.43c0,-24.26 -10.3,-48.54 -28.32,-66.56l-45.86,-45.98a95.14,95.14 0,0 0,-66.53 -28.35c-21.44,0 -41.09,7.94 -55.58,22.34L309.92,562.11c-0.51,0.48 -0.35,1.15 -0.74,1.7M922.11,202.43l-48.26,48.22 -78.24,-79.52 47.58,-47.58c7.49,-7.55 22.11,-6.46 30.72,2.18l45.89,45.98c4.8,4.83 7.55,11.17 7.55,17.44a18.62,18.62 0,0 1,-5.25 13.28M395.58,571.42L746.14,220.61l78.27,79.62 -349.89,350.11 -78.94,-78.91zM331.71,713.66l25.34,-93.06 67.55,67.62 -92.9,25.44zM952.9,395.04c-18.4,0 -33.5,14.98 -33.57,33.6v453.18c0,23.78 -19.26,43.04 -43.04,43.04L110.11,924.86a43.14,43.14 0,0 1,-43.1 -43.04L67.01,142.14c0,-23.78 19.36,-43.1 43.1,-43.1h493.47a33.5,33.5 0,0 0,0 -67.04L105.02,32A105.15,105.15 0,0 0,0 137.09v749.86A105.12,105.12 0,0 0,105.02 992h776.32a105.12,105.12 0,0 0,105.06 -105.06L986.4,428.45a33.6,33.6 0,0 0,-33.5 -33.41z"
android:fillColor="#C6C7CB" />
</vector>

View File

@ -3,13 +3,13 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M139.4,163.2c-5.9,-0.6 -11.8,-1.3 -17.6,-1.7v-0.2c5.8,0.5 11.7,1.1 17.6,1.9zM481.7,530.3h-0.2c-0.2,-5.9 -0.6,-11.8 -1.3,-17.4 0.6,5.6 1,11.5 1.5,17.4zM396.8,860c-13.2,13.4 -27.7,26 -43,37.8L341,881.2V860h55.8z"
android:fillColor="#1E1E1E"/>
<path
android:pathData="M328.1,864.3h160.4v42H328.1z"
android:fillColor="#1E1E1E"/>
<path
android:pathData="M923.3,192.6c-1.8,-0.1 -3.7,-0.3 -5.6,-0.4 -179.7,-0.4 -337.2,108.9 -402.9,269.4C474.5,268 306.9,123.3 101.3,118.3c-3.8,-0.2 -7.6,-0.2 -11.5,-0.2l-10.7,-0.4v21.6c0.2,230.4 175.4,416.8 402.6,433C476.2,688 421,793.4 328.1,864.4l12.8,16.8L340.9,860h55.9c59.6,-59 100,-133.1 117.4,-214.4 14.7,60.3 15.5,123.7 2.5,184.8h42.7c16.6,-86.2 8.3,-176 -24.2,-257.5 201,-9.7 369.6,-156.5 405.7,-355.7l4,-21.4 -21.6,-3.2zM481.4,530.3c-196.1,-15.8 -348.6,-172 -359.7,-368.8v-0.2c5.9,0.4 11.8,1 17.6,1.9 6.5,0.8 12.8,1.7 19.3,2.9 6.5,0.8 12.8,2.3 19.1,3.8 6.3,1.3 12.4,2.9 18.5,4.6 6.3,1.5 12.2,3.4 18.3,5.5 6.1,1.9 12.2,4 18.1,6.5 5.9,2.1 11.6,4.6 17.2,7.1 5.9,2.3 11.3,5 17,8 5.7,2.5 11.1,5.5 16.6,8.8 5.5,2.7 10.7,5.9 16,9.4 5.3,3.2 10.5,6.5 15.5,10.3 17.6,12.2 34.4,26 50,41.2 11.5,11.3 49.6,58.8 52.7,64 3.6,5 6.9,10.3 9.9,15.8 3.4,5.3 14.9,27.3 17.4,33 2.7,5.7 18.1,45.4 19.7,50.8 2.1,6.7 8.6,33 9.9,39.3 2.5,12.6 4.4,25.6 5.7,38.6 0.6,5.7 1,11.5 1.5,17.4h-0.3zM536.3,530.9c41.4,-165.7 186.1,-285.8 358,-295.9 -41.4,165.9 -186.3,286.1 -358,295.9z"
android:fillColor="#1E1E1E"/>
<path
android:pathData="M139.4,163.2c-5.9,-0.6 -11.8,-1.3 -17.6,-1.7v-0.2c5.8,0.5 11.7,1.1 17.6,1.9zM481.7,530.3h-0.2c-0.2,-5.9 -0.6,-11.8 -1.3,-17.4 0.6,5.6 1,11.5 1.5,17.4zM396.8,860c-13.2,13.4 -27.7,26 -43,37.8L341,881.2V860h55.8z"
android:fillColor="#1E1E1E" />
<path
android:pathData="M328.1,864.3h160.4v42H328.1z"
android:fillColor="#1E1E1E" />
<path
android:pathData="M923.3,192.6c-1.8,-0.1 -3.7,-0.3 -5.6,-0.4 -179.7,-0.4 -337.2,108.9 -402.9,269.4C474.5,268 306.9,123.3 101.3,118.3c-3.8,-0.2 -7.6,-0.2 -11.5,-0.2l-10.7,-0.4v21.6c0.2,230.4 175.4,416.8 402.6,433C476.2,688 421,793.4 328.1,864.4l12.8,16.8L340.9,860h55.9c59.6,-59 100,-133.1 117.4,-214.4 14.7,60.3 15.5,123.7 2.5,184.8h42.7c16.6,-86.2 8.3,-176 -24.2,-257.5 201,-9.7 369.6,-156.5 405.7,-355.7l4,-21.4 -21.6,-3.2zM481.4,530.3c-196.1,-15.8 -348.6,-172 -359.7,-368.8v-0.2c5.9,0.4 11.8,1 17.6,1.9 6.5,0.8 12.8,1.7 19.3,2.9 6.5,0.8 12.8,2.3 19.1,3.8 6.3,1.3 12.4,2.9 18.5,4.6 6.3,1.5 12.2,3.4 18.3,5.5 6.1,1.9 12.2,4 18.1,6.5 5.9,2.1 11.6,4.6 17.2,7.1 5.9,2.3 11.3,5 17,8 5.7,2.5 11.1,5.5 16.6,8.8 5.5,2.7 10.7,5.9 16,9.4 5.3,3.2 10.5,6.5 15.5,10.3 17.6,12.2 34.4,26 50,41.2 11.5,11.3 49.6,58.8 52.7,64 3.6,5 6.9,10.3 9.9,15.8 3.4,5.3 14.9,27.3 17.4,33 2.7,5.7 18.1,45.4 19.7,50.8 2.1,6.7 8.6,33 9.9,39.3 2.5,12.6 4.4,25.6 5.7,38.6 0.6,5.7 1,11.5 1.5,17.4h-0.3zM536.3,530.9c41.4,-165.7 186.1,-285.8 358,-295.9 -41.4,165.9 -186.3,286.1 -358,295.9z"
android:fillColor="#1E1E1E" />
</vector>

View File

@ -3,10 +3,10 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M514.56,509.44m-506.88,0a506.88,506.88 0,1 0,1013.76 0,506.88 506.88,0 1,0 -1013.76,0Z"
android:fillColor="#BDDBF4"/>
<path
android:pathData="M830,812.8c-15.92,-82.28 -66.56,-153.96 -140.65,-204.39a26.88,26.88 0,0 0,-29.24 45.11c61.08,42.5 103.53,100.86 116.79,169.88a25.86,25.86 0,0 0,26.57 21.25h5.12a27.55,27.55 0,0 0,21.25 -31.85zM753.2,366.9a238.9,238.9 0,1 0,-477.75 0,231.63 231.63,0 0,0 121.86,207 321.18,321.18 0,0 0,-199.07 238.85,26.88 26.88,0 0,0 21.25,32.05h5.12a25.86,25.86 0,0 0,26.52 -21.25,269.52 269.52,0 0,1 260.1,-217.65h5.12a237.36,237.36 0,0 0,236.24 -238.9zM516.97,552.7h-8.14a185.8,185.8 0,1 1,191.08 -185.8c0,100.86 -82.28,183.14 -183.14,185.8zM516.97,552.7"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M514.56,509.44m-506.88,0a506.88,506.88 0,1 0,1013.76 0,506.88 506.88,0 1,0 -1013.76,0Z"
android:fillColor="#BDDBF4" />
<path
android:pathData="M830,812.8c-15.92,-82.28 -66.56,-153.96 -140.65,-204.39a26.88,26.88 0,0 0,-29.24 45.11c61.08,42.5 103.53,100.86 116.79,169.88a25.86,25.86 0,0 0,26.57 21.25h5.12a27.55,27.55 0,0 0,21.25 -31.85zM753.2,366.9a238.9,238.9 0,1 0,-477.75 0,231.63 231.63,0 0,0 121.86,207 321.18,321.18 0,0 0,-199.07 238.85,26.88 26.88,0 0,0 21.25,32.05h5.12a25.86,25.86 0,0 0,26.52 -21.25,269.52 269.52,0 0,1 260.1,-217.65h5.12a237.36,237.36 0,0 0,236.24 -238.9zM516.97,552.7h-8.14a185.8,185.8 0,1 1,191.08 -185.8c0,100.86 -82.28,183.14 -183.14,185.8zM516.97,552.7"
android:fillColor="#FFFFFF" />
</vector>

View File

@ -3,10 +3,10 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M927.04,488.11l-391.2,-377.08c-11.56,-11.15 -29.98,-11.15 -41.55,0l-391.1,377.08c-11.87,11.46 -12.28,30.49 -0.82,42.36 11.46,11.97 30.49,12.28 42.36,0.82L515.07,174.26 885.4,531.29c5.83,5.63 13.3,8.39 20.77,8.39 7.88,0 15.66,-3.07 21.59,-9.21 11.46,-11.87 11.15,-30.8 -0.72,-42.36z"/>
<path
android:fillColor="#FF000000"
android:pathData="M828.2,532.72c-16.58,0 -29.98,13.41 -29.98,29.98L798.21,861.4L636.84,861.4L636.84,643.95c0,-16.58 -13.4,-29.98 -29.98,-29.98L423.28,613.97c-16.58,0 -29.98,13.4 -29.98,29.98L393.3,861.4L231.93,861.4L231.93,571.09c0,-16.58 -13.4,-29.98 -29.98,-29.98s-29.98,13.4 -29.98,29.98v320.29c0,16.58 13.4,29.98 29.98,29.98h221.34c16.58,0 29.98,-13.4 29.98,-29.98v-217.55L577.08,673.83L577.08,891.28c0,16.58 13.4,29.98 29.98,29.98L828.4,921.26c16.58,0 29.98,-13.4 29.98,-29.98L858.38,562.7c-0.2,-16.58 -13.61,-29.98 -30.19,-29.98zM588.34,319.37c-11.66,-11.67 -30.7,-11.67 -42.36,0 -11.66,11.66 -11.66,30.7 0,42.36l73.47,73.47c5.83,5.83 13.51,8.8 21.18,8.8s15.35,-2.97 21.18,-8.8c11.66,-11.67 11.66,-30.7 0,-42.36l-73.47,-73.47zM669.28,465.8a31.52,31.52 0,1 0,63.03 0,31.52 31.52,0 1,0 -63.03,0z"/>
<path
android:fillColor="#FF000000"
android:pathData="M927.04,488.11l-391.2,-377.08c-11.56,-11.15 -29.98,-11.15 -41.55,0l-391.1,377.08c-11.87,11.46 -12.28,30.49 -0.82,42.36 11.46,11.97 30.49,12.28 42.36,0.82L515.07,174.26 885.4,531.29c5.83,5.63 13.3,8.39 20.77,8.39 7.88,0 15.66,-3.07 21.59,-9.21 11.46,-11.87 11.15,-30.8 -0.72,-42.36z" />
<path
android:fillColor="#FF000000"
android:pathData="M828.2,532.72c-16.58,0 -29.98,13.41 -29.98,29.98L798.21,861.4L636.84,861.4L636.84,643.95c0,-16.58 -13.4,-29.98 -29.98,-29.98L423.28,613.97c-16.58,0 -29.98,13.4 -29.98,29.98L393.3,861.4L231.93,861.4L231.93,571.09c0,-16.58 -13.4,-29.98 -29.98,-29.98s-29.98,13.4 -29.98,29.98v320.29c0,16.58 13.4,29.98 29.98,29.98h221.34c16.58,0 29.98,-13.4 29.98,-29.98v-217.55L577.08,673.83L577.08,891.28c0,16.58 13.4,29.98 29.98,29.98L828.4,921.26c16.58,0 29.98,-13.4 29.98,-29.98L858.38,562.7c-0.2,-16.58 -13.61,-29.98 -30.19,-29.98zM588.34,319.37c-11.66,-11.67 -30.7,-11.67 -42.36,0 -11.66,11.66 -11.66,30.7 0,42.36l73.47,73.47c5.83,5.83 13.51,8.8 21.18,8.8s15.35,-2.97 21.18,-8.8c11.66,-11.67 11.66,-30.7 0,-42.36l-73.47,-73.47zM669.28,465.8a31.52,31.52 0,1 0,63.03 0,31.52 31.52,0 1,0 -63.03,0z" />
</vector>

View File

@ -3,10 +3,10 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M771.87,296.62c14.22,-13.54 36.64,-13.08 50.29,1.02 13.54,14.22 13.08,36.64 -1.02,50.29L400.73,750.93 202.87,561.38c-14.22,-13.54 -14.68,-36.07 -1.02,-50.29 13.54,-14.22 36.07,-14.68 50.29,-1.02l148.59,142.34 371.14,-355.78z"
android:fillColor="#007fff"/>
<path
android:pathData="M512,1021.72C230.51,1021.72 2.28,793.49 2.28,512S230.51,2.28 512,2.28s509.72,228.24 509.72,509.72 -228.24,509.72 -509.72,509.72zM512,950.61c242.23,0 438.61,-196.38 438.61,-438.61S754.23,73.39 512,73.39 73.39,269.77 73.39,512 269.77,950.61 512,950.61z"
android:fillColor="#007fff"/>
<path
android:pathData="M771.87,296.62c14.22,-13.54 36.64,-13.08 50.29,1.02 13.54,14.22 13.08,36.64 -1.02,50.29L400.73,750.93 202.87,561.38c-14.22,-13.54 -14.68,-36.07 -1.02,-50.29 13.54,-14.22 36.07,-14.68 50.29,-1.02l148.59,142.34 371.14,-355.78z"
android:fillColor="#007fff" />
<path
android:pathData="M512,1021.72C230.51,1021.72 2.28,793.49 2.28,512S230.51,2.28 512,2.28s509.72,228.24 509.72,509.72 -228.24,509.72 -509.72,509.72zM512,950.61c242.23,0 438.61,-196.38 438.61,-438.61S754.23,73.39 512,73.39 73.39,269.77 73.39,512 269.77,950.61 512,950.61z"
android:fillColor="#007fff" />
</vector>

View File

@ -3,10 +3,10 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M771.87,296.62c14.22,-13.54 36.64,-13.08 50.29,1.02 13.54,14.22 13.08,36.64 -1.02,50.29L400.73,750.93 202.87,561.38c-14.22,-13.54 -14.68,-36.07 -1.02,-50.29 13.54,-14.22 36.07,-14.68 50.29,-1.02l148.59,142.34 371.14,-355.78z"
android:fillColor="#bfbfbf"/>
<path
android:pathData="M512,1021.72C230.51,1021.72 2.28,793.49 2.28,512S230.51,2.28 512,2.28s509.72,228.24 509.72,509.72 -228.24,509.72 -509.72,509.72zM512,950.61c242.23,0 438.61,-196.38 438.61,-438.61S754.23,73.39 512,73.39 73.39,269.77 73.39,512 269.77,950.61 512,950.61z"
android:fillColor="#bfbfbf"/>
<path
android:pathData="M771.87,296.62c14.22,-13.54 36.64,-13.08 50.29,1.02 13.54,14.22 13.08,36.64 -1.02,50.29L400.73,750.93 202.87,561.38c-14.22,-13.54 -14.68,-36.07 -1.02,-50.29 13.54,-14.22 36.07,-14.68 50.29,-1.02l148.59,142.34 371.14,-355.78z"
android:fillColor="#bfbfbf" />
<path
android:pathData="M512,1021.72C230.51,1021.72 2.28,793.49 2.28,512S230.51,2.28 512,2.28s509.72,228.24 509.72,509.72 -228.24,509.72 -509.72,509.72zM512,950.61c242.23,0 438.61,-196.38 438.61,-438.61S754.23,73.39 512,73.39 73.39,269.77 73.39,512 269.77,950.61 512,950.61z"
android:fillColor="#bfbfbf" />
</vector>

View File

@ -3,19 +3,19 @@
android:height="200dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M442.8,176.4c-134,0 -239.5,120.8 -272,220 -0.2,0.5 -0.3,1 -0.5,1.6 -1.5,4.8 -2.4,9.5 -0.9,14.3 1.7,5.3 5.3,9.7 10.2,12.3l0.1,0.1c3.2,1.6 6.3,2.3 9.6,2.3 7.8,0 16.1,-3.7 18.6,-11.2 0.2,-0.6 0.4,-1.3 0.7,-1.9 29.4,-85.1 127,-199.8 234.3,-195.7 11.5,0.4 20.9,-9.4 20.9,-20.9 -0.1,-11.5 -9.5,-20.9 -21,-20.9zM628.6,244.3c-3.7,-3.1 -8.5,-4.9 -13.4,-4.9 -6.1,0 -12,2.7 -16,7.4 -3.5,4.2 -5.3,9.7 -4.8,15.3 0.6,5.6 3.2,10.7 7.4,14.1 9.4,7.9 18.1,16.3 26.1,25.3 6.3,7.1 16.6,9.1 25.1,4.7 12.2,-6.2 15.1,-22.3 6,-32.5 -9.4,-10.4 -19.5,-20.2 -30.4,-29.4z"
android:fillColor="#1A1A1A"/>
<path
android:pathData="M499.8,98.7c-1.1,-0.2 -2.2,-0.3 -3.3,-0.3 -10.2,0 -19,7.6 -20.6,17.6 -0.8,5.5 0.5,11 3.8,15.5 3.3,4.6 8.1,7.6 13.6,8.4 30.3,4.9 50.9,34.5 45.9,66.1 -4.4,28.1 -28.4,49.3 -55.7,49.3 -2.8,0 -5.6,-0.2 -8.4,-0.7 -1.1,-0.2 -2.2,-0.2 -3.4,-0.2 -10.1,0 -19,7.5 -20.6,17.6 -0.8,5.5 0.5,11 3.8,15.5 3.3,4.4 8.1,7.5 13.6,8.3 5,0.8 10.1,1.3 15,1.3 23.1,0 45.5,-8.4 63.1,-23.9 18,-15.4 29.9,-37 33.7,-60.7 8.7,-54.4 -27.5,-105.4 -80.5,-113.8zM280.5,672.2c-2.7,-2.3 -5.4,-4.7 -8,-7.2 -27.2,-25.7 -48.9,-57.6 -62.7,-93.9l-0.1,-0.2c-0.6,-1.3 -1.3,-2.7 -2.4,-4.2l-0.3,-0.4 -0.2,-0.4c-3.3,-7.7 -10.7,-12.7 -19.1,-12.7 -31.7,0 -57.5,-25.8 -57.5,-57.5 0,-31.6 25.6,-57.3 57.1,-57.5 9.7,-0.1 18.5,-6.5 20.7,-15.9 0.7,-2.9 0.7,-5.7 0.3,-8.4 -1.6,-9.9 -10.3,-17.5 -20.6,-17.5 -6,0 -11.9,0.5 -17.6,1.6 -46.4,8.3 -81.7,48.9 -81.7,97.7 0,23.7 8.5,46.6 24,64.6 15.3,17.7 36.4,29.5 59.4,33.2l2.2,0.3 0.8,2.1c15.8,37.4 39,70.7 68.1,98.4 3.3,3.1 6.6,6.1 10,9.1 8.3,7.2 20.7,6.9 28.5,-0.9 4.1,-4.1 6.1,-9.4 6.1,-14.7 0.1,-5.7 -2.3,-11.5 -7,-15.6zM444,867.9L330.7,754.6c-10.4,-10.4 -27.3,-10.4 -37.8,0 -10.4,10.4 -10.4,27.3 0,37.8l113.2,113.3c6.7,6.7 16.6,9.4 25.8,6.9s16.4,-9.7 18.9,-18.9 -0.1,-19.1 -6.8,-25.8z"
android:fillColor="#1A1A1A"/>
<path
android:pathData="M488.6,761.5l-41.4,34.1 -41.4,34.1 -20.1,16.6c-11.4,9.4 -28.2,7.7 -37.6,-3.6 -9.4,-11.4 -7.7,-28.2 3.6,-37.6l16.1,-13.3 41.4,-34.1 41.4,-34.1 9.3,9.3 28.7,28.6z"
android:fillColor="#1A1A1A"/>
<path
android:pathData="M927.3,271.2c-10.4,-10.4 -27.3,-10.4 -37.7,0l-80.9,80.9c-33.1,-29.2 -76.1,-40.3 -116.8,-33.8 -14.1,2.3 -27.9,6.6 -41,13.1 -13.4,6.7 -25.9,15.6 -37.1,26.7L362.2,609.9c-4.3,4.3 -8.2,8.7 -11.8,13.4L318.1,591c-10.4,-10.4 -27.3,-10.4 -37.8,0 -10.4,10.4 -10.4,27.3 0,37.8l95.1,95.1 33.8,33.8 17.1,17.1 20.8,20.8 122.6,122.6c10.4,10.4 27.3,10.4 37.7,0 10.4,-10.4 10.4,-27.3 0,-37.7l-32.2,-32.2c4.7,-3.7 9.1,-7.6 13.4,-11.8l251.7,-251.7c53.1,-53.2 55.8,-138.5 6.1,-194.8l80.9,-80.9c10.4,-10.5 10.4,-27.4 0,-37.9zM802.6,547L550.9,798.6c-4.2,4.2 -8.9,8 -13.8,11.3l-48.5,-48.5 -28.6,-28.5 -9.3,-9.3 -62.1,-62.1c3.2,-4.9 7,-9.5 11.3,-13.8l113.2,-113.2 69.2,69.2c10.4,10.4 27.3,10.4 37.8,0 10.4,-10.4 10.4,-27.3 0,-37.8l-69.2,-69.2 37.7,-37.8 69.2,69.2c10.4,10.4 27.3,10.4 37.8,0 10.4,-10.4 10.4,-27.3 0,-37.7l-69.2,-69.2 25.2,-25.2c34.8,-34.8 91.1,-34.8 125.8,0l25.2,25.2c34.7,34.7 34.7,91 0,125.8z"
android:fillColor="#1A1A1A"/>
<path
android:pathData="M368.5,433.5m-33.8,0a33.8,33.8 0,1 0,67.6 0,33.8 33.8,0 1,0 -67.6,0Z"
android:fillColor="#1A1A1A"/>
<path
android:pathData="M442.8,176.4c-134,0 -239.5,120.8 -272,220 -0.2,0.5 -0.3,1 -0.5,1.6 -1.5,4.8 -2.4,9.5 -0.9,14.3 1.7,5.3 5.3,9.7 10.2,12.3l0.1,0.1c3.2,1.6 6.3,2.3 9.6,2.3 7.8,0 16.1,-3.7 18.6,-11.2 0.2,-0.6 0.4,-1.3 0.7,-1.9 29.4,-85.1 127,-199.8 234.3,-195.7 11.5,0.4 20.9,-9.4 20.9,-20.9 -0.1,-11.5 -9.5,-20.9 -21,-20.9zM628.6,244.3c-3.7,-3.1 -8.5,-4.9 -13.4,-4.9 -6.1,0 -12,2.7 -16,7.4 -3.5,4.2 -5.3,9.7 -4.8,15.3 0.6,5.6 3.2,10.7 7.4,14.1 9.4,7.9 18.1,16.3 26.1,25.3 6.3,7.1 16.6,9.1 25.1,4.7 12.2,-6.2 15.1,-22.3 6,-32.5 -9.4,-10.4 -19.5,-20.2 -30.4,-29.4z"
android:fillColor="#1A1A1A" />
<path
android:pathData="M499.8,98.7c-1.1,-0.2 -2.2,-0.3 -3.3,-0.3 -10.2,0 -19,7.6 -20.6,17.6 -0.8,5.5 0.5,11 3.8,15.5 3.3,4.6 8.1,7.6 13.6,8.4 30.3,4.9 50.9,34.5 45.9,66.1 -4.4,28.1 -28.4,49.3 -55.7,49.3 -2.8,0 -5.6,-0.2 -8.4,-0.7 -1.1,-0.2 -2.2,-0.2 -3.4,-0.2 -10.1,0 -19,7.5 -20.6,17.6 -0.8,5.5 0.5,11 3.8,15.5 3.3,4.4 8.1,7.5 13.6,8.3 5,0.8 10.1,1.3 15,1.3 23.1,0 45.5,-8.4 63.1,-23.9 18,-15.4 29.9,-37 33.7,-60.7 8.7,-54.4 -27.5,-105.4 -80.5,-113.8zM280.5,672.2c-2.7,-2.3 -5.4,-4.7 -8,-7.2 -27.2,-25.7 -48.9,-57.6 -62.7,-93.9l-0.1,-0.2c-0.6,-1.3 -1.3,-2.7 -2.4,-4.2l-0.3,-0.4 -0.2,-0.4c-3.3,-7.7 -10.7,-12.7 -19.1,-12.7 -31.7,0 -57.5,-25.8 -57.5,-57.5 0,-31.6 25.6,-57.3 57.1,-57.5 9.7,-0.1 18.5,-6.5 20.7,-15.9 0.7,-2.9 0.7,-5.7 0.3,-8.4 -1.6,-9.9 -10.3,-17.5 -20.6,-17.5 -6,0 -11.9,0.5 -17.6,1.6 -46.4,8.3 -81.7,48.9 -81.7,97.7 0,23.7 8.5,46.6 24,64.6 15.3,17.7 36.4,29.5 59.4,33.2l2.2,0.3 0.8,2.1c15.8,37.4 39,70.7 68.1,98.4 3.3,3.1 6.6,6.1 10,9.1 8.3,7.2 20.7,6.9 28.5,-0.9 4.1,-4.1 6.1,-9.4 6.1,-14.7 0.1,-5.7 -2.3,-11.5 -7,-15.6zM444,867.9L330.7,754.6c-10.4,-10.4 -27.3,-10.4 -37.8,0 -10.4,10.4 -10.4,27.3 0,37.8l113.2,113.3c6.7,6.7 16.6,9.4 25.8,6.9s16.4,-9.7 18.9,-18.9 -0.1,-19.1 -6.8,-25.8z"
android:fillColor="#1A1A1A" />
<path
android:pathData="M488.6,761.5l-41.4,34.1 -41.4,34.1 -20.1,16.6c-11.4,9.4 -28.2,7.7 -37.6,-3.6 -9.4,-11.4 -7.7,-28.2 3.6,-37.6l16.1,-13.3 41.4,-34.1 41.4,-34.1 9.3,9.3 28.7,28.6z"
android:fillColor="#1A1A1A" />
<path
android:pathData="M927.3,271.2c-10.4,-10.4 -27.3,-10.4 -37.7,0l-80.9,80.9c-33.1,-29.2 -76.1,-40.3 -116.8,-33.8 -14.1,2.3 -27.9,6.6 -41,13.1 -13.4,6.7 -25.9,15.6 -37.1,26.7L362.2,609.9c-4.3,4.3 -8.2,8.7 -11.8,13.4L318.1,591c-10.4,-10.4 -27.3,-10.4 -37.8,0 -10.4,10.4 -10.4,27.3 0,37.8l95.1,95.1 33.8,33.8 17.1,17.1 20.8,20.8 122.6,122.6c10.4,10.4 27.3,10.4 37.7,0 10.4,-10.4 10.4,-27.3 0,-37.7l-32.2,-32.2c4.7,-3.7 9.1,-7.6 13.4,-11.8l251.7,-251.7c53.1,-53.2 55.8,-138.5 6.1,-194.8l80.9,-80.9c10.4,-10.5 10.4,-27.4 0,-37.9zM802.6,547L550.9,798.6c-4.2,4.2 -8.9,8 -13.8,11.3l-48.5,-48.5 -28.6,-28.5 -9.3,-9.3 -62.1,-62.1c3.2,-4.9 7,-9.5 11.3,-13.8l113.2,-113.2 69.2,69.2c10.4,10.4 27.3,10.4 37.8,0 10.4,-10.4 10.4,-27.3 0,-37.8l-69.2,-69.2 37.7,-37.8 69.2,69.2c10.4,10.4 27.3,10.4 37.8,0 10.4,-10.4 10.4,-27.3 0,-37.7l-69.2,-69.2 25.2,-25.2c34.8,-34.8 91.1,-34.8 125.8,0l25.2,25.2c34.7,34.7 34.7,91 0,125.8z"
android:fillColor="#1A1A1A" />
<path
android:pathData="M368.5,433.5m-33.8,0a33.8,33.8 0,1 0,67.6 0,33.8 33.8,0 1,0 -67.6,0Z"
android:fillColor="#1A1A1A" />
</vector>

View File

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.account.home.CreateHomeActivity">
<RelativeLayout
android:id="@+id/rl_account_title"
android:layout_width="match_parent"

View File

@ -2,37 +2,41 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical">
<RelativeLayout android:id="@+id/rl_itemCardPhone"
<RelativeLayout
android:id="@+id/rl_itemCardPhone"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/txtPhoneNumber"
<TextView
android:id="@+id/txtPhoneNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:textColor="@color/black"
android:textSize="14sp"/>
android:textSize="14sp" />
<ImageView android:id="@+id/imgCallPhone"
<ImageView
android:id="@+id/imgCallPhone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/action_contact"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"/>
android:layout_marginRight="10dp" />
<ImageView android:id="@+id/imgCallMessage"
<ImageView
android:id="@+id/imgCallMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/action_message"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/imgCallPhone"
android:layout_marginRight="30dp"
android:visibility="gone"/>
android:visibility="gone" />
</RelativeLayout>

View File

@ -18,7 +18,7 @@
android:paddingBottom="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="若您只使用上传、下载和复制功能,则可以使用简化版的 SDK" />
tools:text="若您只使用上传、下载和复制功能,则可以使用简化版的 SDK" />
<com.lzy.ninegrid.NineGridView
android:id="@+id/ngv_pic_container"

View File

@ -85,6 +85,7 @@
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<TextView
android:id="@+id/tv_home_exit"
android:layout_width="wrap_content"

View File

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp" >
android:padding="8dp">
<TextView
android:id="@+id/txt_title"
@ -24,15 +24,13 @@
android:id="@+id/sLayout_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadingEdge="none"
>
android:fadingEdge="none">
<LinearLayout
android:id="@+id/lLayout_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
</LinearLayout>
android:orientation="vertical"></LinearLayout>
</ScrollView>
<TextView

View File

@ -9,7 +9,7 @@
<item
android:id="@+id/navigation_grow"
android:icon="@drawable/ic_grow"
android:title="@string/nav_grow"/>
android:title="@string/nav_grow" />
<item
android:id="@+id/navigation_account"

View File

@ -2,7 +2,7 @@ package com.yuxihan.sdu;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* Example local unit test, which will execute on the development machine (host).