迁移 JCenter 到 JitPack

优化框架类及方法命名
getActivity · May 1, 2021 · f7a97ca · f7a97ca
1 parent e09cebc
commit f7a97ca
Show file tree

Hide file tree

Showing 21 changed files with 279 additions and 274 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,9 @@
-/.gradle
-/.idea
-/build
-*/build
-/captures
-/.cxx
-*/.cxx
-/.externalNativeBuild
+.gradle
+.idea
+.cxx
+.externalNativeBuild
+build
+captures
 
 ._*
 *.iml

diff --git a/README.md b/README.md
@@ -8,16 +8,32 @@
 
 * 想了解实现原理的可以参考文章：[纯手工打造一个通用的标题栏 TitleBar](https://www.jianshu.com/p/ccf6506335e7)
 
-![](TitleBar.gif)
+![](TitleBar.jpg)
 
-## 5.0 版本、5.0 版本、5.0 版本 XML 属性已经改头换面了，请尽快进行[适配](Adaptive.md)
+#### 5.0 版本 XML 属性已经改头换面了，请尽快进行[适配](Adaptive.md)
 
 #### 集成步骤
 
+* 在项目根目录下的 `build.gradle` 文件中加入
+
+```groovy
+buildscript {
+    ......
+}
+allprojects {
+    repositories {
+        // JitPack 远程仓库：https://jitpack.io
+        maven { url 'https://jitpack.io' }
+    }
+}
+```
+
+* 在项目 app 模块下的 `build.gradle` 文件中加入
+
 ```groovy
 dependencies {
     // 标题栏框架：https://github.com/getActivity/TitleBar
-    implementation 'com.hjq:titlebar:8.5'
+    implementation 'com.github.getActivity:TitleBar:8.6'
 }
 ```
 
@@ -82,7 +98,7 @@ dependencies {
 
 #### XML示例
 
-> [点我查看完整的Demo示例](app/src/main/res/layout/activity_main.xml)
+* [点我查看完整的 Demo 示例](app/src/main/res/layout/activity_main.xml)
 
 ```xml
 <com.hjq.bar.TitleBar
@@ -115,63 +131,17 @@ mTitleBar.setOnTitleBarListener(new OnTitleBarListener() {
 
 #### 统一 TitleBar 样式
 
-> 如果对 TitleBar 的默认样式或者属性不满意，可以在 Application 初始化的地方进行拦截并修改
+* 如果对 TitleBar 的默认样式或者属性不满意，可以在 Application 初始化的地方进行拦截并修改
 
 ```java
-public class XXApplication extends Application {
+public class XxxApplication extends Application {
 
     @Override
     public void onCreate() {
         super.onCreate();
 
-        // 初始化 TitleBar
-        TitleBar.setDefaultInitializer(new LightBarInitializer() {
-
-            @Override
-            protected TextView createTextView(Context context) {
-                return new AppCompatTextView(context);
-            }
-
-            @Override
-            public TextView getLeftView(Context context) {
-                return super.getLeftView(context);
-            }
-
-            @Override
-            public TextView getTitleView(Context context) {
-                return super.getTitleView(context);
-            }
-
-            @Override
-            public TextView getRightView(Context context) {
-                return super.getRightView(context);
-            }
-
-            @Override
-            public View getLineView(Context context) {
-                return super.getLineView(context);
-            }
-
-            @Override
-            public Drawable getBackgroundDrawable(Context context) {
-                return super.getBackgroundDrawable(context);
-            }
-
-            @Override
-            public Drawable getBackIcon(Context context) {
-                return super.getBackIcon(context);
-            }
-
-            @Override
-            public int getHorizontalPadding(Context context) {
-                return super.getHorizontalPadding(context);
-            }
-
-            @Override
-            public int getVerticalPadding(Context context) {
-                return super.getVerticalPadding(context);
-            }
-        });
+        // 初始化 TitleBar 默认样式
+        TitleBar.setDefaultStyle(new ITitleBarStyle());
     }
 }
 ```

diff --git a/TitleBar.apk b/TitleBar.apk
diff --git a/TitleBar.gif b/TitleBar.gif
diff --git a/TitleBar.jpg b/TitleBar.jpg
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,16 +1,22 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "com.hjq.bar.demo"
-        minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 85
-        versionName "8.5"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion 17
+        targetSdkVersion 30
+        versionCode 86
+        versionName "8.6"
     }
+
+    // 支持 JDK 1.8
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -22,11 +28,13 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':library')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    // 谷歌兼容库：https://developer.android.google.cn/jetpack/androidx/releases/appcompat?hl=zh-cn
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
 
     // 吐司工具类：https://github.com/getActivity/ToastUtils
-    implementation 'com.hjq:toast:8.8'
+    implementation 'com.github.getActivity:ToastUtils:9.1'
+
     // 内存泄漏捕捉：https://github.com/square/leakcanary
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 }
diff --git a/app/src/main/java/com/hjq/bar/demo/AppApplication.java b/app/src/main/java/com/hjq/bar/demo/AppApplication.java
@@ -2,11 +2,12 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.AppCompatTextView;
+
 import com.hjq.bar.TitleBar;
-import com.hjq.bar.initializer.LightBarInitializer;
+import com.hjq.bar.style.LightBarStyle;
 import com.hjq.toast.ToastUtils;
 
 public final class AppApplication extends Application {
@@ -18,8 +19,9 @@ public void onCreate() {
         // 初始化 Toast
         ToastUtils.init(this);
 
-        // 初始化 TitleBar
-        TitleBar.setDefaultInitializer(new LightBarInitializer() {
+        // 初始化 TitleBar 默认样式
+        TitleBar.setDefaultStyle(new LightBarStyle() {
+
             @Override
             protected TextView createTextView(Context context) {
                 return new AppCompatTextView(context);

diff --git a/app/src/main/java/com/hjq/bar/demo/MainActivity.java b/app/src/main/java/com/hjq/bar/demo/MainActivity.java
@@ -1,9 +1,10 @@
 package com.hjq.bar.demo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.hjq.bar.OnTitleBarListener;
 import com.hjq.bar.TitleBar;
 import com.hjq.toast.ToastUtils;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#F4F4F4"
     tools:context=".MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="256dp"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:collapsedTitleGravity="center"
@@ -27,7 +27,7 @@
                 android:src="@mipmap/title_bar_head"
                 app:layout_collapseMode="parallax" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
                 android:layout_marginRight="20dp"
@@ -62,26 +62,26 @@
                 android:textSize="16sp"
                 app:layout_collapseMode="parallax" />
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="none"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:orientation="vertical">
 
             <com.hjq.bar.TitleBar
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="200dp"
+                android:layout_marginTop="280dp"
                 app:title="默认的标题栏" />
 
             <com.hjq.bar.TitleBar
@@ -140,7 +140,7 @@
                 app:drawableSize="30dp"
                 app:leftIcon="@mipmap/ic_launcher"
                 app:rightIcon="@mipmap/ic_launcher"
-                app:title="限制显示图标的大小" />
+                app:title="限制左右图标的大小" />
 
             <com.hjq.bar.TitleBar
                 android:layout_width="wrap_content"
@@ -167,6 +167,34 @@
                 app:rightTitle="右边"
                 app:title="监听标题栏点击事件" />
 
+            <com.hjq.bar.TitleBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                app:title="自定义标题栏" >
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center_vertical"
+                    android:orientation="horizontal" >
+
+                    <ImageView
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:src="@mipmap/ic_launcher" />
+
+                    <ImageView
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="10dp"
+                        android:src="@mipmap/ic_launcher" />
+
+                </LinearLayout>
+
+            </com.hjq.bar.TitleBar>
+
             <com.hjq.bar.TitleBar
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -180,18 +208,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:layout_marginBottom="20dp"
                 android:background="@drawable/shape_gradient"
                 app:barStyle="transparent"
                 app:leftBackground="@null"
                 app:leftTitle="返回"
                 app:rightBackground="@null"
                 app:rightTitle="设置"
-                app:title="仿QQ渐变样式"
-                app:titleColor="@null" />
+                app:title="仿QQ渐变样式" />
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/build.gradle b/build.gradle
@@ -1,30 +1,30 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
-        jcenter()
+        // 阿里云云效仓库：https://maven.aliyun.com/mvn/guide
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        // 华为开源镜像：https://mirrors.huaweicloud.com/
+        maven { url 'https://repo.huaweicloud.com/repository/maven/' }
+        // JitPack 远程仓库：https://jitpack.io
+        maven { url 'https://jitpack.io' }
+        mavenCentral()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
-        classpath 'com.novoda:bintray-release:0.9.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://repo.huaweicloud.com/repository/maven/' }
+        maven { url 'https://jitpack.io' }
+        mavenCentral()
         google()
-        maven {url "https://jitpack.io"}
-    }
-
-    //解决app:mockableAndroidJar错误的问题
-    gradle.taskGraph.whenReady {
-        tasks.each { task ->
-            if (task.name.equals('mockableAndroidJar')) {
-                task.enabled = false
-            }
-        }
+        jcenter()
     }
 }