diff --git a/app/build.gradle b/app/build.gradle index 5a0ca79..b9e881c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,17 @@ plugins { id 'com.android.application' + id 'kotlin-android' } +//插件脚本 +//apply from: "https://raw.githubusercontent.com/limpoxe/Android-Plugin-Framework/master/FairyPlugin/host.gradle" android { - compileSdkVersion 30 - buildToolsVersion "30.0.2" + compileSdk 31 defaultConfig { applicationId "com.fatapp.oxygentoolbox" - minSdkVersion 21 - targetSdkVersion 30 + minSdk 21 + targetSdk 31 versionCode 1 versionName "1.0" @@ -26,20 +28,36 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + buildFeatures { + viewBinding true + } } dependencies { - - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.2' - implementation 'androidx.navigation:navigation-fragment:2.2.2' - implementation 'androidx.navigation:navigation-ui:2.2.2' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1' + implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' + implementation 'androidx.core:core-splashscreen:1.0.0-beta01' - implementation 'com.google.code.gson:gson:2.8.6' -} \ No newline at end of file + implementation 'com.google.code.gson:gson:2.9.0' +// 请务必使用@aar结尾，以中断依赖传递 +// implementation('com.github.limpoxe:Android-Plugin-Framework:0.0.72@aar') +// 可选，用于支持插件全局函数式服务，不使用全局函数式服务不需要添加此依赖 +// implementation('com.limpoxe.support:android-servicemanager:1.0.5@aar') +} + +/* +fairy { + //可选配置，用于指定插件进程名。默认插件进程为单独的进程，进程名为":plugin" + //若设置为空串或者null即是使用宿主进程作为插件进程 + //pluginProcess = "" + //pluginProcess = null + //pluginProcess = ":xxx" +}*/ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd2bcfe..dae0322 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,9 +9,19 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.OxygenToolbox"> - + @@ -19,10 +29,20 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java index aec1bdc..df6052a 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java @@ -21,31 +21,49 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import java.io.IOException; import java.util.Collections; public class MainActivity extends AppCompatActivity { private AppBarConfiguration mAppBarConfiguration; + private Toolbar toolbar; + private FloatingActionButton fab; + private DrawerLayout drawer; + private NavigationView navigationView; + + private void initView() { + toolbar = findViewById(R.id.toolbar); + fab = findViewById(R.id.fab); + drawer = findViewById(R.id.drawer_layout); + navigationView = findViewById(R.id.nav_view); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Toolbar toolbar = findViewById(R.id.toolbar); + + //init + initView(); + initLayout(); + + shortCutCreateTest(); + } + + private void initLayout() { setSupportActionBar(toolbar); - FloatingActionButton fab = findViewById(R.id.fab); fab.setOnClickListener(view -> { /*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) .setAction("Action", null).show();*/ }); - DrawerLayout drawer = findViewById(R.id.drawer_layout); - NavigationView navigationView = findViewById(R.id.nav_view); navigationView.inflateHeaderView(R.layout.nav_header_main); navigationView.inflateMenu(R.menu.activity_main_drawer); navigationView.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { if (navigationView.getMenu().getItem(0).isChecked()) { fab.setVisibility(View.VISIBLE); + } else if (navigationView.getMenu().getItem(4).isChecked()) { + System.exit(0); } else { fab.setVisibility(View.GONE); } @@ -53,23 +71,14 @@ public class MainActivity extends AppCompatActivity { // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. mAppBarConfiguration = new AppBarConfiguration.Builder(R.id.nav_home) - .setDrawerLayout(drawer) + .setOpenableLayout(drawer) .build(); NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration); NavigationUI.setupWithNavController(navigationView, navController); - - try { - ToolsList.init(getResources().getAssets().open("json/BasicTools.json")); - } catch (IOException e) { - e.printStackTrace(); - Toast.makeText(getApplicationContext(), "初始化工具集失败", Toast.LENGTH_LONG).show(); - } - shortCutCreateTest(); } private void shortCutCreateTest() { - if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N_MR1) { return; } @@ -78,12 +87,12 @@ public class MainActivity extends AppCompatActivity { intent.setClassName("com.fatapp.oxygentoolbox", "com.fatapp.oxygentoolbox.MainActivity"); ShortcutInfo.Builder builder; - builder = new ShortcutInfo.Builder(this, "dynamic shortcut") + builder = new ShortcutInfo.Builder(this, "Time Screen") .setIntent(new Intent() - .setAction("android.intent.action.VIEW") - .setClassName("com.fatapp.oxygentoolbox", "com.fatapp.oxygentoolbox.MainActivity")) - .setShortLabel("This is a dynamic shortcut") - .setLongLabel("This is a dynamic shortcut with long label") + .setAction("activity.timescreen") + .setClassName("com.fatapp.oxygentoolbox", "com.fatapp.oxygentoolbox.tools.TimeScreenActivity")) + .setShortLabel("Time Screen") + .setLongLabel("Time Screen") .setIcon(Icon.createWithResource(this, R.drawable.ic_menu_home)); ShortcutManager shortcutManager = getSystemService(ShortcutManager.class); shortcutManager.addDynamicShortcuts(Collections.singletonList(builder.build())); diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/SplashActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/SplashActivity.java new file mode 100644 index 0000000..63a4022 --- /dev/null +++ b/app/src/main/java/com/fatapp/oxygentoolbox/SplashActivity.java @@ -0,0 +1,14 @@ +package com.fatapp.oxygentoolbox; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +public class SplashActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java b/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java index 9b97259..48bc945 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java @@ -28,7 +28,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { private ValueAnimator hideAnimator; private View defaultView; - private OnItemClickListener mOnItemClickListener; + private OnItemClickListenerInterface mOnItemClickListener; public FoldLayout(Context context) { this(context, null); @@ -58,7 +58,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { defaultView = LayoutInflater.from(context).inflate(layoutId, this, true); defaultView.setOnClickListener(this); content = new LinearLayout(context); - LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + LayoutParams layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); content.setOrientation(VERTICAL); addView(content, layoutParams); @@ -96,7 +96,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { @SuppressLint("UseCompatLoadingForDrawables") public void onAnimationStart(Animator animation) { super.onAnimationStart(animation); - LinearLayout linearLayout = defaultView.findViewById(R.id.foldLayoutLinearLayout); + LinearLayout linearLayout = defaultView.findViewById(R.id.fold_layout_linear_layout); linearLayout.setBackground(getResources().getDrawable(R.drawable.top_radius_background)); } }); @@ -113,7 +113,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); if (!isShow) { - LinearLayout linearLayout = defaultView.findViewById(R.id.foldLayoutLinearLayout); + LinearLayout linearLayout = defaultView.findViewById(R.id.fold_layout_linear_layout); linearLayout.setBackground(getResources().getDrawable(R.drawable.top_bottom_radius_background)); } } @@ -143,7 +143,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { public void showItem() { isShow = true; showAnimator.start(); - ImageView imageView = defaultView.findViewById(R.id.arrowIcon); + ImageView imageView = defaultView.findViewById(R.id.arrow_icon); imageView.setImageDrawable(getResources().getDrawable(R.drawable.right_to_down_arrow)); AnimatedVectorDrawable animatedVectorDrawable = (AnimatedVectorDrawable) imageView.getDrawable(); animatedVectorDrawable.start(); @@ -153,17 +153,13 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { public void hideItem() { isShow = false; hideAnimator.start(); - ImageView imageView = defaultView.findViewById(R.id.arrowIcon); + ImageView imageView = defaultView.findViewById(R.id.arrow_icon); imageView.setImageDrawable(getResources().getDrawable(R.drawable.down_to_right_arrow)); AnimatedVectorDrawable animatedVectorDrawable = (AnimatedVectorDrawable) imageView.getDrawable(); animatedVectorDrawable.start(); } - interface OnItemClickListener { - void onItemClick(View view, int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + public void setOnItemClickListener(OnItemClickListenerInterface onItemClickListener) { this.mOnItemClickListener = onItemClickListener; } } diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/layout/OnItemClickListenerInterface.java b/app/src/main/java/com/fatapp/oxygentoolbox/layout/OnItemClickListenerInterface.java new file mode 100644 index 0000000..9773ed0 --- /dev/null +++ b/app/src/main/java/com/fatapp/oxygentoolbox/layout/OnItemClickListenerInterface.java @@ -0,0 +1,7 @@ +package com.fatapp.oxygentoolbox.layout; + +import android.view.View; + +interface OnItemClickListenerInterface { + void onItemClick(View view, int position); +} diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java index 48d4c2f..8fc3de7 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java @@ -11,7 +11,6 @@ import androidx.fragment.app.Fragment; public class ExitFragment extends Fragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - System.exit(0); return null; } } \ No newline at end of file diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java index 35f754b..92525db 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java @@ -1,16 +1,14 @@ package com.fatapp.oxygentoolbox.ui.home; import android.graphics.Typeface; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.Icon; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; @@ -21,12 +19,14 @@ import com.fatapp.oxygentoolbox.layout.FoldLayout; import com.fatapp.oxygentoolbox.util.BasicToolsLauncher; import com.fatapp.oxygentoolbox.util.ToolsList; +import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class HomeFragment extends Fragment { - View root; + private View root; private HomeViewModel homeViewModel; @@ -36,37 +36,60 @@ public class HomeFragment extends Fragment { homeViewModel = new ViewModelProvider(this).get(HomeViewModel.class); root = inflater.inflate(R.layout.fragment_home, container, false); + + //init initView(); + initLayout(); + return root; } private void initView() { - for (ToolsList.Tool tool : ToolsList.getToolList()) { + foldLayoutsLinearLayout = root.findViewById(R.id.fold_layouts_linear_layout); + } - View foldLayoutBody = getLayoutInflater().inflate(R.layout.fold_layout_body, null); - ViewGroup layout_item_AutoLinefeedLayout = foldLayoutBody.findViewById(R.id.layout_item_AutoLinefeedLayout); + private void initLayout() { + initFoldLayout(); + } + + private void initFoldLayout() { + try { + ToolsList.init(getResources().getAssets().open("json/BasicTools.json")); + } catch (IOException e) { + e.printStackTrace(); + Toast.makeText(getContext(), "初始化工具集失败", Toast.LENGTH_LONG).show(); + return; + } + + for (ToolsList.Tool tool : ToolsList.getToolList()) { + View foldLayoutBodyLayout = getLayoutInflater().inflate(R.layout.fold_layout_body, null); + ViewGroup autoLinefeedLayout = foldLayoutBodyLayout.findViewById(R.id.auto_linefeed_layout); for (ToolsList.Button button : tool.getButtonList()) { - View toolButton = getLayoutInflater().inflate(R.layout.tool_button, null); - ((Button) toolButton.findViewById(R.id.toolButton)).setText(button.getText()); - toolButton.findViewById(R.id.toolButton).setOnClickListener(v -> { + View toolButtonLayout = getLayoutInflater().inflate(R.layout.tool_button, null); + + Button toolButton = toolButtonLayout.findViewById(R.id.tool_button); + toolButton.setText(button.getText()); + toolButton.setOnClickListener(v -> { BasicToolsLauncher.launch(button.getActivity(), getContext()); }); - layout_item_AutoLinefeedLayout.addView(toolButton); + autoLinefeedLayout.addView(toolButtonLayout); } List viewList = new ArrayList<>(); - viewList.add(foldLayoutBody); + viewList.add(foldLayoutBodyLayout); View foldLayoutHead = getLayoutInflater().inflate(R.layout.fold_layout, null); - FoldLayout foldLayout = foldLayoutHead.findViewById(R.id.foldLayout); - ((TextView) foldLayout.findViewById(R.id.foldLayoutTextView)).setText(tool.getFoldLayoutTitle()); - ((TextView) foldLayout.findViewById(R.id.foldLayoutIcon)).setTypeface(Typeface.createFromAsset(getContext().getAssets(), tool.getFont())); - ((TextView) foldLayout.findViewById(R.id.foldLayoutIcon)).setText(tool.getIcon()); + FoldLayout foldLayout = foldLayoutHead.findViewById(R.id.fold_layout); + ((TextView) foldLayout.findViewById(R.id.fold_layout_text_view)).setText(tool.getFoldLayoutTitle()); + + TextView foldLayoutIcon = foldLayout.findViewById(R.id.fold_layout_icon); + foldLayoutIcon.setTypeface(Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), tool.getFont())); + foldLayoutIcon.setText(tool.getIcon()); foldLayout.addItemView(viewList); - foldLayoutsLinearLayout = root.findViewById(R.id.foldLayoutsLinearLayout); + foldLayoutsLinearLayout.removeAllViews(); foldLayoutsLinearLayout.addView(foldLayoutHead); } @@ -93,4 +116,6 @@ public class HomeFragment extends Fragment { foldLayoutsLinearLayout.addView(foldLayoutHead); }*/ } + + } \ No newline at end of file diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java index ac5855e..881f8c2 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java @@ -22,7 +22,8 @@ public class SettingFragment extends Fragment { ViewGroup container, Bundle savedInstanceState) { settingViewModel = new ViewModelProvider(this).get(SettingViewModel.class); - View root = inflater.inflate(R.layout.fragment_about, container, false); + View root = inflater.inflate(R.layout.fragment_setting, container, false); +/* final TextView textView = root.findViewById(R.id.text_setting); settingViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { @Override @@ -30,6 +31,7 @@ public class SettingFragment extends Fragment { textView.setText(s); } }); +*/ return root; } } \ No newline at end of file diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java index 9b6682d..38fc5ee 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java @@ -40,7 +40,7 @@ public class ToolsList { return toolList; } - public void setToolList(List toolList) { + public static void setToolList(List toolList) { ToolsList.toolList = toolList; } diff --git a/app/src/main/res/drawable-v21/ic_menu_about.xml b/app/src/main/res/drawable/ic_menu_about.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_menu_about.xml rename to app/src/main/res/drawable/ic_menu_about.xml diff --git a/app/src/main/res/drawable-v21/ic_menu_exit.xml b/app/src/main/res/drawable/ic_menu_exit.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_menu_exit.xml rename to app/src/main/res/drawable/ic_menu_exit.xml diff --git a/app/src/main/res/drawable-v21/ic_menu_home.xml b/app/src/main/res/drawable/ic_menu_home.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_menu_home.xml rename to app/src/main/res/drawable/ic_menu_home.xml diff --git a/app/src/main/res/drawable-v21/ic_menu_setting.xml b/app/src/main/res/drawable/ic_menu_setting.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_menu_setting.xml rename to app/src/main/res/drawable/ic_menu_setting.xml diff --git a/app/src/main/res/drawable-v21/ic_menu_theme.xml b/app/src/main/res/drawable/ic_menu_theme.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_menu_theme.xml rename to app/src/main/res/drawable/ic_menu_theme.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e1e313a..e6a55cf 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,6 +1,5 @@ + android:background="@color/app_background"/> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..d337e6f --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_time_screen.xml b/app/src/main/res/layout/activity_time_screen.xml index aec55ec..50701bf 100644 --- a/app/src/main/res/layout/activity_time_screen.xml +++ b/app/src/main/res/layout/activity_time_screen.xml @@ -1,6 +1,5 @@ + app:srcCompat="@android:drawable/ic_dialog_email" + android:contentDescription="TODO" /> \ No newline at end of file diff --git a/app/src/main/res/layout/basic_tool_list.xml b/app/src/main/res/layout/basic_tool_list.xml index 71438de..b25def7 100644 --- a/app/src/main/res/layout/basic_tool_list.xml +++ b/app/src/main/res/layout/basic_tool_list.xml @@ -16,7 +16,7 @@ diff --git a/app/src/main/res/layout/fold_layout.xml b/app/src/main/res/layout/fold_layout.xml index f582b3b..caf1785 100644 --- a/app/src/main/res/layout/fold_layout.xml +++ b/app/src/main/res/layout/fold_layout.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"> + android:gravity="center_vertical" + android:orientation="vertical"> - - - \ No newline at end of file + android:layout_height="wrap_content"> + + \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index c145545..bac68aa 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -13,7 +13,7 @@ android:theme="@style/ThemeOverlay.AppCompat.Dark"> diff --git a/app/src/main/res/layout/tool_button.xml b/app/src/main/res/layout/tool_button.xml index e20a6de..9b50d9c 100644 --- a/app/src/main/res/layout/tool_button.xml +++ b/app/src/main/res/layout/tool_button.xml @@ -3,6 +3,6 @@ android:layout_width="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android">