[foundation] Reduce 3rd lib effect

Author: wintmain

app-catalog/app/build.gradle

@@ -33,8 +33,8 @@ android {
         applicationId "com.wintmain.catalog.app"
         minSdk 26
         targetSdk 34
-        versionCode 20241009
-        versionName 'V20241009'
+        versionCode 20241020
+        versionName 'V20241020'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app-catalog/samples/foundation/build.gradle

@@ -17,42 +17,18 @@ android {
 }
 
 dependencies {
-    //    implementation fileTree(include: ['*.jar', "*.aar"], dir: "libs")
     implementation project(path: ':app-catalog:samples:xpermissions:libxpermissions')
     implementation project(path: ':app-catalog:samples:foundation:libfoundation')
+    implementation project(path: ':app-catalog:samples:toaster:libtoaster')
+    implementation project(path: ':app-catalog:samples:titlebar:libtitlebar')
+
     implementation libs.androidx.constraintlayout
     implementation libs.androidx.activity.compose
     implementation libs.casa.ui
     implementation libs.androidx.recyclerviewExt
     implementation libs.androidx.cardview
-
-    // 标题栏框架：https://github.com/getActivity/TitleBar
-    // TBD - replace with self
-    // 会有资源冲突的问题，1是解决本地，2是将引用更新到最新
-    implementation 'com.github.getActivity:TitleBar:10.5'
-
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    // TBD - replace with self
-//    implementation 'com.github.getActivity:XXPermissions:18.5'
-
-    // 吐司框架：https://github.com/getActivity/Toaster
-    // TBD - replace with self
-    // 直接使用aar文件，选择build module会报这个错误，虽然不影响整个app编译
-    // Direct local .aar file dependencies are not supported when building an AAR.
-    // The resulting AAR would be broken because the classes and Android resources from any local .aar file dependencies
-    // would not be packaged in the resulting AAR. Previous versions of the Android Gradle Plugin produce broken AARs
-    // in this case too (despite not throwing this error).
-    // The following direct local .aar file dependencies of the :app-catalog:samples:androidpft project
-    // caused this error: .../app-catalog/samples/androidpft/libs/Toaster-12.5.aar
-    implementation 'com.github.getActivity:Toaster:12.5'
-
-    // 上拉刷新下拉加载框架：https://github.com/scwang90/SmartRefreshLayout
-//    implementation  'io.github.scwang90:refresh-layout-kernel:2.1.0'      //核心必须依赖
-//    implementation  'io.github.scwang90:refresh-header-material:2.1.0'    //谷歌刷新头
-
     implementation libs.androidx.navigation.fragment
     implementation libs.androidx.navigation.ui
     implementation libs.androidx.slidingpanelayout
-
-    implementation "io.coil-kt:coil:2.6.0"
+    implementation libs.coil
 }

app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/PlaceHolderActivity.java

@@ -22,10 +22,10 @@
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatTextView;
-import com.hjq.bar.OnTitleBarListener;
-import com.hjq.bar.TitleBar;
-import com.hjq.bar.style.LightBarStyle;
-import com.hjq.toast.Toaster;
+import lib.wintmain.titlebar.OnTitleBarListener;
+import lib.wintmain.titlebar.TitleBarExt;
+import lib.wintmain.titlebar.style.LightBarStyle;
+import lib.wintmain.toaster.toast.ToastUtils;
 
 //@Sample(
 //        name = "Android PfT",
@@ -43,30 +43,30 @@ protected void onCreate(Bundle savedInstanceState) {
         // 初始化一些三方库
         initLibs(getApplication());
 
-        TitleBar titleBar = findViewById(R.id.tb_main_bar_click);
+        TitleBarExt titleBar = findViewById(R.id.tb_main_bar_click);
         titleBar.setOnTitleBarListener(
                 new OnTitleBarListener() {
 
                     @Override
-                    public void onLeftClick(TitleBar titleBar) {
-                        Toaster.show("你点击了返回");
+                    public void onLeftClick(TitleBarExt titleBar) {
+                        ToastUtils.show("你点击了返回");
                     }
 
                     @Override
-                    public void onTitleClick(TitleBar titleBar) {
-                        Toaster.show("你点击了中间");
+                    public void onTitleClick(TitleBarExt titleBar) {
+                        ToastUtils.show("你点击了中间");
                     }
 
                     @Override
-                    public void onRightClick(TitleBar titleBar) {
-                        Toaster.show("你点击了设置");
+                    public void onRightClick(TitleBarExt titleBar) {
+                        ToastUtils.show("你点击了设置");
                     }
                 });
     }
 
     private void initLibs(Application application) {
         // 初始化 TitleBar 默认样式
-        TitleBar.setDefaultStyle(
+        TitleBarExt.setDefaultStyle(
                 new LightBarStyle() {
                     @Override
                     public TextView newTitleView(Context context) {
@@ -85,6 +85,6 @@ public TextView newRightView(Context context) {
                 });
 
         // 初始化 Toast
-        Toaster.init(this.getApplication());
+        ToastUtils.init(this.getApplication());
     }
 }

app-catalog/samples/foundation/src/main/res-ext/layout/pft_activity_main.xml

@@ -38,13 +38,13 @@
                 android:paddingBottom="20dp"
                 android:paddingTop="20dp">
 
-                <com.hjq.bar.TitleBar
+                <lib.wintmain.titlebar.TitleBarExt
                     android:id="@+id/tb_main_bar_click"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
                     android:background="@drawable/shape_gradient"
-                    app:barStyle="transparent"
+                    app:barStyleExt="transparent"
                     app:leftTitle="返回"
                     app:rightTitle="设置"
                     app:title="监听标题栏点击事件" />

gradle/libs.versions.toml

@@ -17,6 +17,7 @@
 # Modifications are licensed under the License.
 
 [versions]
+coil = "2.6.0"
 compose-bom = "2024.09.02"
 composeCompiler = "1.5.9"
 kotlin = "1.9.22"
@@ -38,6 +39,7 @@ casa-ui = { module = "com.google.android.catalog.framework:casa-ui", version.ref
 casa-base = { module = "com.google.android.catalog.framework:casa-base", version.ref = "casa" }
 casa-processor = { module = "com.google.android.catalog.framework:casa-processor", version.ref = "casa" }
 
+coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" }
 hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }