From 982674828fdb5ea8f8cf25fb9af0cb11050a325b Mon Sep 17 00:00:00 2001 From: LoxiaLiSA Date: Tue, 11 Oct 2022 15:25:27 +0800 Subject: [PATCH 1/8] aa --- .idea/gradle.xml | 2 +- .../ceui/lisa/fragments/FragmentLogin.java | 282 ---------------- .../java/ceui/lisa/fragments/FragmentLogin.kt | 313 ++++++++++++++++++ .../main/java/ceui/lisa/utils/Settings.java | 2 +- .../main/res/drawable-hdpi/terms_checked.png | Bin 0 -> 1780 bytes .../main/res/drawable-mdpi/terms_checked.png | Bin 0 -> 1023 bytes .../main/res/drawable-xhdpi/terms_checked.png | Bin 0 -> 2607 bytes .../res/drawable-xxhdpi/terms_checked.png | Bin 0 -> 4689 bytes .../res/drawable-xxxhdpi/terms_checked.png | Bin 0 -> 6973 bytes app/src/main/res/drawable/ic_checkbox_off.xml | 14 + app/src/main/res/drawable/terms_checkbox.xml | 9 + app/src/main/res/layout/activity_login.xml | 50 ++- app/src/main/res/values/colors.xml | 24 ++ app/src/main/res/values/strings.xml | 4 + 14 files changed, 415 insertions(+), 285 deletions(-) delete mode 100644 app/src/main/java/ceui/lisa/fragments/FragmentLogin.java create mode 100644 app/src/main/java/ceui/lisa/fragments/FragmentLogin.kt create mode 100644 app/src/main/res/drawable-hdpi/terms_checked.png create mode 100644 app/src/main/res/drawable-mdpi/terms_checked.png create mode 100644 app/src/main/res/drawable-xhdpi/terms_checked.png create mode 100644 app/src/main/res/drawable-xxhdpi/terms_checked.png create mode 100644 app/src/main/res/drawable-xxxhdpi/terms_checked.png create mode 100644 app/src/main/res/drawable/ic_checkbox_off.xml create mode 100644 app/src/main/res/drawable/terms_checkbox.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 24cfd1027..d20d41162 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,6 +7,7 @@ - diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentLogin.java b/app/src/main/java/ceui/lisa/fragments/FragmentLogin.java deleted file mode 100644 index 58826ad35..000000000 --- a/app/src/main/java/ceui/lisa/fragments/FragmentLogin.java +++ /dev/null @@ -1,282 +0,0 @@ -package ceui.lisa.fragments; - -import android.content.DialogInterface; -import android.content.Intent; -import android.text.TextUtils; -import android.view.MenuItem; -import android.view.View; -import android.view.Window; -import android.widget.Toast; - -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.Toolbar; - -import com.facebook.rebound.SimpleSpringListener; -import com.facebook.rebound.Spring; -import com.facebook.rebound.SpringConfig; -import com.facebook.rebound.SpringSystem; -import com.qmuiteam.qmui.skin.QMUISkinManager; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; - -import java.util.Locale; - -import ceui.lisa.R; -import ceui.lisa.activities.MainActivity; -import ceui.lisa.activities.Shaft; -import ceui.lisa.activities.TemplateActivity; -import ceui.lisa.database.AppDatabase; -import ceui.lisa.database.UserEntity; -import ceui.lisa.databinding.ActivityLoginBinding; -import ceui.lisa.feature.HostManager; -import ceui.lisa.interfaces.FeedBack; -import ceui.lisa.models.UserModel; -import ceui.lisa.utils.ClipBoardUtils; -import ceui.lisa.utils.Common; -import ceui.lisa.utils.Dev; -import ceui.lisa.utils.Local; -import ceui.lisa.utils.Params; - -public class FragmentLogin extends BaseFragment { - - public static final String IOS_CLIENT_ID = "KzEZED7aC0vird8jWyHM38mXjNTY"; - public static final String IOS_CLIENT_SECRET = "W9JZoJe00qPvJsiyCGT3CCtC6ZUtdpKpzMbNlUGP"; - - public static final String CLIENT_ID = "MOBrBDS8blbauoSck0ZfDbtuzpyT"; - public static final String CLIENT_SECRET = "lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj"; - public static final String DEVICE_TOKEN = "pixiv"; - public static final String TYPE_PASSWORD = "password"; - public static final String REFRESH_TOKEN = "refresh_token"; - public static final String AUTH_CODE = "authorization_code"; - public static final String CALL_BACK = "https://app-api.pixiv.net/web/v1/users/auth/pixiv/callback"; - private static final String SIGN_TOKEN = "Bearer l-f9qZ0ZyqSwRyZs8-MymbtWBbSxmCu1pmbOlyisou8"; - private static final String SIGN_REF = "pixiv_android_app_provisional_account"; - - private static final String LOGIN_HEAD = "https://app-api.pixiv.net/web/v1/login?code_challenge="; - private static final String LOGIN_END = "&code_challenge_method=S256&client=pixiv-android"; - - private static final String SIGN_HEAD = "https://app-api.pixiv.net/web/v1/provisional-accounts/create?code_challenge="; - private static final String SIGN_END = "&code_challenge_method=S256&client=pixiv-android"; - private static final int TAPS_TO_BE_A_DEVELOPER = 7; - private final SpringSystem springSystem = SpringSystem.create(); - private Spring rotate; - private int mHitCountDown;// - private Toast mHitToast; - - @Override - public void onResume() { - super.onResume(); - mHitCountDown = TAPS_TO_BE_A_DEVELOPER; - } - - @Override - public void initLayout() { - mLayoutID = R.layout.activity_login; - } - - @Override - public void initView() { - baseBind.toolbar.setPadding(0, Shaft.statusHeight, 0, 0); - baseBind.toolbar.inflateMenu(R.menu.login_menu); - baseBind.toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem item) { - if (item.getItemId() == R.id.action_settings) { - Intent intent = new Intent(mContext, TemplateActivity.class); - intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "设置"); - startActivity(intent); - return true; - } else if (item.getItemId() == R.id.action_import) { - String userJson = ClipBoardUtils.getClipboardContent(mContext); - if (userJson != null - && !TextUtils.isEmpty(userJson) - && userJson.contains(Params.USER_KEY)) { - Common.showToast("导入成功", 2); - UserModel exportUser = Shaft.sGson.fromJson(userJson, UserModel.class); - Local.saveUser(exportUser); - Dev.refreshUser = true; - Shaft.sUserModel = exportUser; - - UserEntity userEntity = new UserEntity(); - userEntity.setLoginTime(System.currentTimeMillis()); - userEntity.setUserID(exportUser.getUser().getId()); - userEntity.setUserGson(Shaft.sGson.toJson(Local.getUser())); - AppDatabase.getAppDatabase(mContext).downloadDao().insertUser(userEntity); - - Intent intent = new Intent(mContext, MainActivity.class); - MainActivity.newInstance(intent, mContext); - mActivity.finish(); - } else { - Common.showToast("剪贴板无用户信息", 3); - } - return true; - } - return false; - } - }); - setTitle(); - baseBind.title.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mHitCountDown > 0) { - mHitCountDown--; - if (mHitCountDown == 0) { - showDialog(); - } else if (mHitCountDown > 0 && mHitCountDown < TAPS_TO_BE_A_DEVELOPER - 2) { - if (mHitToast != null) { - mHitToast.cancel(); - } - mHitToast = Toast.makeText(mActivity, String.format(Locale.getDefault(), - "点击%d次切换版本", mHitCountDown), Toast.LENGTH_SHORT); - mHitToast.show(); - } - } else { - showDialog(); - } - } - }); - baseBind.login.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - openProxyHint(() -> { - String url = LOGIN_HEAD + HostManager.get().getPkce().getChallenge() + LOGIN_END; - Intent intent = new Intent(mContext, TemplateActivity.class); - intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接"); - intent.putExtra(Params.URL, url); - intent.putExtra(Params.TITLE, getString(R.string.now_login)); - intent.putExtra(Params.PREFER_PRESERVE, true); - startActivity(intent); - }); - } - }); - - baseBind.sign.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - openProxyHint(() -> { - String url = SIGN_HEAD + HostManager.get().getPkce().getChallenge() + SIGN_END; - Intent intent = new Intent(mContext, TemplateActivity.class); - intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接"); - intent.putExtra(Params.URL, url); - intent.putExtra(Params.TITLE, getString(R.string.now_sign)); - intent.putExtra(Params.PREFER_PRESERVE, true); - startActivity(intent); - }); - } - }); - baseBind.hasNoAccount.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showSignCard(); - } - }); - baseBind.goToLogin.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showLoginCard(); - } - }); - } - - private void openProxyHint(FeedBack feedBack) { - QMUIDialog qmuiDialog = new QMUIDialog.MessageDialogBuilder(mContext) - .setTitle(mContext.getString(R.string.string_143)) - .setMessage(mContext.getString(R.string.string_360)) - .setSkinManager(QMUISkinManager.defaultInstance(mContext)) - .addAction(mContext.getString(R.string.cancel), new QMUIDialogAction.ActionListener() { - @Override - public void onClick(QMUIDialog dialog, int index) { - dialog.dismiss(); - } - }) - .addAction(mContext.getString(R.string.string_361), new QMUIDialogAction.ActionListener() { - @Override - public void onClick(QMUIDialog dialog, int index) { - feedBack.doSomething(); - dialog.dismiss(); - } - }) - .create(); - Window window = qmuiDialog.getWindow(); - if (window != null) { - window.setWindowAnimations(R.style.dialog_animation_scale); - } - qmuiDialog.show(); - } - - private void setTitle() { - if (Shaft.getMMKV().decodeBool(Params.USE_DEBUG, false)) { - baseBind.title.setText("Shaft(测试版)"); - } else { - baseBind.title.setText("Shaft"); - } - } - - private void showDialog() { - AlertDialog.Builder builder = new AlertDialog.Builder(mContext); - String[] titles = new String[]{"使用正式版", "使用测试版"}; - builder.setItems(titles, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (which == 0) { - Shaft.getMMKV().encode(Params.USE_DEBUG, false); - Dev.isDev = false; - } else if (which == 1) { - Shaft.getMMKV().encode(Params.USE_DEBUG, true); - Dev.isDev = true; - } - mHitCountDown = TAPS_TO_BE_A_DEVELOPER; - setTitle(); - } - }); - AlertDialog alertDialog = builder.create(); - alertDialog.show(); - } - - @Override - protected void initData() { - if (Shaft.getMMKV().decodeBool(Params.SHOW_DIALOG, true)) { - Common.createDialog(mContext); - } - rotate = springSystem.createSpring(); - rotate.setSpringConfig(SpringConfig.fromOrigamiTensionAndFriction(15, 8)); - } - - public void showSignCard() { - baseBind.fragmentLogin.setVisibility(View.INVISIBLE); - baseBind.fragmentSign.setVisibility(View.VISIBLE); - rotate.setCurrentValue(0); - baseBind.fragmentSign.setCameraDistance(80000.0f); - rotate.addListener(new SimpleSpringListener() { - @Override - public void onSpringUpdate(Spring spring) { - baseBind.fragmentSign.setRotationY((float) spring.getCurrentValue()); - } - - @Override - public void onSpringAtRest(Spring spring) { - - } - }); - rotate.setEndValue(360.0f); - } - - public void showLoginCard() { - baseBind.fragmentSign.setVisibility(View.INVISIBLE); - baseBind.fragmentLogin.setVisibility(View.VISIBLE); - rotate.setCurrentValue(0); - baseBind.fragmentLogin.setCameraDistance(80000.0f); - rotate.addListener(new SimpleSpringListener() { - @Override - public void onSpringUpdate(Spring spring) { - baseBind.fragmentLogin.setRotationY((float) spring.getCurrentValue()); - } - - @Override - public void onSpringAtRest(Spring spring) { - - } - }); - rotate.setEndValue(360.0f); - } -} diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentLogin.kt b/app/src/main/java/ceui/lisa/fragments/FragmentLogin.kt new file mode 100644 index 000000000..7833ec378 --- /dev/null +++ b/app/src/main/java/ceui/lisa/fragments/FragmentLogin.kt @@ -0,0 +1,313 @@ +package ceui.lisa.fragments + +import android.content.Intent +import android.text.SpannableString +import android.text.Spanned +import android.text.TextPaint +import android.text.TextUtils +import android.text.method.LinkMovementMethod +import android.text.style.ClickableSpan +import android.view.View +import android.widget.Toast +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.widget.Toolbar +import androidx.fragment.app.viewModels +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.lifecycleScope +import ceui.lisa.R +import ceui.lisa.fragments.BaseFragment +import com.facebook.rebound.SpringSystem +import com.facebook.rebound.Spring +import ceui.lisa.fragments.FragmentLogin +import ceui.lisa.activities.Shaft +import ceui.lisa.activities.TemplateActivity +import ceui.lisa.models.UserModel +import ceui.lisa.database.UserEntity +import ceui.lisa.database.AppDatabase +import ceui.lisa.activities.MainActivity +import ceui.lisa.databinding.ActivityLoginBinding +import ceui.lisa.interfaces.FeedBack +import ceui.lisa.feature.HostManager +import ceui.lisa.utils.* +import com.qmuiteam.qmui.widget.dialog.QMUIDialog +import com.qmuiteam.qmui.widget.dialog.QMUIDialog.MessageDialogBuilder +import com.qmuiteam.qmui.skin.QMUISkinManager +import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction +import com.facebook.rebound.SpringConfig +import com.facebook.rebound.SimpleSpringListener +import kotlinx.coroutines.launch +import java.util.* + +class LandingViewModel : ViewModel() { + + val isChecked = MutableLiveData(false) +} + +class FragmentLogin : BaseFragment() { + + private val viewModel: LandingViewModel by viewModels() + private val springSystem = SpringSystem.create() + private var rotate: Spring? = null + private var mHitCountDown // + = 0 + private var mHitToast: Toast? = null + override fun onResume() { + super.onResume() + mHitCountDown = TAPS_TO_BE_A_DEVELOPER + } + + public override fun initLayout() { + mLayoutID = R.layout.activity_login + } + + public override fun initView() { + baseBind.toolbar.setPadding(0, Shaft.statusHeight, 0, 0) + baseBind.toolbar.inflateMenu(R.menu.login_menu) + baseBind.toolbar.setOnMenuItemClickListener(Toolbar.OnMenuItemClickListener { item -> + if (item.itemId == R.id.action_settings) { + val intent = Intent(mContext, TemplateActivity::class.java) + intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "设置") + startActivity(intent) + return@OnMenuItemClickListener true + } else if (item.itemId == R.id.action_import) { + val userJson = ClipBoardUtils.getClipboardContent(mContext) + if (userJson != null && !TextUtils.isEmpty(userJson) + && userJson.contains(Params.USER_KEY) + ) { + Common.showToast("导入成功", 2) + val exportUser = Shaft.sGson.fromJson(userJson, UserModel::class.java) + Local.saveUser(exportUser) + Dev.refreshUser = true + Shaft.sUserModel = exportUser + val userEntity = UserEntity() + userEntity.loginTime = System.currentTimeMillis() + userEntity.userID = exportUser.user.id + userEntity.userGson = Shaft.sGson.toJson(Local.getUser()) + AppDatabase.getAppDatabase(mContext).downloadDao().insertUser(userEntity) + val intent = Intent(mContext, MainActivity::class.java) + MainActivity.newInstance(intent, mContext) + mActivity.finish() + } else { + Common.showToast("剪贴板无用户信息", 3) + } + return@OnMenuItemClickListener true + } + false + }) + setTitle() + baseBind.title.setOnClickListener { + if (mHitCountDown > 0) { + mHitCountDown-- + if (mHitCountDown == 0) { + showDialog() + } else if (mHitCountDown > 0 && mHitCountDown < TAPS_TO_BE_A_DEVELOPER - 2) { + if (mHitToast != null) { + mHitToast?.cancel() + } + mHitToast = Toast.makeText( + mActivity, String.format( + Locale.getDefault(), + "点击%d次切换版本", mHitCountDown + ), Toast.LENGTH_SHORT + ) + mHitToast?.show() + } + } else { + showDialog() + } + } + baseBind.login.setOnClickListener { + checkAndNext { + openProxyHint { + val url = LOGIN_HEAD + HostManager.get().pkce.challenge + LOGIN_END + val intent = Intent(mContext, TemplateActivity::class.java) + intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接") + intent.putExtra(Params.URL, url) + intent.putExtra(Params.TITLE, getString(R.string.now_login)) + intent.putExtra(Params.PREFER_PRESERVE, true) + startActivity(intent) + } + } + } + baseBind.sign.setOnClickListener { + checkAndNext { + openProxyHint { + val url = SIGN_HEAD + HostManager.get().pkce.challenge + SIGN_END + val intent = Intent(mContext, TemplateActivity::class.java) + intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接") + intent.putExtra(Params.URL, url) + intent.putExtra(Params.TITLE, getString(R.string.now_sign)) + intent.putExtra(Params.PREFER_PRESERVE, true) + startActivity(intent) + } + } + } + baseBind.hasNoAccount.setOnClickListener { showSignCard() } + baseBind.goToLogin.setOnClickListener { showLoginCard() } + baseBind.firstText.movementMethod = LinkMovementMethod.getInstance() + val matchTOS = getString(R.string.terms_of_service) + val matchPP = getString(R.string.privacy_policy) + val terms = String.format(getString(R.string.landing_terms_base), matchTOS, matchPP) + baseBind.firstText.text = SpannableString(terms).apply { + this.setLinkSpan(matchTOS, hideUnderLine = false) { + val intent = Intent(mContext, TemplateActivity::class.java) + intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接") + intent.putExtra(Params.URL, "https://www.pixiv.net/terms/?page=term&appname=pixiv_ios") + intent.putExtra(Params.TITLE, getString(R.string.pixiv_use_detail)) + startActivity(intent) + } + this.setLinkSpan(matchPP, hideUnderLine = false) { + val intent = Intent(mContext, TemplateActivity::class.java) + intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接") + intent.putExtra(Params.URL,"https://www.pixiv.net/terms/?page=privacy&appname=pixiv_ios") + intent.putExtra(Params.TITLE, getString(R.string.privacy)) + startActivity(intent) + } + } + viewModel.isChecked.observe(this) { + baseBind.checkboxOne.isSelected = it + } + + baseBind.checkboxOne.setOnClickListener { + val res = viewModel.isChecked.value ?: false + viewModel.isChecked.value = !res + } + } + + private fun openProxyHint(feedBack: FeedBack) { + val qmuiDialog = MessageDialogBuilder(mContext) + .setTitle(mContext.getString(R.string.string_143)) + .setMessage(mContext.getString(R.string.string_360)) + .setSkinManager(QMUISkinManager.defaultInstance(mContext)) + .addAction(mContext.getString(R.string.cancel)) { dialog, index -> dialog.dismiss() } + .addAction(mContext.getString(R.string.string_361)) { dialog, index -> + feedBack.doSomething() + dialog.dismiss() + } + .create() + val window = qmuiDialog.window + window?.setWindowAnimations(R.style.dialog_animation_scale) + qmuiDialog.show() + } + + private fun setTitle() { + if (Shaft.getMMKV().decodeBool(Params.USE_DEBUG, false)) { + baseBind.title.text = "Shaft(测试版)" + } else { + baseBind.title.text = "Shaft" + } + } + + private fun showDialog() { + val builder = AlertDialog.Builder(mContext) + val titles = arrayOf("使用正式版", "使用测试版") + builder.setItems(titles) { dialog, which -> + if (which == 0) { + Shaft.getMMKV().encode(Params.USE_DEBUG, false) + Dev.isDev = false + } else if (which == 1) { + Shaft.getMMKV().encode(Params.USE_DEBUG, true) + Dev.isDev = true + } + mHitCountDown = TAPS_TO_BE_A_DEVELOPER + setTitle() + } + val alertDialog = builder.create() + alertDialog.show() + } + + override fun initData() { + if (Shaft.getMMKV().decodeBool(Params.SHOW_DIALOG, true)) { + Common.createDialog(mContext) + } + rotate = springSystem.createSpring() + rotate?.springConfig = SpringConfig.fromOrigamiTensionAndFriction(15.0, 8.0) + } + + private fun checkAndNext(block: ()->Unit) { + if (viewModel.isChecked.value == true) { + block() + } else { + Toast.makeText(requireContext(), getString(R.string.read_agreement), Toast.LENGTH_SHORT).show() + } + } + + private fun showSignCard() { + baseBind.fragmentLogin.visibility = View.INVISIBLE + baseBind.fragmentSign.visibility = View.VISIBLE + rotate?.currentValue = 0.0 + baseBind.fragmentSign.cameraDistance = 80000.0f + rotate?.addListener(object : SimpleSpringListener() { + override fun onSpringUpdate(spring: Spring) { + baseBind.fragmentSign.rotationY = spring.currentValue.toFloat() + } + + override fun onSpringAtRest(spring: Spring) {} + }) + rotate?.endValue = 360.0 + } + + private fun showLoginCard() { + baseBind.fragmentSign.visibility = View.INVISIBLE + baseBind.fragmentLogin.visibility = View.VISIBLE + rotate?.currentValue = 0.0 + baseBind.fragmentLogin.cameraDistance = 80000.0f + rotate?.addListener(object : SimpleSpringListener() { + override fun onSpringUpdate(spring: Spring) { + baseBind.fragmentLogin.rotationY = spring.currentValue.toFloat() + } + + override fun onSpringAtRest(spring: Spring) {} + }) + rotate?.endValue = 360.0 + } + + companion object { + const val IOS_CLIENT_ID = "KzEZED7aC0vird8jWyHM38mXjNTY" + const val IOS_CLIENT_SECRET = "W9JZoJe00qPvJsiyCGT3CCtC6ZUtdpKpzMbNlUGP" + const val CLIENT_ID = "MOBrBDS8blbauoSck0ZfDbtuzpyT" + const val CLIENT_SECRET = "lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj" + const val DEVICE_TOKEN = "pixiv" + const val TYPE_PASSWORD = "password" + const val REFRESH_TOKEN = "refresh_token" + const val AUTH_CODE = "authorization_code" + const val CALL_BACK = "https://app-api.pixiv.net/web/v1/users/auth/pixiv/callback" + private const val SIGN_TOKEN = "Bearer l-f9qZ0ZyqSwRyZs8-MymbtWBbSxmCu1pmbOlyisou8" + private const val SIGN_REF = "pixiv_android_app_provisional_account" + private const val LOGIN_HEAD = "https://app-api.pixiv.net/web/v1/login?code_challenge=" + private const val LOGIN_END = "&code_challenge_method=S256&client=pixiv-android" + private const val SIGN_HEAD = + "https://app-api.pixiv.net/web/v1/provisional-accounts/create?code_challenge=" + private const val SIGN_END = "&code_challenge_method=S256&client=pixiv-android" + private const val TAPS_TO_BE_A_DEVELOPER = 7 + } +} + +fun SpannableString.setLinkSpan(text: String, hideUnderLine: Boolean = true, color:Int? = null, action: () -> Unit) { + val textIndex = this.indexOf(text) + if (textIndex >= 0) { + setSpan( + object : ClickableSpan() { + override fun onClick(widget: View) { + action() + } + + override fun updateDrawState(ds: TextPaint) { + color?.let { + ds.linkColor = it + } + if (hideUnderLine) { + ds.color = ds.linkColor + ds.isUnderlineText = false + } else { + super.updateDrawState(ds) + } + } + }, + textIndex, + textIndex + text.length, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/ceui/lisa/utils/Settings.java b/app/src/main/java/ceui/lisa/utils/Settings.java index 6a78756a7..e37e97aa6 100644 --- a/app/src/main/java/ceui/lisa/utils/Settings.java +++ b/app/src/main/java/ceui/lisa/utils/Settings.java @@ -83,7 +83,7 @@ public void setCurrentProgress(long currentProgress) { private boolean deleteStarIllust = false; //是否自动添加DNS，true开启直连 false自行代理 - private boolean autoFuckChina = true; + private boolean autoFuckChina = false; private boolean relatedIllustNoLimit = true; diff --git a/app/src/main/res/drawable-hdpi/terms_checked.png b/app/src/main/res/drawable-hdpi/terms_checked.png new file mode 100644 index 0000000000000000000000000000000000000000..3cd79c1ce7d3e3f7ccdc6aaac2f6ba03c94f6fb3 GIT binary patch literal 1780 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 R?lS-Y002ovPDHLkV1l&m!fOBk literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/terms_checked.png b/app/src/main/res/drawable-xxhdpi/terms_checked.png new file mode 100644 index 0000000000000000000000000000000000000000..ff5960aa6b91abd668b945728067b151e2c310aa GIT binary patch literal 4689 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 TUD}g*00000NkvXXu0mjfZ|%;` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/terms_checked.png b/app/src/main/res/drawable-xxxhdpi/terms_checked.png new file mode 100644 index 0000000000000000000000000000000000000000..4d89b40a5fc201e84fb6e0f4bcde772ee0add682 GIT binary patch literal 6973 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 P00000NkvXXu0mjf7K7xG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_checkbox_off.xml b/app/src/main/res/drawable/ic_checkbox_off.xml new file mode 100644 index 000000000..04877df99 --- /dev/null +++ b/app/src/main/res/drawable/ic_checkbox_off.xml @@ -0,0 +1,14 @@ + + + diff --git a/app/src/main/res/drawable/terms_checkbox.xml b/app/src/main/res/drawable/terms_checkbox.xml new file mode 100644 index 000000000..602478971 --- /dev/null +++ b/app/src/main/res/drawable/terms_checkbox.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 205cd694e..d2a83d994 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,6 +1,7 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -215,6 +216,53 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0686378ff..50e839c9d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -109,5 +109,29 @@ #ff445b #eaeaea + #FFFFFFFF + #0AFFFFFF + #14FFFFFF + #1AFFFFFF + #33FFFFFF + #1FFFFFFF + #26FFFFFF + #40FFFFFF + #4CFFFFFF + #66FFFFFF + #80FFFFFF + #99FFFFFF + #CCFFFFFF + #D9FFFFFF + #000000 + #1A000000 + #4C000000 + #66000000 + #80000000 + #99000000 + #CC000000 + #E6000000 + #F3000000 + #14000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d0f54edd..3cca4b57e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -643,4 +643,8 @@ 插画二级详情保持屏幕常亮 下载限制类型 不自动下载 + 服务条款 + 隐私政策 + 欢迎使用！继续即表示你同意 Shaft 的 %s 并且确认已阅读我们的 %s. + 请先阅读协议 From 65105ee2fc36d124af1aa70e05153aced059b00a Mon Sep 17 00:00:00 2001 From: LoxiaLiSA Date: Fri, 17 Feb 2023 11:52:41 +0800 Subject: [PATCH 2/8] gradle update --- app/build.gradle | 25 +++++++++++--------- app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 14 +++++++---- flowlayout-lib/build.gradle | 7 +++--- flowlayout-lib/src/main/AndroidManifest.xml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- models/build.gradle | 7 +++--- models/src/main/AndroidManifest.xml | 3 +-- progressmanager/build.gradle | 9 ++++--- progressmanager/src/main/AndroidManifest.xml | 4 +--- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f37ab3082..38960e9f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,12 +8,12 @@ apply plugin: 'org.jmailen.kotlinter' apply plugin: "androidx.navigation.safeargs" android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "ceui.lisa.pixiv" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 221 versionName "3.2.21" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -64,11 +64,14 @@ android { buildFeatures { dataBinding true } - packagingOptions { - exclude 'META-INF/MANIFEST.MF' + resources { + excludes += ['META-INF/MANIFEST.MF'] + } } + namespace 'ceui.lisa' + // lintOptions { // checkReleaseBuilds false // // Or, if you prefer, you can continue to check for errors in release builds, @@ -91,11 +94,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //=============== lifecycle - def lifecycle_version = '2.4.0' + def lifecycle_version = '2.5.1' implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" @@ -103,14 +106,14 @@ dependencies { //=============== Navigation - def nav_version = "2.3.5" + def nav_version = "2.5.3" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.6.0' + implementation "androidx.core:core-ktx:$kotlin_version" api 'com.squareup.retrofit2:retrofit:2.9.0' api 'com.squareup.retrofit2:converter-gson:2.9.0' @@ -155,8 +158,8 @@ dependencies { implementation 'com.github.skydoves:transformationlayout:1.1.1' implementation 'com.blankj:utilcodex:1.31.0' implementation 'com.safframework.log:saf-logginginterceptor:1.6.0' - implementation 'com.google.firebase:firebase-analytics:20.0.2' - implementation 'com.google.firebase:firebase-crashlytics:18.2.7' + implementation 'com.google.firebase:firebase-analytics:21.2.0' + implementation 'com.google.firebase:firebase-crashlytics:18.3.5' implementation 'com.afollestad:drag-select-recyclerview:2.4.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e1f16edcd..f339a95e0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,7 @@ + xmlns:tools="http://schemas.android.com/tools"> + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fdbc8533d..cede541c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/models/build.gradle b/models/build.gradle index 5f99e95d1..0b66ea514 100644 --- a/models/build.gradle +++ b/models/build.gradle @@ -2,13 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 33 defaultConfig { minSdkVersion 21 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" + targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -26,6 +24,7 @@ android { sourceCompatibility = '1.8' targetCompatibility = '1.8' } + namespace 'ceui.lisa.models' } dependencies { diff --git a/models/src/main/AndroidManifest.xml b/models/src/main/AndroidManifest.xml index 0734e7c26..94cbbcfc3 100644 --- a/models/src/main/AndroidManifest.xml +++ b/models/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/progressmanager/build.gradle b/progressmanager/build.gradle index 75809b58f..40b6a3d3a 100644 --- a/progressmanager/build.gradle +++ b/progressmanager/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 30 + compileSdkVersion 33 defaultConfig { minSdkVersion 21 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" + targetSdkVersion 33 testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -18,10 +16,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - lintOptions { + lint { abortOnError false warning 'InvalidPackage' } + namespace 'me.jessyan.progressmanager' } dependencies { diff --git a/progressmanager/src/main/AndroidManifest.xml b/progressmanager/src/main/AndroidManifest.xml index c383391e4..a2f47b605 100644 --- a/progressmanager/src/main/AndroidManifest.xml +++ b/progressmanager/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - + From ff805a7e6c42d2f3b62bcf5fca4934f9aa0e7b03 Mon Sep 17 00:00:00 2001 From: LoxiaLiSA Date: Sun, 19 Feb 2023 20:55:31 +0800 Subject: [PATCH 3/8] aa --- .idea/gradle.xml | 2 +- app/build.gradle | 4 ++ app/src/main/AndroidManifest.xml | 71 +++++++++---------- .../ceui/lisa/activities/MainActivity.java | 10 +-- app/src/main/java/ceui/loxia/ObjectPool.kt | 4 ++ .../main/java/ceui/loxia/test/ItemFragment.kt | 34 +++++++++ .../main/java/ceui/loxia/test/ListActivity.kt | 12 ++++ .../loxia/test/MyItemRecyclerViewAdapter.kt | 48 +++++++++++++ .../test/placeholder/PlaceholderContent.kt | 57 +++++++++++++++ app/src/main/res/layout/activity_list.xml | 10 +++ app/src/main/res/layout/fragment_item.xml | 20 ++++++ .../main/res/layout/fragment_item_list2.xml | 13 ++++ app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 2 +- build.gradle | 1 + 15 files changed, 245 insertions(+), 44 deletions(-) create mode 100644 app/src/main/java/ceui/loxia/ObjectPool.kt create mode 100644 app/src/main/java/ceui/loxia/test/ItemFragment.kt create mode 100644 app/src/main/java/ceui/loxia/test/ListActivity.kt create mode 100644 app/src/main/java/ceui/loxia/test/MyItemRecyclerViewAdapter.kt create mode 100644 app/src/main/java/ceui/loxia/test/placeholder/PlaceholderContent.kt create mode 100644 app/src/main/res/layout/activity_list.xml create mode 100644 app/src/main/res/layout/fragment_item.xml create mode 100644 app/src/main/res/layout/fragment_item_list2.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d20d41162..e145b66b7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ \ No newline at end of file diff --git a/app/src/main/java/ceui/lisa/activities/MainActivity.java b/app/src/main/java/ceui/lisa/activities/MainActivity.java index 2d037a20a..1dc26f15c 100644 --- a/app/src/main/java/ceui/lisa/activities/MainActivity.java +++ b/app/src/main/java/ceui/lisa/activities/MainActivity.java @@ -49,6 +49,7 @@ import ceui.lisa.utils.ReverseImage; import ceui.lisa.utils.ReverseWebviewCallback; import ceui.lisa.view.DrawerLayoutViewPager; +import ceui.loxia.test.ListActivity; import static ceui.lisa.activities.Shaft.sUserModel; @@ -235,10 +236,11 @@ protected void initData() { }); } } else { - Intent intent = new Intent(mContext, TemplateActivity.class); - intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "登录注册"); - startActivity(intent); - finish(); +// Intent intent = new Intent(mContext, TemplateActivity.class); +// intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "登录注册"); +// startActivity(intent); +// finish(); + startActivity(new Intent(this, ListActivity.class)); } } diff --git a/app/src/main/java/ceui/loxia/ObjectPool.kt b/app/src/main/java/ceui/loxia/ObjectPool.kt new file mode 100644 index 000000000..768357c84 --- /dev/null +++ b/app/src/main/java/ceui/loxia/ObjectPool.kt @@ -0,0 +1,4 @@ +package ceui.loxia + +class ObjectPool { +} \ No newline at end of file diff --git a/app/src/main/java/ceui/loxia/test/ItemFragment.kt b/app/src/main/java/ceui/loxia/test/ItemFragment.kt new file mode 100644 index 000000000..b90b0725b --- /dev/null +++ b/app/src/main/java/ceui/loxia/test/ItemFragment.kt @@ -0,0 +1,34 @@ +package ceui.loxia.test + +import android.os.Bundle +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import ceui.lisa.R +import ceui.loxia.test.placeholder.PlaceholderContent + +/** + * A fragment representing a list of Items. + */ +class ItemFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + val view = inflater.inflate(R.layout.fragment_item_list2, container, false) + + // Set the adapter + if (view is RecyclerView) { + with(view) { + layoutManager = LinearLayoutManager(context) + adapter = MyItemRecyclerViewAdapter(PlaceholderContent.ITEMS) + } + } + return view + } +} \ No newline at end of file diff --git a/app/src/main/java/ceui/loxia/test/ListActivity.kt b/app/src/main/java/ceui/loxia/test/ListActivity.kt new file mode 100644 index 000000000..4b90c7cf1 --- /dev/null +++ b/app/src/main/java/ceui/loxia/test/ListActivity.kt @@ -0,0 +1,12 @@ +package ceui.loxia.test + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import ceui.lisa.R + +class ListActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + } +} \ No newline at end of file diff --git a/app/src/main/java/ceui/loxia/test/MyItemRecyclerViewAdapter.kt b/app/src/main/java/ceui/loxia/test/MyItemRecyclerViewAdapter.kt new file mode 100644 index 000000000..8c4f2c5d3 --- /dev/null +++ b/app/src/main/java/ceui/loxia/test/MyItemRecyclerViewAdapter.kt @@ -0,0 +1,48 @@ +package ceui.loxia.test + +import androidx.recyclerview.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import ceui.lisa.R +import ceui.lisa.databinding.FragmentItemBinding + +import ceui.loxia.test.placeholder.PlaceholderContent.PlaceholderItem + +/** + * [RecyclerView.Adapter] that can display a [PlaceholderItem]. + * TODO: Replace the implementation with code for your data type. + */ +class MyItemRecyclerViewAdapter( + private val values: List +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + return ViewHolder( + FragmentItemBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + ) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val item = values[position] + holder.idView.text = item.id + holder.contentView.text = item.content + } + + override fun getItemCount(): Int = values.size + + inner class ViewHolder(binding: FragmentItemBinding) : RecyclerView.ViewHolder(binding.root) { + val idView: TextView = binding.itemNumber + val contentView: TextView = binding.content + + override fun toString(): String { + return super.toString() + " '" + contentView.text + "'" + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/ceui/loxia/test/placeholder/PlaceholderContent.kt b/app/src/main/java/ceui/loxia/test/placeholder/PlaceholderContent.kt new file mode 100644 index 000000000..86dc54331 --- /dev/null +++ b/app/src/main/java/ceui/loxia/test/placeholder/PlaceholderContent.kt @@ -0,0 +1,57 @@ +package ceui.loxia.test.placeholder + +import java.util.ArrayList +import java.util.HashMap + +/** + * Helper class for providing sample content for user interfaces created by + * Android template wizards. + * + * TODO: Replace all uses of this class before publishing your app. + */ +object PlaceholderContent { + + /** + * An array of sample (placeholder) items. + */ + val ITEMS: MutableList = ArrayList() + + /** + * A map of sample (placeholder) items, by ID. + */ + val ITEM_MAP: MutableMap = HashMap() + + private val COUNT = 100 + + init { + // Add some sample items. + for (i in 1..COUNT) { + addItem(createPlaceholderItem(i)) + } + } + + private fun addItem(item: PlaceholderItem) { + ITEMS.add(item) + ITEM_MAP.put(item.id, item) + } + + private fun createPlaceholderItem(position: Int): PlaceholderItem { + return PlaceholderItem(position.toString(), "Item " + position, makeDetails(position)) + } + + private fun makeDetails(position: Int): String { + val builder = StringBuilder() + builder.append("Details about Item: ").append(position) + for (i in 0..position - 1) { + builder.append("\nMore details information here.") + } + return builder.toString() + } + + /** + * A placeholder item representing a piece of content. + */ + data class PlaceholderItem(val id: String, val content: String, val details: String) { + override fun toString(): String = content + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 000000000..2ad140883 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_item.xml b/app/src/main/res/layout/fragment_item.xml new file mode 100644 index 000000000..18775687a --- /dev/null +++ b/app/src/main/res/layout/fragment_item.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_item_list2.xml b/app/src/main/res/layout/fragment_item_list2.xml new file mode 100644 index 000000000..a76155fb8 --- /dev/null +++ b/app/src/main/res/layout/fragment_item_list2.xml @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 0919468d7..c994556a8 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -17,4 +17,5 @@ 160dp 96dp 20dp + 16dp \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2dbc38a01..408b9bf98 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -581,7 +581,7 @@ 公开 私人 作品二级详情翻页模式 - + 文本 关键词 收藏作品时展示关联作品 diff --git a/build.gradle b/build.gradle index d4736932d..3ed21e637 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,7 @@ buildscript { plugins { id "com.github.ben-manes.versions" version "0.41.0" + id 'org.jetbrains.kotlin.android' version '1.8.0' apply false } allprojects { From 9f08f0cceb61c64715ffdc25fd095ce9415cfe9d Mon Sep 17 00:00:00 2001 From: LoxiaLiSA Date: Mon, 20 Feb 2023 12:28:09 +0800 Subject: [PATCH 4/8] core code --- .idea/gradle.xml | 1 - .../ceui/lisa/activities/MainActivity.java | 9 +- .../main/java/ceui/loxia/test/ItemFragment.kt | 37 ++--- .../loxia/test/MyItemRecyclerViewAdapter.kt | 48 ------ .../test/placeholder/PlaceholderContent.kt | 57 ------- .../main/java/ceui/refactor/CommonAdapter.kt | 141 ++++++++++++++++++ .../refactor/FragmentViewBindingDelegate.kt | 112 ++++++++++++++ app/src/main/java/ceui/refactor/KUtils.kt | 56 +++++++ .../java/ceui/refactor/ViewHolderMapping.kt | 43 ++++++ .../main/res/animator/button_press_alpha.xml | 24 +++ app/src/main/res/layout/cell_none.xml | 12 ++ app/src/main/res/layout/fragment_item.xml | 20 --- .../main/res/layout/fragment_item_aaaa.xml | 28 ++++ .../main/res/layout/fragment_item_bbbb.xml | 28 ++++ .../main/res/layout/fragment_item_list2.xml | 2 +- 15 files changed, 468 insertions(+), 150 deletions(-) delete mode 100644 app/src/main/java/ceui/loxia/test/MyItemRecyclerViewAdapter.kt delete mode 100644 app/src/main/java/ceui/loxia/test/placeholder/PlaceholderContent.kt create mode 100644 app/src/main/java/ceui/refactor/CommonAdapter.kt create mode 100644 app/src/main/java/ceui/refactor/FragmentViewBindingDelegate.kt create mode 100644 app/src/main/java/ceui/refactor/KUtils.kt create mode 100644 app/src/main/java/ceui/refactor/ViewHolderMapping.kt create mode 100644 app/src/main/res/animator/button_press_alpha.xml create mode 100644 app/src/main/res/layout/cell_none.xml delete mode 100644 app/src/main/res/layout/fragment_item.xml create mode 100644 app/src/main/res/layout/fragment_item_aaaa.xml create mode 100644 app/src/main/res/layout/fragment_item_bbbb.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e145b66b7..150fd8ef3 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,6 @@ - + diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 431e63e9d..173ff871f 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -36,7 +36,7 @@ - @@ -350,7 +350,7 @@ - + diff --git a/app/src/main/res/layout/fragment_base_list.xml b/app/src/main/res/layout/fragment_base_list.xml index 28924d9e2..f3a4b9722 100644 --- a/app/src/main/res/layout/fragment_base_list.xml +++ b/app/src/main/res/layout/fragment_base_list.xml @@ -40,7 +40,7 @@ - - + - - + - + - + diff --git a/app/src/main/res/layout/fragment_edit_file.xml b/app/src/main/res/layout/fragment_edit_file.xml index d72225d38..488cb48d1 100644 --- a/app/src/main/res/layout/fragment_edit_file.xml +++ b/app/src/main/res/layout/fragment_edit_file.xml @@ -16,7 +16,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar_layout" /> - - + - - + - - + - @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + diff --git a/app/src/main/res/layout/fragment_item_list2.xml b/app/src/main/res/layout/fragment_item_list2.xml deleted file mode 100644 index 9130ba902..000000000 --- a/app/src/main/res/layout/fragment_item_list2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_local_user.xml b/app/src/main/res/layout/fragment_local_user.xml index 964e4c45b..2640ea226 100644 --- a/app/src/main/res/layout/fragment_local_user.xml +++ b/app/src/main/res/layout/fragment_local_user.xml @@ -14,7 +14,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar_layout" /> - - + - - + - - + - @@ -225,7 +225,7 @@ - + diff --git a/app/src/main/res/layout/fragment_new_right.xml b/app/src/main/res/layout/fragment_new_right.xml index 161be41d4..4bf44a964 100644 --- a/app/src/main/res/layout/fragment_new_right.xml +++ b/app/src/main/res/layout/fragment_new_right.xml @@ -161,7 +161,7 @@ - @@ -171,7 +171,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + diff --git a/app/src/main/res/layout/fragment_novel_series.xml b/app/src/main/res/layout/fragment_novel_series.xml index a312e229e..2382c80e9 100644 --- a/app/src/main/res/layout/fragment_novel_series.xml +++ b/app/src/main/res/layout/fragment_novel_series.xml @@ -12,7 +12,7 @@ - - + diff --git a/app/src/main/res/layout/fragment_pivision_horizontal.xml b/app/src/main/res/layout/fragment_pivision_horizontal.xml index a052310e5..2c1ad8066 100644 --- a/app/src/main/res/layout/fragment_pivision_horizontal.xml +++ b/app/src/main/res/layout/fragment_pivision_horizontal.xml @@ -50,7 +50,7 @@ - - + - - + - @@ -1182,7 +1182,7 @@ - + diff --git a/app/src/main/res/layout/fragment_single_illust.xml b/app/src/main/res/layout/fragment_single_illust.xml index dddfbf36d..881bc1cd2 100644 --- a/app/src/main/res/layout/fragment_single_illust.xml +++ b/app/src/main/res/layout/fragment_single_illust.xml @@ -21,7 +21,7 @@ android:scaleType="centerCrop" /> - @@ -352,7 +352,7 @@ - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ugora.xml b/app/src/main/res/layout/fragment_ugora.xml index 0f249353f..253aea070 100644 --- a/app/src/main/res/layout/fragment_ugora.xml +++ b/app/src/main/res/layout/fragment_ugora.xml @@ -21,7 +21,7 @@ android:scaleType="centerCrop" /> - @@ -334,7 +334,7 @@ - + - - + - @@ -23,7 +23,7 @@ android:layout_height="match_parent"> - + - - + diff --git a/app/src/main/res/layout/fragment_user_right.xml b/app/src/main/res/layout/fragment_user_right.xml index bef45fec8..1b9dd982c 100644 --- a/app/src/main/res/layout/fragment_user_right.xml +++ b/app/src/main/res/layout/fragment_user_right.xml @@ -6,7 +6,7 @@ - @@ -230,6 +230,6 @@ - + diff --git a/app/src/main/res/layout/fragment_work_space.xml b/app/src/main/res/layout/fragment_work_space.xml index a5e39abff..6c28ba33a 100644 --- a/app/src/main/res/layout/fragment_work_space.xml +++ b/app/src/main/res/layout/fragment_work_space.xml @@ -13,7 +13,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar_layout"/> - - + + + + + + + + + + + + + + + + + + +