From 358e18c047ca95a9ed72cd5bae28911f95398623 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 20 Mar 2023 20:22:27 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=AD=E5=8F=AF=E8=83=BD=E8=BF=9D=E8=A7=84=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 - .../main/java/com/yizhuan/erban/UIHelper.java | 61 ------ .../avroom/firstcharge/SelectPayTypeDialog.kt | 78 ------- .../NewUserChargeGiftDialog.kt | 196 ----------------- .../widget/dialog/LoginPopupDialog.java | 78 ------- .../res/drawable-xhdpi/ic_wechat_charge.webp | Bin 806 -> 0 bytes .../res/drawable-xxhdpi/ic_wechat_charge.webp | Bin 1148 -> 0 bytes .../layout/dialog_new_user_charge_gift.xml | 163 -------------- .../res/layout/dialog_select_pay_type.xml | 116 ---------- .../res/layout/layout_login_popup_dialog.xml | 43 ---- .../xchat_android_core/auth/AuthModel.java | 9 - .../auth/exception/OldMemberException.java | 27 --- .../xchat_android_core/share/ShareModel.java | 2 +- .../community/download/DownloadModel.java | 88 -------- .../community/download/IDownloadModel.java | 10 - .../upgrade/model/IUpgradeModel.java | 12 -- .../upgrade/model/UpgradeModel.java | 200 +----------------- 17 files changed, 8 insertions(+), 1078 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt delete mode 100644 app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt delete mode 100644 app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java delete mode 100644 app/src/main/res/drawable-xhdpi/ic_wechat_charge.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_wechat_charge.webp delete mode 100644 app/src/main/res/layout/dialog_new_user_charge_gift.xml delete mode 100644 app/src/main/res/layout/dialog_select_pay_type.xml delete mode 100644 app/src/main/res/layout/layout_login_popup_dialog.xml delete mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/OldMemberException.java delete mode 100644 core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java delete mode 100644 core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/IDownloadModel.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c5290d6df..3d7fdd8c3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -895,9 +895,6 @@ - diff --git a/app/src/main/java/com/yizhuan/erban/UIHelper.java b/app/src/main/java/com/yizhuan/erban/UIHelper.java index 71ee28f52..953ce08a2 100644 --- a/app/src/main/java/com/yizhuan/erban/UIHelper.java +++ b/app/src/main/java/com/yizhuan/erban/UIHelper.java @@ -1,11 +1,8 @@ package com.yizhuan.erban; import android.app.Activity; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.net.Uri; -import android.provider.Settings; import com.yizhuan.erban.audio.MyVoiceActivity; import com.yizhuan.erban.audio.RecordingVoiceActivity; @@ -36,29 +33,6 @@ import com.yizhuan.xchat_android_library.utils.ResUtil; * ************************************************************************** */ public class UIHelper { -// -// /** -// * 登录 -// * -// * @param context -// */ -// public static void showLoginAct(Context context) { -// Intent intent = new Intent(context, LoginActivity.class); -// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); -// intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); -// context.startActivity(intent); -// } -// -// /** -// * 显示 主界面 -// */ -// public static void showMyMainAct(Context context) { -// Intent intent = new Intent(context, Main2Activity.class); -// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); -// intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); -// context.startActivity(intent); -// } - public static void showUserGuideAct(Context mContext) { mContext.startActivity(new Intent(mContext, UserGuideActivity.class)); @@ -74,11 +48,6 @@ public class UIHelper { } -// public static void showUserAvatarUpdateAct(Context mContext) { -// mContext.startActivity(new Intent(mContext, UserAvatarUpdateActivity.class)); -// } - - //修改用户资料 public static void showUserInfoModifyAct(Context mContext, long userId) { Intent intent = new Intent(mContext, UserInfoModifyActivity.class); @@ -172,36 +141,6 @@ public class UIHelper { CommonWebViewActivity.start(context, cardUrl); } - - /** - * 启动应用的设置 - * - * @param context - */ - public static void startAppSettings(Context context) { - Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - intent.setData(Uri.parse("package:" + context.getPackageName())); - context.startActivity(intent); - } - - private static void startOtherApp(Context context, String pkgName, String launcherActivityName) { - ComponentName componet = new ComponentName(pkgName, launcherActivityName); - //pkgName 就是第三方应用的包名 - //launcherActivityName 就是第三方应用的进入的第一个Activity - Intent intent = new Intent(); - intent.setComponent(componet); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - - public static void startWeixinApp(Context context) { - startOtherApp(context, "com.tencent.mm", "com.tencent.mm.ui.LauncherUI"); - } - - public static void startQQApp(Context context) { - startOtherApp(context, "com.tencent.mobileqq", "com.tencent.mobileqq.activity.SplashActivity"); - } - public static void openContactUs(Context context) { CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/peko/modules/contact/contact.html"); } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt deleted file mode 100644 index 9b05e4833..000000000 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt +++ /dev/null @@ -1,78 +0,0 @@ -package com.yizhuan.erban.avroom.firstcharge - -import android.annotation.SuppressLint -import android.os.Bundle -import android.view.Gravity -import android.view.View -import android.view.WindowManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSelectPayTypeBinding -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.SingleToastUtil - -/** - * 充值方式选择弹窗 - */ -@ActLayoutRes(R.layout.dialog_select_pay_type) -class SelectPayTypeDialog : BaseDialog() { - - private val chargeProdId by lazy { requireArguments().getString("chargeProdId", "") } - private val descText by lazy { requireArguments().getString("descText", "") } - private var removeView: View? = null - - companion object { - - @JvmStatic - fun newInstance(chargeProdId: String, descText: String): SelectPayTypeDialog { - return SelectPayTypeDialog().apply { - arguments = Bundle().apply { - putString("chargeProdId", chargeProdId) - putString("descText", descText) - } - } - } - } - - private var payChannel = "" - - override fun onStart() { - width = WindowManager.LayoutParams.MATCH_PARENT - gravity = Gravity.BOTTOM - super.onStart() - } - - @SuppressLint("CheckResult") - override fun init() { - PayModel.get().walletInfo - .compose(bindToLifecycle()) - .subscribe({ - //setWalletData(it) - }, { - SingleToastUtil.showToast(it.message) - it.printStackTrace() - }) - binding.tvDesc.text = descText - - binding.tvConfirm.setOnClickListener { - if (payChannel.isEmpty()) { - SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_firstcharge_selectpaytypedialog_01)) - return@setOnClickListener - } - dismissAllowingStateLoss() - } - - binding.tvMore.setOnClickListener { - removeView?.let { - binding.rg.addView(it) - binding.tvMore.visibility = View.GONE - } - } - - binding.ivClose.setOnClickListener { - dismissAllowingStateLoss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt deleted file mode 100644 index d7c25d470..000000000 --- a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt +++ /dev/null @@ -1,196 +0,0 @@ -package com.yizhuan.erban.avroom.newuserchargegift - -import android.annotation.SuppressLint -import android.content.Context -import android.content.Intent -import android.view.Gravity -import android.view.View -import android.view.WindowManager -import androidx.core.view.isVisible -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.netease.nim.uikit.common.util.sys.TimeUtil -import com.trello.rxlifecycle3.android.ActivityEvent -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.firstcharge.SelectPayTypeDialog -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.databinding.DialogNewUserChargeGiftBinding -import com.yizhuan.erban.ui.setting.ModifyPwdActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.SingleToastUtil -import io.reactivex.Observable -import io.reactivex.android.schedulers.AndroidSchedulers -import org.greenrobot.eventbus.EventBus -import org.greenrobot.eventbus.Subscribe -import org.greenrobot.eventbus.ThreadMode -import java.util.concurrent.TimeUnit - -@ActLayoutRes(R.layout.dialog_new_user_charge_gift) -class NewUserChargeGiftDialog : BaseViewBindingActivity() { - - private var goodsList: List? = null - private var currGoods: FirstChargeGoods? = null - private lateinit var rewardAdapter: RewardAdapter - private lateinit var rvDelegate: RVDelegate - - companion object { - @JvmStatic - fun start(context: Context) { - val starter = Intent(context, NewUserChargeGiftDialog::class.java) - context.startActivity(starter) - } - - private const val BIND_CODE_GOLD = 200 - } - - @SuppressLint("CheckResult") - override fun init() { - //這裏的height用MATCH_PARENT狀態欄會被頂上去,不知道什麽鬼 - val height = ScreenUtil.screenHeight - ScreenUtil.getStatusBarHeight(context) - window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, height) - window.setGravity(Gravity.CENTER) - EventBus.getDefault().register(this) - binding.rgPlan.setOnCheckedChangeListener { group, checkedId -> - updateCurrGoods(goodsList?.getOrNull(group.indexOfChild(group.findViewById(checkedId)))) - } - - binding.tvCharge.setOnClickListener { - currGoods?.let { - SelectPayTypeDialog.newInstance(it.chargeProdId, "¥${it.chargeMoney}") - .show(this) - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_NUGIFT_POP_CLICK, - ResUtil.getString(R.string.avroom_newuserchargegift_newuserchargegiftdialog_01), - mapOf("charge_money" to "${it.chargeMoney}元") - ) - } ?: run { - "請選擇充值產品!".toast() - } - } - - rvDelegate = RVDelegate.Builder() - .setAdapter(RewardAdapter().also { rewardAdapter = it }) - .setLayoutManager(LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)) - .setRecyclerView(binding.recyclerView) - .build() - - dialogManager.showProgressDialog(this) - PayModel.get().newUserChargeInfo - .compose(bindToLifecycle()) - .subscribe({ - it.limitFirstChargeTaskList?.let { it1 -> initData(it1) } - initNewUserCharge(it.limitEndTime) - dialogManager.dismissDialog() - }, { - it.printStackTrace() - dialogManager.dismissDialog() - SingleToastUtil.showToast(it.message) - finish() - }) - - binding.viewBg.setOnClickListener { - //do nothing - } - val closeClick = View.OnClickListener { - finish() - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_NUGIFT_POP_CLOSE_CLICK, "新人專享禮物彈窗關閉點擊") - } - binding.root.setOnClickListener(closeClick) - binding.ivClose.setOnClickListener(closeClick) - } - - @SuppressLint("SetTextI18n") - private fun initData(goodsList: List) { - this.goodsList = goodsList - updateCurrGoods(goodsList.getOrNull(0)) - val planViews = arrayListOf( - binding.rbPlanA, - binding.rbPlanB, - binding.rbPlanC, - binding.rbPlanD - ) - var initChecked = false - planViews.forEachIndexed { index, button -> - goodsList.getOrNull(index)?.let { - if (!it.finishCharge && !initChecked) { - initChecked = true - button.isChecked = true - } - button.isVisible = true - button.text = "${it.chargeMoney}元" - } ?: run { - button.isVisible = false - } - } - } - - @SuppressLint("CheckResult", "SetTextI18n") - private fun initNewUserCharge(limitChargeEndTime: Long) { - val count = (limitChargeEndTime - CurrentTimeUtils.getCurrentTime()) / 1000 / 60 + 1 - if (count <= 0) return - Observable.intervalRange(0, count, 0, 1, TimeUnit.MINUTES) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .observeOn(AndroidSchedulers.mainThread()) - .doOnComplete { - finish() - } - .subscribe({ - val residueTime = - limitChargeEndTime - CurrentTimeUtils.getCurrentTime() - if (residueTime <= 0) { - UserModel.get().cacheLoginUserInfo?.isShowLimitCharge = false - finish() - } else { - binding.tvTime.text = - "限時${TimeUtil.getElapseTimeForNewUserCharge(residueTime)}" - } - }, { - it.printStackTrace() - }) - } - - private fun updateCurrGoods(firstChargeGoods: FirstChargeGoods?) { - firstChargeGoods?.let { - currGoods = it - binding.tvTitle.text = it.chargeProdTitle - binding.tvCharge.isEnabled = !it.finishCharge - rewardAdapter.setNewData(it.firstChargeRewardList) - } - } - - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - super.onActivityResult(requestCode, resultCode, data) - dialogManager.dismissDialog() - if (resultCode != RESULT_OK) { - return - } - if (requestCode == BIND_CODE_GOLD) { - ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD) - } - } - - @Subscribe(threadMode = ThreadMode.MAIN) - fun onNewUserChargeEvent(event: NewUserChargeEvent?) { - finish() - } - - override fun onDestroy() { - super.onDestroy() - EventBus.getDefault().unregister(this) - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java deleted file mode 100644 index 8d25c80d9..000000000 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.yizhuan.erban.common.widget.dialog; - - -import android.app.Dialog; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; - -import com.yizhuan.erban.R; - - -public class LoginPopupDialog extends Dialog implements OnClickListener { - - private ViewGroup mContentView; - private View mBtnRegister; - private View mBtnLogin; - private View mQQLogin; - private View mSinaLogin; - private View mWeChatLogin; - - private OnLoginPopupDialogListener mL; - - public LoginPopupDialog(Context context, final OnLoginPopupDialogListener l) { - super(context, R.style.Dialog_Fullscreen); - mL = l; - mContentView = (ViewGroup) View.inflate(getContext(), R.layout.layout_login_popup_dialog, null); - //mTvTitle = (TextView) mContentView.findViewById(R.id.tv_title); - mBtnRegister = mContentView.findViewById(R.id.btn_register); - mBtnLogin = mContentView.findViewById(R.id.btn_login); -// mQQLogin = mContentView.findViewById(R.id.qq_login); -// mSinaLogin = mContentView.findViewById(R.id.sina_login); -// mWeChatLogin = mContentView.findViewById(R.id.wechat_login); - mBtnRegister.setOnClickListener(this); - mBtnLogin.setOnClickListener(this); -// mQQLogin.setOnClickListener(this); -// mSinaLogin.setOnClickListener(this); -// mWeChatLogin.setOnClickListener(this); - - setContentView(mContentView); - setCanceledOnTouchOutside(true); - - Window window = getWindow(); - WindowManager.LayoutParams params = window.getAttributes(); - params.height = WindowManager.LayoutParams.WRAP_CONTENT; - window.setGravity( Gravity.BOTTOM ); - window.setAttributes(params); - window.setWindowAnimations(R.style.DialogAnimation); - } - - @Override - public void onClick(View arg0) { - if(arg0 == mBtnRegister){ - mL.onClickRegister(); - } else if(arg0 == mBtnLogin){ - mL.onClickLogin(); - } else if (arg0 == mQQLogin) { - mL.onClickQQ(); - } else if (arg0 == mSinaLogin) { - mL.onClickWeibo(); - } else if (arg0 == mWeChatLogin) { - mL.onClickWeChat(); - } - dismiss(); - } - - public interface OnLoginPopupDialogListener{ - void onClickRegister(); - void onClickLogin(); - void onClickWeibo(); - void onClickQQ(); - void onClickWeChat(); - void dismissDialog(); - } -} diff --git a/app/src/main/res/drawable-xhdpi/ic_wechat_charge.webp b/app/src/main/res/drawable-xhdpi/ic_wechat_charge.webp deleted file mode 100644 index 0e94700131c931ae887814e77e9d1535648472e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 806 zcmV+>1KIpiNk&E<0{{S5MM6+kP&il$0000G0000l001ul06|PpNRI#j00IA?ppm48 zyZ@(m8w4ZxcZ7+ENGF1aZ@5U7;n*9z0Ab(R;`=W=0okYzt5Z6IjGI8T9>Ki z-lDboBw7hjDwP1P(y84IqETavdF^H0bp7Ujb5H7sC~}gy)CP)VS27;QU801CcA>~R9ZWRW^@jl0gd6zA=~kq#u>4q*)^!qJ zfB^paXNaob_)heHl`&n|8XsDC(gPO4O4ZsJz%lt1k_Z0-$<^dR9pKtcj>KPl0vo^h z!Y13p1mBo@Hkp+4b1DlB|8N;uB9d`T{>xT4;v*A0h}8Ckk`({v^V;ALI4zBQOI*U< z2!RgBcE?yP0sT-o9bgA2))@i)oKbxjcS+8q|1{q^|L?zIv+i<7{-s|+p%bkssT9~z zJQ#ca_yS*;qPho%r{Q>XB?H6H%TWO8Lrvs?w(+lQlsS2+HL0LEpE@FCvHPf@cbmoo zkp-0#uWZbY-vzQYmBK&{r!_Ij_b!S&22?E!87wmu^n9+;?w?&{e#SCDJuAP#&u;vE zI(~c+LFX5@P#=~gACw4r>QGC|5PCqPCcO1+66)B=7U1Q-M`l&6;T2~-tWOdaYzEP8 zE#Mh98{^r0XIGit%Ww;0e$x_oL<)1z;L9zn3WxN9lf*X2j;d}3EjdC!#??zv

1YRyE*H! k#3q-S?1%RRhch}NU*0pM5j93oVtbInCBt2UT%8X900>xlasU7T diff --git a/app/src/main/res/drawable-xxhdpi/ic_wechat_charge.webp b/app/src/main/res/drawable-xxhdpi/ic_wechat_charge.webp deleted file mode 100644 index e1dd450226082971f4bbcf9b87167f404267e3f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1148 zcmV-?1cUohNk&F=1ONb6MM6+kP&il$0000G0000-002h-06|PpNZSAa00Hm7IFh8c zVdn52WPV}_0PMIL?(k5izE(fvBar)AyM!0db*wV#1zu*x6$75tk^Efxfbl-*8|DMe$I&nRt@4jR57-Y*PiAlQ>=d@*g7>+$f0_M==lp+*!NmV` zhD?gazF#)pBwMs_dPu$cgB@De@c0n`nPJHnBWz?nq zaitYa#edN*nNKPpJ&Ce*UI-<{U{DB|hRgQPzQejbXt)S%IvtVhCrnPu2V`+7X zIe@Tr8AHv#P({$sJWXdfPK=S7%_^1mZ5;OgI=PF+@Q+!WBHIUhES4f7_vQa;T3l7h zh1Y0yGmJ``N|k}j-IyoKv#$1bJ+O2?cP;ZsAfaBKMgQ9;fOEFPSvF-#QULac^;Ft( z2Y(_Rmmjh|8-o2US8bYQK5AopQqH)lQ_CZ+&#*-b8*VCX(|?ah8gf4h}owbE{M@7S0PU-SkDAi2xO_XE=ATvNmpN`amBZq{3!nUMk(~~6FA`B@ z!I-Q=m#W2Twn70)VN9t;n7(}~l4g^s9~%alD(`%I?(nK)%EpTQh2i(JZqb}7CjS+F zCt0As^{*W+zkW$Z0002?t1F@a diff --git a/app/src/main/res/layout/dialog_new_user_charge_gift.xml b/app/src/main/res/layout/dialog_new_user_charge_gift.xml deleted file mode 100644 index ace5190b5..000000000 --- a/app/src/main/res/layout/dialog_new_user_charge_gift.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_select_pay_type.xml b/app/src/main/res/layout/dialog_select_pay_type.xml deleted file mode 100644 index 893347ac5..000000000 --- a/app/src/main/res/layout/dialog_select_pay_type.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_login_popup_dialog.xml b/app/src/main/res/layout/layout_login_popup_dialog.xml deleted file mode 100644 index 2261a7a81..000000000 --- a/app/src/main/res/layout/layout_login_popup_dialog.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -