diff --git a/winboll/build.properties b/winboll/build.properties index c883fa2d..cadf5140 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu May 22 02:06:59 HKT 2025 +#Thu May 22 05:33:25 GMT 2025 stageCount=2 libraryProject= baseVersion=15.0 publishVersion=15.0.1 -buildCount=0 +buildCount=63 baseBetaVersion=15.0.2 diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/CustomToolbar.java b/winboll/src/main/java/cc/winboll/studio/winboll/CustomToolbar.java new file mode 100644 index 00000000..d9d255ba --- /dev/null +++ b/winboll/src/main/java/cc/winboll/studio/winboll/CustomToolbar.java @@ -0,0 +1,53 @@ +package cc.winboll.studio.winboll; + +/** + * @Author ZhanGSKen + * @Date 2025/05/22 13:08 + */ +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; + +public class CustomToolbar extends Toolbar { + + private View viewMain; + + public CustomToolbar(Context context) { + this(context, null); + } + + public CustomToolbar(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public CustomToolbar(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + initView(context, attrs); + } + + private void initView(Context context, AttributeSet attrs) { + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.CustomToolbar); + + // 获取属性值 + String toolbarTitle = typedArray.getString(R.styleable.CustomToolbar_toolbarTitle); + int toolbarTitleColor = typedArray.getColor(R.styleable.CustomToolbar_toolbarTitleColor, android.graphics.Color.WHITE); + int toolbarBackgroundColor = typedArray.getColor(R.styleable.CustomToolbar_toolbarBackgroundColor, android.graphics.Color.BLUE); + + // 加载布局 + viewMain = LayoutInflater.from(context).inflate(R.layout.view_toolbar, this, true); + + // 应用属性值 + TextView toolbarTitleTextView = viewMain.findViewById(R.id.toolbar_title); + toolbarTitleTextView.setText(toolbarTitle); + toolbarTitleTextView.setTextColor(toolbarTitleColor); + viewMain.setBackgroundColor(toolbarBackgroundColor); + + // 释放 TypedArray + typedArray.recycle(); + } +} diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index 478a5403..6c9d1423 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -1,12 +1,16 @@ package cc.winboll.studio.winboll; +import android.graphics.drawable.Drawable; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogView; import com.hjq.toast.ToastUtils; public class MainActivity extends AppCompatActivity { + + public static final String TAG = "MainActivity"; LogView mLogView; @@ -15,9 +19,24 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + // 先设置 Toolbar 为支持 ActionBar + setSupportActionBar(toolbar); + + // 为导航图标设置点击事件 + toolbar.setNavigationOnClickListener(new android.view.View.OnClickListener() { + @Override + public void onClick(android.view.View v) { + // 这里可以添加点击事件的逻辑 + } + }); + + //getSupportActionBar().setDisplayHomeAsUpEnabled(true); + //getSupportActionBar().setHomeButtonEnabled(true); + + // 如果要设置其他图标（如菜单图标等），可根据具体需求进行设置 + // 例如，有些情况下可以通过 MenuInflater 来 inflate 菜单资源，然后在菜单的 onMenuItemClick 中处理图标点击事件 + mLogView = findViewById(R.id.logview); ToastUtils.show("onCreate"); diff --git a/winboll/src/main/res/drawable/ic_iw.png b/winboll/src/main/res/drawable/ic_iw.png deleted file mode 100644 index 4eb9f879..00000000 Binary files a/winboll/src/main/res/drawable/ic_iw.png and /dev/null differ diff --git a/winboll/src/main/res/drawable/ic_iw.xml b/winboll/src/main/res/drawable/ic_iw.xml new file mode 100644 index 00000000..5c5c1917 --- /dev/null +++ b/winboll/src/main/res/drawable/ic_iw.xml @@ -0,0 +1,35 @@ + + + + + + + diff --git a/winboll/src/main/res/drawable/ic_launcher_beta.xml b/winboll/src/main/res/drawable/ic_launcher_beta.xml index 5b4ab947..c304fdc1 100644 --- a/winboll/src/main/res/drawable/ic_launcher_beta.xml +++ b/winboll/src/main/res/drawable/ic_launcher_beta.xml @@ -1,8 +1,8 @@ + android:layout_width="48dp" + android:layout_height="48dp"> - - - - - + android:layout_height="?attr/actionBarSize" + app:toolbarTitle="@string/app_name" + app:toolbarTitleColor="@color/colorAccent" + app:toolbarBackgroundColor="@color/colorPrimary" + android:id="@+id/toolbar"/> + + + + + + + + diff --git a/winboll/src/main/res/values/attrs.xml b/winboll/src/main/res/values/attrs.xml new file mode 100644 index 00000000..1221d426 --- /dev/null +++ b/winboll/src/main/res/values/attrs.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/winboll/src/main/res/values/strings.xml b/winboll/src/main/res/values/strings.xml index 9d2deba5..0a297170 100644 --- a/winboll/src/main/res/values/strings.xml +++ b/winboll/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ WinBoLL - + WinBoLL APP diff --git a/winboll/src/main/res/values/styles.xml b/winboll/src/main/res/values/styles.xml index a70e242f..df38db8f 100644 --- a/winboll/src/main/res/values/styles.xml +++ b/winboll/src/main/res/values/styles.xml @@ -1,5 +1,4 @@ - - +