diff --git a/.idea/.name b/.idea/.name index 8c777b8..5c612a1 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -WebShell \ No newline at end of file +Wrapping \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index ce15689..a408673 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -44,6 +44,12 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 07c3823..6f5c5ec 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -17,6 +17,8 @@ diff --git a/base/src/main/java/com/webclip/base/BaseObserver.java b/base/src/main/java/com/webclip/base/BaseObserver.java index 7030489..846007d 100644 --- a/base/src/main/java/com/webclip/base/BaseObserver.java +++ b/base/src/main/java/com/webclip/base/BaseObserver.java @@ -90,7 +90,7 @@ public abstract class BaseObserver extends DisposableObserver { break; case PARSE_ERROR: - onError(PARSE_ERROR, "宇宙也是有尽头的"); + onError(PARSE_ERROR, "鬼晓得是什么格式的数据 臣妾解析不出来！"); break; diff --git a/build.gradle b/build.gradle index 2515f71..88847a5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,12 +3,15 @@ plugins { alias(libs.plugins.android.application) apply false id 'com.google.gms.google-services' version '4.3.15' apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.plugin.compose) apply false + } ext { outputPath = "F:/webApp2" - versionCode = 133 - versionName = "v1.3.3" + versionCode = 134 + versionName = "v1.3.4" namespace = "com.webclip.base" JAVA_VERSION = JavaVersion.VERSION_17 } \ No newline at end of file diff --git a/workbuddy/.gitignore b/fight996/.gitignore similarity index 100% rename from workbuddy/.gitignore rename to fight996/.gitignore diff --git a/workbuddy/build.gradle b/fight996/build.gradle similarity index 82% rename from workbuddy/build.gradle rename to fight996/build.gradle index 5a00537..c0d8b4f 100644 --- a/workbuddy/build.gradle +++ b/fight996/build.gradle @@ -1,10 +1,9 @@ plugins { id 'com.android.application' id 'com.google.gms.google-services' - } -def appOutPutName = "winway-calculator-v3.2.4-44" +def appOutPutName = "fight996gjdfklgjdkfhgfkdlhdf" android { namespace rootProject.ext.namespace @@ -12,26 +11,26 @@ android { defaultConfig { minSdkVersion 24 targetSdk 36 - versionCode 45 - versionName "3.2.5" + versionCode rootProject.ext.versionCode + versionName rootProject.ext.versionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //包名 + applicationId "com.xyz.fight996" //app大背景色 - applicationId "com.claw.workbuddy" - resValue('color', 'windows_color', '#FFFFFF') + resValue('color', 'windows_color', '#fcfcfc') //底部导航栏颜色 大背景颜色为 windows_color——style_color的上下渐变色 - resValue('color', 'style_color', '#FFFFFF') + resValue('color', 'style_color', '#f6f6f6') //app 名字 - resValue('string', 'app_name', 'WORKBUDDY') + resValue('string', 'app_name', 'FIGHT996') //预埋订阅网址 - buildConfigField "String", "BASE_URL", "\"https://winway33.site/\"" + buildConfigField "String", "BASE_URL", "\"https://fight996au.com/\"" //后台唯一ID - buildConfigField "int", "USERID", "4" + buildConfigField "int", "USERID", "259" //状态栏文字颜色是否为白色 buildConfigField "boolean", "IS_WHITE", "false" //是否强转启动图为圆形 - buildConfigField "boolean", "IS_ROUND", "true" + buildConfigField "boolean", "IS_ROUND", "false" //IS_ROUND 为 true时 圆角启动logo的 圆角大小 为0 表示为圆形 否则为ROUND_RADIUS的 dp2px的 数字大小 buildConfigField "int", "ROUND_RADIUS", "10" //已废弃 @@ -42,6 +41,7 @@ android { } buildFeatures { buildConfig = true + resValues = true } signingConfigs { @@ -58,11 +58,6 @@ android { keyPassword "123456" } } - buildFeatures { - viewBinding true - } - - buildTypes { release { diff --git a/workbuddy/google-services.json b/fight996/google-services.json similarity index 52% rename from workbuddy/google-services.json rename to fight996/google-services.json index ca2a1ba..fe1e4c7 100644 --- a/workbuddy/google-services.json +++ b/fight996/google-services.json @@ -1,21 +1,21 @@ { "project_info": { - "project_number": "66230459052", - "project_id": "just-way-eb6ae", - "storage_bucket": "just-way-eb6ae.firebasestorage.app" + "project_number": "494326046923", + "project_id": "fight996-994a8", + "storage_bucket": "fight996-994a8.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:66230459052:android:1782975166f8b0bb35dd09", + "mobilesdk_app_id": "1:494326046923:android:f6feac605a2e0536b37b4e", "android_client_info": { - "package_name": "com.claw.workbuddy" + "package_name": "com.xyz.fight996" } }, "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyAMJUxbpF8L-HqRKzcm4v8PErxBgo8UAMI" + "current_key": "AIzaSyCIvHWOX0i0-FEITEC44bgK8zsA3KwEuPQ" } ], "services": { diff --git a/workbuddy/justlet.jks b/fight996/justlet.jks similarity index 100% rename from workbuddy/justlet.jks rename to fight996/justlet.jks diff --git a/workbuddy/proguard-rules.pro b/fight996/proguard-rules.pro similarity index 100% rename from workbuddy/proguard-rules.pro rename to fight996/proguard-rules.pro diff --git a/workbuddy/src/main/AndroidManifest.xml b/fight996/src/main/AndroidManifest.xml similarity index 90% rename from workbuddy/src/main/AndroidManifest.xml rename to fight996/src/main/AndroidManifest.xml index 73e1a4f..6dcbaf3 100644 --- a/workbuddy/src/main/AndroidManifest.xml +++ b/fight996/src/main/AndroidManifest.xml @@ -13,19 +13,18 @@ android:name=".WebApplication" android:allowBackup="true" android:hardwareAccelerated="true" - android:icon="@mipmap/app_logo" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" - android:roundIcon="@mipmap/app_logo" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppThemeStart" android:usesCleartextTraffic="true"> diff --git a/fight996/src/main/ic_launcher-playstore.png b/fight996/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..aa0aecb Binary files /dev/null and b/fight996/src/main/ic_launcher-playstore.png differ diff --git a/workbuddy/src/main/java/com/webclip/base/IndexActivity.java b/fight996/src/main/java/com/webclip/base/IndexActivity.java similarity index 95% rename from workbuddy/src/main/java/com/webclip/base/IndexActivity.java rename to fight996/src/main/java/com/webclip/base/IndexActivity.java index a170c56..88c542b 100644 --- a/workbuddy/src/main/java/com/webclip/base/IndexActivity.java +++ b/fight996/src/main/java/com/webclip/base/IndexActivity.java @@ -11,6 +11,7 @@ public class IndexActivity extends MainActivity { initConfig(); super.onCreate(savedInstanceState); initWinwdowLogoConfig(); +// registerFCM(); } @Override @@ -51,8 +52,9 @@ public class IndexActivity extends MainActivity { setBackDrawables(R.drawable.big_bg); setImageView(BuildConfig.IS_ROUND,BuildConfig.ROUND_RADIUS); getWindow().getDecorView().setBackgroundResource(R.drawable.big_bg); - //需要修改启动页logo在这里弄 一般启动页logo就是app_logo 没特殊要求 不要动 +// activityMain2Binding.showTopV.setImageResource(R.mipmap.ic_launcher); + } /** diff --git a/workbuddy/src/main/java/com/webclip/base/MyFirebaseMessageingService.java b/fight996/src/main/java/com/webclip/base/MyFirebaseMessageingService.java similarity index 100% rename from workbuddy/src/main/java/com/webclip/base/MyFirebaseMessageingService.java rename to fight996/src/main/java/com/webclip/base/MyFirebaseMessageingService.java diff --git a/workbuddy/src/main/java/com/webclip/base/WebApplication.java b/fight996/src/main/java/com/webclip/base/WebApplication.java similarity index 99% rename from workbuddy/src/main/java/com/webclip/base/WebApplication.java rename to fight996/src/main/java/com/webclip/base/WebApplication.java index bcf32e2..36e2512 100644 --- a/workbuddy/src/main/java/com/webclip/base/WebApplication.java +++ b/fight996/src/main/java/com/webclip/base/WebApplication.java @@ -5,7 +5,6 @@ import android.content.Context; import com.webclip.base.LogUtils; - public class WebApplication extends Application { diff --git a/workbuddy/src/main/res/drawable/big_bg.xml b/fight996/src/main/res/drawable/big_bg.xml similarity index 100% rename from workbuddy/src/main/res/drawable/big_bg.xml rename to fight996/src/main/res/drawable/big_bg.xml diff --git a/fight996/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/fight996/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/fight996/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/fight996/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/fight996/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/fight996/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/fight996/src/main/res/mipmap-hdpi/ic_launcher.webp b/fight996/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..d019430 Binary files /dev/null and b/fight996/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/fight996/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/fight996/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..4890ca7 Binary files /dev/null and b/fight996/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/fight996/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/fight996/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..c373571 Binary files /dev/null and b/fight996/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/fight996/src/main/res/mipmap-mdpi/ic_launcher.webp b/fight996/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..3dde43a Binary files /dev/null and b/fight996/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/fight996/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/fight996/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..da0ecad Binary files /dev/null and b/fight996/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/fight996/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/fight996/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..335ed0a Binary files /dev/null and b/fight996/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/fight996/src/main/res/mipmap-xhdpi/ic_launcher.webp b/fight996/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..beb59d2 Binary files /dev/null and b/fight996/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/fight996/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/fight996/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..043aabe Binary files /dev/null and b/fight996/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/fight996/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/fight996/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..a0a09c3 Binary files /dev/null and b/fight996/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/fight996/src/main/res/mipmap-xxhdpi/app_logo.png b/fight996/src/main/res/mipmap-xxhdpi/app_logo.png new file mode 100644 index 0000000..0d71706 Binary files /dev/null and b/fight996/src/main/res/mipmap-xxhdpi/app_logo.png differ diff --git a/fight996/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/fight996/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..51ec1ff Binary files /dev/null and b/fight996/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/fight996/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/fight996/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..0d538f1 Binary files /dev/null and b/fight996/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/fight996/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/fight996/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..efd831d Binary files /dev/null and b/fight996/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..ff96ab1 Binary files /dev/null and b/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..50487a8 Binary files /dev/null and b/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..a98f702 Binary files /dev/null and b/fight996/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/fight996/src/main/res/values/ic_launcher_background.xml b/fight996/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/fight996/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/workbuddy/src/main/res/values/themes.xml b/fight996/src/main/res/values/themes.xml similarity index 100% rename from workbuddy/src/main/res/values/themes.xml rename to fight996/src/main/res/values/themes.xml diff --git a/workbuddy/src/main/res/xml/app_updater_paths.xml b/fight996/src/main/res/xml/app_updater_paths.xml similarity index 100% rename from workbuddy/src/main/res/xml/app_updater_paths.xml rename to fight996/src/main/res/xml/app_updater_paths.xml diff --git a/workbuddy/src/main/res/xml/network_security_config.xml b/fight996/src/main/res/xml/network_security_config.xml similarity index 100% rename from workbuddy/src/main/res/xml/network_security_config.xml rename to fight996/src/main/res/xml/network_security_config.xml diff --git a/workbuddy/src/main/res/xml/provider_paths.xml b/fight996/src/main/res/xml/provider_paths.xml similarity index 100% rename from workbuddy/src/main/res/xml/provider_paths.xml rename to fight996/src/main/res/xml/provider_paths.xml diff --git a/gk9/dskjweb.jks b/gk9/dskjweb.jks new file mode 100644 index 0000000..a303350 Binary files /dev/null and b/gk9/dskjweb.jks differ diff --git a/gk9/google-services.json b/gk9/google-services.json new file mode 100644 index 0000000..f60f7c0 --- /dev/null +++ b/gk9/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "38078249850", + "project_id": "g1k29-a80c6", + "storage_bucket": "g1k29-a80c6.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:38078249850:android:c30a00ff0fda995b5374c3", + "android_client_info": { + "package_name": "com.xyz.gk9webclip" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyD__DYnCJh2RTPR6TOFFZGOgYjwFetuhnc" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/gk9/src/main/res/mipmap-xxhdpi/app_logo.png b/gk9/src/main/res/mipmap-xxhdpi/app_logo.png new file mode 100644 index 0000000..ffc3095 Binary files /dev/null and b/gk9/src/main/res/mipmap-xxhdpi/app_logo.png differ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 15443c0..e46b21a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,13 @@ activity = "1.8.0" constraintlayout = "2.1.4" playServicesBase = "18.10.0" viewpager2 = "1.1.0" - +kotlin = "2.2.0" +coreKtx = "1.10.1" +uiAndroid = "1.10.5" +material3Jvmstubs = "1.4.0" +material3Android = "1.4.0" +navigationComposeAndroid = "2.9.7" +pluginCompose = "2.0.20" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } @@ -20,7 +26,14 @@ activity = { group = "androidx.activity", name = "activity", version.ref = "acti constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } play-services-base = { group = "com.google.android.gms", name = "play-services-base", version.ref = "playServicesBase" } viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" } +core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "uiAndroid" } +material3-jvmstubs = { group = "androidx.compose.material3", name = "material3-jvmstubs", version.ref = "material3Jvmstubs" } +material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" } +navigation-compose-android = { group = "androidx.navigation", name = "navigation-compose-android", version.ref = "navigationComposeAndroid" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "pluginCompose" } diff --git a/settings.gradle b/settings.gradle index 61045d1..3e2cb7b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,17 +21,18 @@ dependencyResolutionManagement { rootProject.name = "Wrapping" include ':powercuci'//253 -include ':base'//只包含 版本更新功能 -include ':base_noupdata' //包含版本更新功能 但是版本更新是跳外部浏览器 纯纯纯静 +include ':base'//基础libs 只包含 版本更新功能 +include ':base_noupdata' //基础libs 包含版本更新功能 但是版本更新是跳外部浏览器 纯纯纯静 include ':telur33'//100 include ':lorongjudi33'//252 include ':cucislot365'//242 include ':1xhuat'//248 include ':winway'//4 include ':winway_jisuanqi'//4 -include ':workbuddy' include ':protein'//254 include ':1xsgd'//255 include ':redspin8'//256 include ':aa7au'//257 include ':bng1au'//258 +include ':gk9'//213 +include ':fight996'//259 \ No newline at end of file diff --git a/workbuddy/src/main/java/com/webclip/base/TestActivity.java b/workbuddy/src/main/java/com/webclip/base/TestActivity.java deleted file mode 100644 index 93323dd..0000000 --- a/workbuddy/src/main/java/com/webclip/base/TestActivity.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.webclip.base; - -import android.os.Bundle; -import android.view.View; -import android.view.WindowManager; - -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.webclip.base.comm.CommonAdapter; -import com.webclip.base.comm.ViewHolder; -import com.webclip.base.databinding.ScheduleMainBinding; - -import java.util.ArrayList; -import java.util.List; - - -public class TestActivity extends AppCompatActivity { - - ScheduleMainBinding activityStartBinding; - - CommonAdapter commonHotGameAdapter; - - List liveList = new ArrayList<>(); - @Override - protected void onCreate(Bundle savedInstanceState) { - getWindow().setNavigationBarColor(getColor(R.color.white)); - super.onCreate(savedInstanceState); - View decor = getWindow().getDecorView(); - getWindow().setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); - decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - ActionBar actionBar = getSupportActionBar(); - if (actionBar != null) { - actionBar.hide(); - } - activityStartBinding = ScheduleMainBinding.inflate(getLayoutInflater()); - setContentView(activityStartBinding.getRoot()); - - initAdapter(); - initAdapterData(); - } - - - private void initAdapterData() { - LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this); - linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - activityStartBinding.dateSelector.dateList.setLayoutManager(linearLayoutManager); - commonHotGameAdapter = new CommonAdapter(TestActivity.this, R.layout.date_item, liveList) { - @Override - public void convert(ViewHolder holder, Integer s, int index) { - - } - }; - activityStartBinding.dateSelector.dateList.setAdapter(commonHotGameAdapter); - } - - private void initAdapter() { - - for (int i = 0 ;i<20;i++){ - liveList.add(i); - } - - activityStartBinding.scheduleList.setLayoutManager(new LinearLayoutManager(this)); - commonHotGameAdapter = new CommonAdapter(TestActivity.this, R.layout.schedule_item, liveList) { - @Override - public void convert(ViewHolder holder, Integer s, int index) { - - } - }; - activityStartBinding.scheduleList.setAdapter(commonHotGameAdapter); - } - - - @Override - protected void onDestroy() { - super.onDestroy(); - } -} \ No newline at end of file diff --git a/workbuddy/src/main/java/com/webclip/base/comm/CommonAdapter.java b/workbuddy/src/main/java/com/webclip/base/comm/CommonAdapter.java deleted file mode 100644 index 0ab2682..0000000 --- a/workbuddy/src/main/java/com/webclip/base/comm/CommonAdapter.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.webclip.base.comm; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import java.util.List; - -/** - * 通用列表适配器 - * @param - */ -public abstract class CommonAdapter extends RecyclerView.Adapter { - - protected Context mContext; - protected int mLayoutId; - protected List mDatas; - protected LayoutInflater mInflater; - - ViewHolder viewHolder; - - - public CommonAdapter(Context context, int layoutId, List datas) { - mContext = context; - mInflater = LayoutInflater.from(context); - mLayoutId = layoutId; - mDatas = datas; - } - public void setDates(List dates){ - this.mDatas=dates; -// notifyItemRangeChanged(0,mDatas.size()); - notifyDataSetChanged(); - } - public void addDates(List dates){ - this.mDatas.addAll(dates); - notifyDataSetChanged(); - } - - public void addDates(int localSize){ - int size=mDatas.size(); - notifyItemRangeChanged(size,localSize); - } - - @NonNull - @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - viewHolder = ViewHolder.get(mContext, parent, mLayoutId); - return viewHolder; - } - - - @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { - - convert(holder, mDatas.get(position),position); - } - - public abstract void convert(ViewHolder holder, T t,int index); - - - @Override - public int getItemCount() { - return mDatas.size(); - } -} diff --git a/workbuddy/src/main/java/com/webclip/base/comm/ViewHolder.java b/workbuddy/src/main/java/com/webclip/base/comm/ViewHolder.java deleted file mode 100644 index 1f9f43f..0000000 --- a/workbuddy/src/main/java/com/webclip/base/comm/ViewHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.webclip.base.comm; - -import android.content.Context; -import android.util.SparseArray; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.recyclerview.widget.RecyclerView; - -/** - * 通用列表ViewHolder - */ -public class ViewHolder extends RecyclerView.ViewHolder { - - private SparseArray mViews; - private View mConvertView; - private Context mContext; - - public ViewHolder(Context context, View itemView, ViewGroup parent) { - super(itemView); - mContext = context; - mConvertView = itemView; - mViews = new SparseArray(); - } - - public static ViewHolder get(Context context, ViewGroup parent, int layoutId) { - - View itemView = LayoutInflater.from(context).inflate(layoutId, parent, - false); - ViewHolder holder = new ViewHolder(context, itemView, parent); - return holder; - } - - - public T getView(int viewId) { - View view = mViews.get(viewId); - if (view == null) { - view = mConvertView.findViewById(viewId); - mViews.put(viewId, view); - } - return (T) view; - } - - - public ViewHolder setText(int viewId, String text) - { - TextView tv = getView(viewId); - tv.setText(text); - return this; - } - - public ViewHolder setOnClickListener(int viewId, View.OnClickListener listener) { - View view = getView(viewId); - view.setOnClickListener(listener); - return this; - } - -} diff --git a/workbuddy/src/main/res/drawable/bg_button_outline.xml b/workbuddy/src/main/res/drawable/bg_button_outline.xml deleted file mode 100644 index 91ee96c..0000000 --- a/workbuddy/src/main/res/drawable/bg_button_outline.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/workbuddy/src/main/res/drawable/bg_button_primary.xml b/workbuddy/src/main/res/drawable/bg_button_primary.xml deleted file mode 100644 index 710d5db..0000000 --- a/workbuddy/src/main/res/drawable/bg_button_primary.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/workbuddy/src/main/res/drawable/bg_date_unselected.xml b/workbuddy/src/main/res/drawable/bg_date_unselected.xml deleted file mode 100644 index 72dc375..0000000 --- a/workbuddy/src/main/res/drawable/bg_date_unselected.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/workbuddy/src/main/res/drawable/bg_status_live.xml b/workbuddy/src/main/res/drawable/bg_status_live.xml deleted file mode 100644 index 4e4caf9..0000000 --- a/workbuddy/src/main/res/drawable/bg_status_live.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/workbuddy/src/main/res/drawable/bg_today_button.xml b/workbuddy/src/main/res/drawable/bg_today_button.xml deleted file mode 100644 index bd94b4a..0000000 --- a/workbuddy/src/main/res/drawable/bg_today_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/workbuddy/src/main/res/layout/date_item.xml b/workbuddy/src/main/res/layout/date_item.xml deleted file mode 100644 index 14310d8..0000000 --- a/workbuddy/src/main/res/layout/date_item.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/workbuddy/src/main/res/layout/date_selector.xml b/workbuddy/src/main/res/layout/date_selector.xml deleted file mode 100644 index 7232ba0..0000000 --- a/workbuddy/src/main/res/layout/date_selector.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/workbuddy/src/main/res/layout/schedule_item.xml b/workbuddy/src/main/res/layout/schedule_item.xml deleted file mode 100644 index 39c6d2f..0000000 --- a/workbuddy/src/main/res/layout/schedule_item.xml +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -