diff --git a/app-catalog/app/build.gradle b/app-catalog/app/build.gradle index 9423452..487a5c2 100644 --- a/app-catalog/app/build.gradle +++ b/app-catalog/app/build.gradle @@ -33,8 +33,8 @@ android { applicationId "com.wintmain.catalog.app" minSdk 26 targetSdk 34 - versionCode 20240928 - versionName 'V20240928' + versionCode 20241003 + versionName 'V20241003' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -56,9 +56,6 @@ android { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = '17' - } composeOptions { kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Data.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Data.java deleted file mode 100644 index ac48aea..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Data.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -public final class Data { - // 标题 - public static final String[] TITLES = {"Java", "C", "Python", "PHP"}; - public static final String[] DETAIL = { - "Java是一门面向对象编程语言", - "C语言是一门面向过程的、抽象化的通用程序设计语言。", - "Python提供了高效的高级数据结构，还能简单有效地面向对象编程。Python语法和动态类型,以及解释型语言的本质，" - + "使它成为多数平台上写脚本和快速开发应用的编程语言。", - "PHP即“超文本预处理器”&，是在服务器端执行的脚本语言。" - }; -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/DetailFragment.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/DetailFragment.java deleted file mode 100644 index bf64169..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/DetailFragment.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Fragment; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ScrollView; -import android.widget.TextView; - -public class DetailFragment extends Fragment { - // 创建一个DetailFragment的新实例，其中包括要传递的数据包 - public static DetailFragment newInstance(int index) { - DetailFragment f = new DetailFragment(); - // 将index作为一个参数传递 - Bundle bundle = new Bundle(); // 实例化一个Bundle对象 - bundle.putInt("index", index); // 将索引值添加到Bundle对象中 - f.setArguments(bundle); // 将bundle对象作为Fragment的参数保存 - return f; - } - - public int getShownIndex() { - return getArguments().getInt("index", 0); // 获取要显示的列表项索引 - } - - @Override - public View onCreateView( - LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - if (container == null) { - return null; - } - ScrollView scroller = new ScrollView(getActivity()); // 创建一个滚动视图 - TextView text = new TextView(getActivity()); // 创建一个文本框对象 - text.setPadding(10, 10, 10, 10); // 设置内边距 - scroller.addView(text); // 将文本框对象添加到滚动视图中 - text.setText(Data.DETAIL[getShownIndex()]); // 设置文本框中要显示的文本 - return scroller; - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ListFragment.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ListFragment.java deleted file mode 100644 index 17be143..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ListFragment.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.FragmentTransaction; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import com.wintmain.basic.R; - -public class ListFragment extends android.app.ListFragment { - boolean dualPane; // 是否在一屏上同时显示列表和详细内容 - int curCheckPosition = 0; // 当前选择的索引位置 - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - // 为列表设置适配器 - setListAdapter( - new ArrayAdapter( - getActivity(), android.R.layout.simple_list_item_checked, Data.TITLES)); - // 得到布局文件中添加的帧布局管理器 - View detail = getActivity().findViewById(R.id.detail); - // 判断是否在一屏上同时显示列表和详细内容 - dualPane = detail != null && detail.getVisibility() == View.VISIBLE; - if (savedInstanceState != null) { - // 更新当前索引的位置 - curCheckPosition = savedInstanceState.getInt("curChoice", 0); - } - if (dualPane) { // 在同一屏上同时显示列表和详细内容 - // 如果是横屏，则将list设置成单选模式 - getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE); - showDetails(curCheckPosition); // 显示详细内容 - } - } - - // 重写方法，保存当前选中的索引值 - @Override - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putInt("curChoice", curCheckPosition); - } - - @Override - public void onListItemClick(ListView l, View v, int position, long id) { - showDetails(position); // 调用方法显示详细内容 - } - - void showDetails(int aIndex) { - curCheckPosition = aIndex; // 更新保存当前索引位置的变量的值为当前选中值 - // 如果是横屏状态 - if (dualPane) { - getListView().setItemChecked(aIndex, true); // 设置选中列表项为选中状态 - DetailFragment details = - (DetailFragment) - getFragmentManager() - .findFragmentById(R.id.detail); // 获取用于显示详细内容的Fragment - // 如果 details的fragment为空或者是它的当前显示的索引不等于选中的索引 - if (details == null || details.getShownIndex() != aIndex) { - // 创建一个detailFragment的实例对象，用于显示当前选择项对应的详细内容 - details = DetailFragment.newInstance(aIndex); - // 要在Activity中管理fragment，需要使用FragmentManager - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - // 将这个实例化对象替换到原先的内容 - fragmentTransaction.replace(R.id.detail, details); - // 设置转换效果 - fragmentTransaction.setTransition(fragmentTransaction.TRANSIT_FRAGMENT_FADE); - fragmentTransaction.commit(); // 提交事务 - } - - } else { // 竖屏就进行跳转（在一屏上只能显示列表或详细内容中的一个内容时，使用一个新的Activity显示详细内容） - Intent intent = new Intent(getActivity(), ep3_7.DetailActivity.class); - intent.putExtra("aIndex", aIndex); // 设置一个要传递的参数 - startActivity(intent); // 开启一个指定的activity - } - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Person.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Person.java deleted file mode 100644 index e0b35d6..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Person.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import java.io.Serializable; - -public class Person implements Serializable { - private String sex = ""; - private int height = 0; - - public Person() { - } - - @Override - public String toString() { - return "Person{" + "sex='" + sex + '\'' + ", height=" + height + '}'; - } - - public String getSex() { - return sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - public int getHeight() { - return height; - } - - public void setHeight(int height) { - this.height = height; - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_1.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_1.java deleted file mode 100644 index ec316ac..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_1.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import androidx.annotation.Nullable; -import com.wintmain.basic.R; - -public class ep3_1 extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.ep3_1); - Button button = findViewById(R.id.button1); - button.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(ep3_1.this, ep3_1second.class); - startActivity(intent); // 启动Activity - } - }); - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_1second.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_1second.java deleted file mode 100644 index 069432e..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_1second.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.TextView; -import androidx.annotation.Nullable; -import com.wintmain.basic.R; - -public class ep3_1second extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.ep3_1second); - Button button = findViewById(R.id.button2); - TextView tv = findViewById(R.id.textv); - tv.setText("详细内容。。。"); - button.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }); - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_2.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_2.java deleted file mode 100644 index bebcf08..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_2.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.LinearLayout; -import androidx.annotation.Nullable; - -public class ep3_2 extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - LinearLayout linearLayout = new LinearLayout(this); - setContentView(linearLayout); - Button button = new Button(this); - button.setText("获取对话框"); - linearLayout.addView(button); - - button.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(ep3_2.this, ep3_1second.class); - startActivity(intent); - } - }); - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_3.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_3.java deleted file mode 100644 index f8637a4..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_3.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.Toast; -import androidx.annotation.Nullable; -import com.wintmain.basic.R; - -public class ep3_3 extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.ep3_3); - - Button reg = findViewById(R.id.reg); - Button re = findViewById(R.id.re); - - EditText user = findViewById(R.id.user); - EditText pwd = findViewById(R.id.pwd); - EditText pwdc = findViewById(R.id.pwdc); - EditText email = findViewById(R.id.email); - - re.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - user.setText(""); - pwd.setText(""); - pwdc.setText(""); - email.setText(""); - } - }); - - reg.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - - String users = user.getText().toString(); - String pwds = pwd.getText().toString(); - String pwdcs = pwdc.getText().toString(); - String emails = email.getText().toString(); - if (!"".equals(users) - && !"".equals(pwds) - && !"".equals(pwdcs) - && !"".equals(emails)) { - if (!pwds.equals(pwdcs)) { - Toast.makeText(ep3_3.this, "两次输入密码不一致", Toast.LENGTH_SHORT) - .show(); - pwd.requestFocus(); - } else { - Intent intent = new Intent(ep3_3.this, ep3_3second.class); - Bundle bundle = new Bundle(); - bundle.putCharSequence("users", users); - bundle.putCharSequence("pwds", pwds); - bundle.putCharSequence("emails", emails); - intent.putExtras(bundle); - // startActivity(intent); - startActivityForResult(intent, 0x717); - } - } else { - Toast.makeText(ep3_3.this, "请输入完整信息", Toast.LENGTH_SHORT).show(); - } - } - }); - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_3second.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_3second.java deleted file mode 100644 index d08b3f2..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_3second.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.TextView; -import androidx.annotation.Nullable; - -public class ep3_3second extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - LinearLayout linearLayout = new LinearLayout(this); - setContentView(linearLayout); - - linearLayout.setOrientation(LinearLayout.VERTICAL); - Intent intent = getIntent(); - Bundle bundle = intent.getExtras(); - TextView textView1 = new TextView(this); - TextView textView2 = new TextView(this); - TextView textView3 = new TextView(this); - - textView1.setText("用户名：" + bundle.getString("users")); - textView2.setText("密码：" + bundle.getString("pwds")); - textView3.setText("邮箱：" + bundle.getString("emails")); - textView1.setTextSize(20); - textView2.setTextSize(20); - textView3.setTextSize(20); - - Button button = new Button(this); - button.setText("返回"); - button.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - setResult(0x717, intent); // 设置返回的结果码,并返回调用该Activity的Activity - finish(); - } - }); - - linearLayout.addView(textView1); - linearLayout.addView(textView2); - linearLayout.addView(textView3); - linearLayout.addView(button); - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_5.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_5.java deleted file mode 100644 index 977a5fa..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_5.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.*; -import androidx.annotation.Nullable; - -public class ep3_5 extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - LinearLayout linearLayout = new LinearLayout(this); - setContentView(linearLayout); - linearLayout.setOrientation(LinearLayout.VERTICAL); - - RadioGroup group = new RadioGroup(this); - RadioButton button1 = new RadioButton(this); - RadioButton button2 = new RadioButton(this); - button1.setText("男"); - button2.setText("女"); - group.addView(button1); - group.addView(button2); - - EditText editText = new EditText(this); - - Button button = new Button(this); - button.setText("提交"); - - linearLayout.addView(group); - linearLayout.addView(editText); - linearLayout.addView(button); - - Person person = new Person(); - - button.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - if ("".equals(editText.getText().toString())) { - Toast.makeText(ep3_5.this, "null height", Toast.LENGTH_SHORT).show(); - return; - } - int i = Integer.parseInt(editText.getText().toString()); - person.setHeight(i); - if (button1.isChecked()) { - person.setSex(button1.getText().toString()); - } - if (button2.isChecked()) { - person.setSex(button2.getText().toString()); - } - - Intent intent = new Intent(ep3_5.this, ep3_5second.class); - Bundle bundle = new Bundle(); - bundle.putSerializable("person", person); - intent.putExtras(bundle); - startActivity(intent); - } - }); - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_5second.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_5second.java deleted file mode 100644 index 133b55b..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_5second.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.widget.LinearLayout; -import android.widget.TextView; -import androidx.annotation.Nullable; - -import java.text.DecimalFormat; - -public class ep3_5second extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - LinearLayout linearLayout = new LinearLayout(this); - setContentView(linearLayout); - linearLayout.setOrientation(LinearLayout.VERTICAL); - - TextView textView = new TextView(this); - Intent intent = getIntent(); - Bundle bundle = intent.getExtras(); - Person person = (Person) bundle.getSerializable("person"); - textView.setText(person.getSex() + getWeight(person.getSex(), person.getHeight())); - - linearLayout.addView(textView); - } - - private String getWeight(String sex, float height) { - DecimalFormat decimalFormat = new DecimalFormat(); - if (sex.equals("男")) { - return decimalFormat.format((height - 80) * 0.7); - } - if (sex.equals("女")) { - return decimalFormat.format((height - 70) * 0.6); - } - return ""; - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_6.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_6.java deleted file mode 100644 index 6cd5fb2..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_6.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.ImageView; -import androidx.annotation.Nullable; -import com.wintmain.basic.R; - -public class ep3_6 extends Activity { - - private ImageView imageView; - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.ep3_6); - - Button choose = findViewById(R.id.button1); - - choose.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(ep3_6.this, ep3_6second.class); - startActivityForResult(intent, 0x777); - } - }); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 0x777 && resultCode == 0x888) { - Bundle bundle = data.getExtras(); - int imageId = bundle.getInt("imageId"); - imageView = findViewById(R.id.image); - imageView.setImageResource(imageId); - } - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_6second.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_6second.java deleted file mode 100644 index dc54ddd..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_6second.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.BaseAdapter; -import android.widget.GridView; -import android.widget.ImageView; -import androidx.annotation.Nullable; -import com.wintmain.basic.R; - -public class ep3_6second extends Activity { - int[] image = - new int[]{ - R.drawable.img01, - R.drawable.img02, - R.drawable.img03, - R.drawable.img04, - R.drawable.img05 - }; - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.ep3_6second); - GridView gridView = findViewById(R.id.gridview); - BaseAdapter baseAdapter = - new BaseAdapter() { - - @Override - public int getCount() { - return image.length; - } - - @Override - public Object getItem(int position) { - return position; - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ImageView imageView; - if (convertView == null) { - imageView = new ImageView(ep3_6second.this); - imageView.setScaleType(ImageView.ScaleType.FIT_XY); - imageView.setPadding(5, 0, 5, 0); - ViewGroup.LayoutParams layoutParams = - new ViewGroup.LayoutParams(200, 200); - imageView.setLayoutParams(layoutParams); - } else { - imageView = (ImageView) convertView; - } - imageView.setImageResource(image[position]); - return imageView; - } - }; - gridView.setAdapter(baseAdapter); - - gridView.setOnItemClickListener( - new AdapterView.OnItemClickListener() { - @Override - public void onItemClick( - AdapterView parent, View view, int position, long id) { - Intent intent = getIntent(); - Bundle bundle = new Bundle(); - bundle.putInt("imageId", image[position]); - intent.putExtras(bundle); - setResult(0x888, intent); - finish(); - } - }); - } -} diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_7.java b/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_7.java deleted file mode 100644 index 41b2c76..0000000 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/ep3_7.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2023-2024 wintmain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.wintmain.basic.prejob.uiDemo; - -import android.app.Activity; -import android.content.res.Configuration; -import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; - -public class ep3_7 extends AppCompatActivity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.ep3_7); - } - - public static class DetailActivity extends Activity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.ep3_7_detail); - // 如果为横屏，结束当前Activity，准备使用Fragment显示内容 - if (getResources().getConfiguration().orientation - == Configuration.ORIENTATION_LANDSCAPE) { - finish(); // 结束当前Activity - return; - } - if (savedInstanceState == null) { - // 如果不是横屏就插入显示详细内容的Fragment - DetailFragment detailFragment = new DetailFragment(); - detailFragment.setArguments(getIntent().getExtras()); - // 设置要传递的参数 - getFragmentManager() - .beginTransaction() - .add(android.R.id.content, detailFragment) - .commit(); // 添加一个显示详细内容的Fragment - } - } - } -} diff --git a/app-catalog/samples/basic/src/main/res/drawable/img01.jpg b/app-catalog/samples/basic/src/main/res/drawable/img01.jpg deleted file mode 100644 index cb522fb..0000000 Binary files a/app-catalog/samples/basic/src/main/res/drawable/img01.jpg and /dev/null differ diff --git a/app-catalog/samples/basic/src/main/res/drawable/img02.jpg b/app-catalog/samples/basic/src/main/res/drawable/img02.jpg deleted file mode 100644 index cb522fb..0000000 Binary files a/app-catalog/samples/basic/src/main/res/drawable/img02.jpg and /dev/null differ diff --git a/app-catalog/samples/basic/src/main/res/drawable/img03.jpg b/app-catalog/samples/basic/src/main/res/drawable/img03.jpg deleted file mode 100644 index cb522fb..0000000 Binary files a/app-catalog/samples/basic/src/main/res/drawable/img03.jpg and /dev/null differ diff --git a/app-catalog/samples/basic/src/main/res/drawable/img04.jpg b/app-catalog/samples/basic/src/main/res/drawable/img04.jpg deleted file mode 100644 index cb522fb..0000000 Binary files a/app-catalog/samples/basic/src/main/res/drawable/img04.jpg and /dev/null differ diff --git a/app-catalog/samples/basic/src/main/res/drawable/img05.jpg b/app-catalog/samples/basic/src/main/res/drawable/img05.jpg deleted file mode 100644 index cb522fb..0000000 Binary files a/app-catalog/samples/basic/src/main/res/drawable/img05.jpg and /dev/null differ diff --git a/app-catalog/samples/basic/src/main/res/drawable/img06.jpg b/app-catalog/samples/basic/src/main/res/drawable/img06.jpg deleted file mode 100644 index 1673e9e..0000000 Binary files a/app-catalog/samples/basic/src/main/res/drawable/img06.jpg and /dev/null differ diff --git a/app-catalog/samples/basic/README.md b/app-catalog/samples/foundation/README.md similarity index 100% rename from app-catalog/samples/basic/README.md rename to app-catalog/samples/foundation/README.md diff --git a/app-catalog/samples/basic/build.gradle b/app-catalog/samples/foundation/build.gradle similarity index 95% rename from app-catalog/samples/basic/build.gradle rename to app-catalog/samples/foundation/build.gradle index 8489c50..a29880f 100644 --- a/app-catalog/samples/basic/build.gradle +++ b/app-catalog/samples/foundation/build.gradle @@ -13,13 +13,13 @@ android { buildFeatures { viewBinding = true } - namespace 'com.wintmain.basic' + namespace 'com.wintmain.foundation' } dependencies { // implementation fileTree(include: ['*.jar', "*.aar"], dir: "libs") implementation project(path: ':app-catalog:samples:xpermissions:libxpermissions') - implementation project(path: ':app-catalog:samples:basic:libbase') + implementation project(path: ':app-catalog:samples:foundation:libfoundation') implementation libs.androidx.constraintlayout implementation libs.androidx.activity.compose implementation libs.casa.ui diff --git a/app-catalog/samples/basic/libbase/build.gradle b/app-catalog/samples/foundation/libfoundation/build.gradle similarity index 87% rename from app-catalog/samples/basic/libbase/build.gradle rename to app-catalog/samples/foundation/libfoundation/build.gradle index 5cf79d6..cfc9685 100644 --- a/app-catalog/samples/basic/libbase/build.gradle +++ b/app-catalog/samples/foundation/libfoundation/build.gradle @@ -11,7 +11,7 @@ android { } } - namespace 'lib.wintmain.base' + namespace 'lib.wintmain.foundation' } dependencies { diff --git a/app-catalog/samples/basic/libbase/src/main/AndroidManifest.xml b/app-catalog/samples/foundation/libfoundation/src/main/AndroidManifest.xml similarity index 93% rename from app-catalog/samples/basic/libbase/src/main/AndroidManifest.xml rename to app-catalog/samples/foundation/libfoundation/src/main/AndroidManifest.xml index e0c6ac3..09ec537 100644 --- a/app-catalog/samples/basic/libbase/src/main/AndroidManifest.xml +++ b/app-catalog/samples/foundation/libfoundation/src/main/AndroidManifest.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - + \ No newline at end of file diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseActivity.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseActivity.java similarity index 98% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseActivity.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseActivity.java index 3bb694a..bbaeb76 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseActivity.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.app.Activity; import android.content.Context; @@ -29,7 +29,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.lifecycle.Lifecycle; -import lib.wintmain.base.action.*; +import lib.wintmain.foundation.action.*; import java.util.List; import java.util.Random; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseAdapter.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseAdapter.java similarity index 99% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseAdapter.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseAdapter.java index 6e4a761..1cb49dd 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseAdapter.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.content.Context; import android.util.SparseArray; @@ -26,7 +26,7 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import lib.wintmain.base.action.ResourcesAction; +import lib.wintmain.foundation.action.ResourcesAction; /** desc : RecyclerView 适配器技术基类 */ public abstract class BaseAdapter.ViewHolder> diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseDialog.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseDialog.java similarity index 99% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseDialog.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseDialog.java index 67bcf8d..8252f64 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseDialog.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.annotation.SuppressLint; import android.app.Activity; @@ -37,7 +37,7 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleRegistry; -import lib.wintmain.base.action.*; +import lib.wintmain.foundation.action.*; import java.lang.ref.SoftReference; import java.util.ArrayList; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseFragment.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseFragment.java similarity index 98% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseFragment.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseFragment.java index aa3be41..e010c19 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseFragment.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.app.Activity; import android.app.Application; @@ -29,7 +29,7 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.lifecycle.Lifecycle; -import lib.wintmain.base.action.*; +import lib.wintmain.foundation.action.*; import java.util.List; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BasePopupWindow.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BasePopupWindow.java similarity index 99% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BasePopupWindow.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BasePopupWindow.java index a5e0cc1..efbd714 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BasePopupWindow.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BasePopupWindow.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.animation.ValueAnimator; import android.annotation.SuppressLint; @@ -32,7 +32,7 @@ import androidx.annotation.*; import androidx.core.content.ContextCompat; import androidx.core.widget.PopupWindowCompat; -import lib.wintmain.base.action.*; +import lib.wintmain.foundation.action.*; import java.lang.ref.SoftReference; import java.util.ArrayList; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BottomSheetDialog.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BottomSheetDialog.java similarity index 99% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BottomSheetDialog.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BottomSheetDialog.java index a91702e..5da9588 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BottomSheetDialog.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BottomSheetDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/FragmentPagerAdapter.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/FragmentPagerAdapter.java similarity index 99% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/FragmentPagerAdapter.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/FragmentPagerAdapter.java index 54309e3..f6b0cf9 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/FragmentPagerAdapter.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/FragmentPagerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.view.ViewGroup; import androidx.annotation.NonNull; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/RecyclerPagerAdapter.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/RecyclerPagerAdapter.java similarity index 98% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/RecyclerPagerAdapter.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/RecyclerPagerAdapter.java index acce206..1225190 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/RecyclerPagerAdapter.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/RecyclerPagerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base; +package lib.wintmain.foundation; import android.view.View; import android.view.ViewGroup; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ActivityAction.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ActivityAction.java similarity index 98% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ActivityAction.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ActivityAction.java index 114570a..7c0c8de 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ActivityAction.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ActivityAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base.action; +package lib.wintmain.foundation.action; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/AnimAction.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/AnimAction.java similarity index 94% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/AnimAction.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/AnimAction.java index 10d02b3..b69fde6 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/AnimAction.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/AnimAction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package lib.wintmain.base.action; +package lib.wintmain.foundation.action; -import lib.wintmain.base.R; +import lib.wintmain.foundation.R; /** desc : 动画样式 */ public interface AnimAction { diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/BundleAction.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/BundleAction.java similarity index 98% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/BundleAction.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/BundleAction.java index 3824168..18f2baa 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/BundleAction.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/BundleAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base.action; +package lib.wintmain.foundation.action; import android.os.Bundle; import android.os.Parcelable; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ClickAction.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ClickAction.java similarity index 97% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ClickAction.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ClickAction.java index 6773f5c..61aa68f 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ClickAction.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ClickAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base.action; +package lib.wintmain.foundation.action; import android.view.View; import androidx.annotation.IdRes; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/HandlerAction.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/HandlerAction.java similarity index 97% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/HandlerAction.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/HandlerAction.java index fdae834..1178e8e 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/HandlerAction.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/HandlerAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base.action; +package lib.wintmain.foundation.action; import android.os.Handler; import android.os.Looper; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/KeyboardAction.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/KeyboardAction.java similarity index 98% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/KeyboardAction.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/KeyboardAction.java index beca38c..8153378 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/KeyboardAction.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/KeyboardAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base.action; +package lib.wintmain.foundation.action; import android.content.Context; import android.view.View; diff --git a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ResourcesAction.java b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ResourcesAction.java similarity index 97% rename from app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ResourcesAction.java rename to app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ResourcesAction.java index a4a1582..57852ab 100644 --- a/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ResourcesAction.java +++ b/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ResourcesAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.base.action; +package lib.wintmain.foundation.action; import android.content.Context; import android.content.res.Resources; diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_dp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_dp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_dp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_sp.xml b/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_sp.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_sp.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down_item.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down_item.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down_item.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down_item.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom_item.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom_item.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom_item.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom_item.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right_item.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right_item.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right_item.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right_item.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_in.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_in.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_in.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_in.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_out.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_out.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_out.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_out.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_in.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_in.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_in.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_in.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_out.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_out.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_out.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_out.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_left_in.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_in.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_left_in.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_in.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_left_out.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_out.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_left_out.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_out.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_right_in.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_in.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_right_in.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_in.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_right_out.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_out.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_right_out.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_out.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_in.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_in.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_in.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_in.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_out.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_out.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_out.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_out.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_top_in.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_in.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_top_in.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_in.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/anim/window_top_out.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_out.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/anim/window_top_out.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_out.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/values/colors.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/values/colors.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/values/colors.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/values/integers.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/values/integers.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/values/integers.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/values/integers.xml diff --git a/app-catalog/samples/basic/libbase/src/main/res/values/styles.xml b/app-catalog/samples/foundation/libfoundation/src/main/res/values/styles.xml similarity index 100% rename from app-catalog/samples/basic/libbase/src/main/res/values/styles.xml rename to app-catalog/samples/foundation/libfoundation/src/main/res/values/styles.xml diff --git a/app-catalog/samples/basic/src/main/AndroidManifest.xml b/app-catalog/samples/foundation/src/main/AndroidManifest.xml similarity index 83% rename from app-catalog/samples/basic/src/main/AndroidManifest.xml rename to app-catalog/samples/foundation/src/main/AndroidManifest.xml index 78a687a..42cf878 100644 --- a/app-catalog/samples/basic/src/main/AndroidManifest.xml +++ b/app-catalog/samples/foundation/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ --> + package="com.wintmain.foundation"> @@ -173,28 +173,63 @@ android:theme="@style/Theme.AppCompat.DayNight" /> + + + + + + + + + + + + - - - - + - + - + - - - - + - - - - + diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/PlaceHolderActivity.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/PlaceHolderActivity.java similarity index 98% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/PlaceHolderActivity.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/PlaceHolderActivity.java index df74cb8..cf74375 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/PlaceHolderActivity.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/PlaceHolderActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic; +package com.wintmain.foundation; import android.app.Application; import android.content.Context; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/job/DbEntryActivity.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/job/DbEntryActivity.kt similarity index 96% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/job/DbEntryActivity.kt rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/job/DbEntryActivity.kt index 73d8597..15d148f 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/job/DbEntryActivity.kt +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/job/DbEntryActivity.kt @@ -14,15 +14,14 @@ * limitations under the License. */ -package com.wintmain.basic.job +package com.wintmain.foundation.job import android.os.Bundle -import android.os.PersistableBundle import android.widget.Button import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.basic.R +import com.wintmain.foundation.R @Sample( name = "数据库示例", diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/job/DbHelper.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/job/DbHelper.java similarity index 99% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/job/DbHelper.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/job/DbHelper.java index 08d5ead..e60ca40 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/job/DbHelper.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/job/DbHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.job; +package com.wintmain.foundation.job; import android.content.ContentValues; import android.content.Context; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ContactListAdapter.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ContactListAdapter.java similarity index 98% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ContactListAdapter.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ContactListAdapter.java index b6dfaa0..08ae119 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ContactListAdapter.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ContactListAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.content.ContentResolver; import android.content.Context; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/MainActivity.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/MainActivity.java similarity index 91% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/MainActivity.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/MainActivity.java index e8dbdad..09b8915 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/MainActivity.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/MainActivity.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class MainActivity extends AppCompatActivity { diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_1.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1.java similarity index 95% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_1.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1.java index 5ab73f1..02e1192 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_1.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.content.Intent; import android.os.Bundle; @@ -23,7 +23,7 @@ import android.widget.EditText; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep4_1 extends AppCompatActivity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_1second.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1second.java similarity index 94% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_1second.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1second.java index c0dabb4..a3f93dc 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_1second.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1second.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.content.Intent; import android.os.Bundle; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep4_1second extends AppCompatActivity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_2.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_2.java similarity index 97% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_2.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_2.java index d09cb00..64ab658 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_2.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.content.Intent; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_3.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3.java similarity index 97% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_3.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3.java index b9eefa1..5d3e33c 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_3.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.content.Intent; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_3second.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3second.java similarity index 96% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_3second.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3second.java index d0ee859..2802651 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_3second.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3second.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.os.Bundle; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_5.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_5.java similarity index 97% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_5.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_5.java index 40c0fed..6b5d329 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_5.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.content.Intent; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_6.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_6.java similarity index 97% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_6.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_6.java index 32d70b0..c148417 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep4_6.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.content.Intent; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_1.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_1.java similarity index 94% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_1.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_1.java index bee3233..d78543b 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_1.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_1.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.os.Bundle; import androidx.annotation.Nullable; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_1 extends Activity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_10.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_10.java similarity index 95% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_10.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_10.java index d131e54..5a29038 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_10.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_10.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.os.Bundle; import android.view.ContextMenu; @@ -27,7 +27,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_10 extends AppCompatActivity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_2.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_2.java similarity index 96% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_2.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_2.java index a9f7b23..83d41b1 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_2.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_2.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.os.Bundle; import android.view.Gravity; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_2 extends AppCompatActivity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_3.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_3.java similarity index 91% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_3.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_3.java index abbae0c..504420e 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_3.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_3.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_3 extends AppCompatActivity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_4.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_4.java similarity index 96% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_4.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_4.java index a3d8e67..572f906 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_4.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.os.Bundle; import android.view.View; @@ -22,7 +22,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_4 extends AppCompatActivity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_5.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_5.java similarity index 97% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_5.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_5.java index 3453736..7d1d14f 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_5.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.content.res.XmlResourceParser; import android.os.Bundle; @@ -22,7 +22,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_6.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_6.java similarity index 96% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_6.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_6.java index ccd1a10..9c37605 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_6.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.graphics.Color; import android.os.Bundle; @@ -27,7 +27,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_6 extends AppCompatActivity { private TextView textView; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_7.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_7.java similarity index 96% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_7.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_7.java index 8c1b77e..c0c9254 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_7.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_7.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.os.Bundle; import android.view.Menu; @@ -25,7 +25,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_7 extends AppCompatActivity { private TextView textView; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_8.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_8.java similarity index 92% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_8.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_8.java index ea06cb4..9a3fd78 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_8.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_8.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_8 extends AppCompatActivity { diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_9.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_9.java similarity index 91% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_9.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_9.java index a60787a..b1af457 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep5_9.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_9.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.os.Bundle; import androidx.annotation.Nullable; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep5_9 extends Activity { @Override diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_1.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_1.java similarity index 96% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_1.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_1.java index d48a4a9..4100390 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_1.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.content.ContentResolver; @@ -23,7 +23,7 @@ import android.provider.ContactsContract; import android.widget.TextView; import androidx.annotation.Nullable; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep6_1 extends Activity { private String[] columns = { diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_2.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_2.java similarity index 98% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_2.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_2.java index 902c2a7..cc99b39 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_2.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.content.ContentResolver; diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_3.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_3.java similarity index 95% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_3.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_3.java index 3274bd2..f451ea5 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/ep6_3.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; import android.app.Activity; import android.content.ContentResolver; @@ -23,7 +23,7 @@ import android.provider.ContactsContract; import android.widget.AutoCompleteTextView; import androidx.annotation.Nullable; -import com.wintmain.basic.R; +import com.wintmain.foundation.R; public class ep6_3 extends Activity { private String[] columns = diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/test.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/test.java similarity index 94% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/test.java rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/test.java index 49ef91a..8990c5e 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/extDemo/test.java +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.extDemo; +package com.wintmain.foundation.prejob.extDemo; public class test { public static void main(String[] args) { diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Ep1_UI.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt similarity index 99% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Ep1_UI.kt rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt index 952630e..05d2026 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Ep1_UI.kt +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.uiDemo +package com.wintmain.foundation.prejob.uiDemo import android.annotation.SuppressLint import android.content.Context @@ -52,7 +52,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.basic.R +import com.wintmain.foundation.R import java.util.Calendar @Sample( @@ -194,7 +194,7 @@ class RabbitView(context: Context) : View(context) { override fun onDraw(canvas: Canvas) { super.onDraw(canvas) val paint = Paint() - val bitmap: Bitmap = BitmapFactory.decodeResource(resources, R.drawable.img06) + val bitmap: Bitmap = BitmapFactory.decodeResource(resources, R.drawable.icon_badminton) canvas.drawBitmap(bitmap, bitmapX, bitmapY, paint) if (bitmap.isRecycled) { bitmap.recycle() diff --git a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Ep2_UIExt.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt similarity index 99% rename from app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Ep2_UIExt.kt rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt index 674c5db..50465bc 100644 --- a/app-catalog/samples/basic/src/main/java/com/wintmain/basic/prejob/uiDemo/Ep2_UIExt.kt +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.basic.prejob.uiDemo +package com.wintmain.foundation.prejob.uiDemo import android.app.AlertDialog import android.app.Notification.Builder @@ -57,7 +57,7 @@ import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.basic.R +import com.wintmain.foundation.R @Sample(name = "ArrayAdapter", description = "Adapter适配器入门", tags = ["A-Self_demos"]) class ep2_1 : AppCompatActivity() { @@ -200,7 +200,6 @@ class ep2_4 : AppCompatActivity() { } } -@Suppress("DEPRECATION") @Deprecated("通过添加上面的suppress允许调用") @Sample(name = "TabHost", description = "选项卡展示", tags = ["A-Self_demos"]) class ep2_5 : AppCompatActivity() { @@ -320,7 +319,6 @@ class ep2_7 : AppCompatActivity() { } } -@Suppress("DEPRECATION") @Sample(name = "Gallery", description = "画廊展示", tags = ["A-Self_demos"]) class ep2_8 : AppCompatActivity() { private val imageId = intArrayOf( @@ -389,7 +387,6 @@ class ep2_8 : AppCompatActivity() { } } -@Suppress("DEPRECATION") @Sample(name = "GalleryEXt", description = "画廊展示", tags = ["A-Self_demos"]) class ep2_10 : AppCompatActivity() { private val imageId = intArrayOf( @@ -476,7 +473,6 @@ class ep2_10 : AppCompatActivity() { } } -@Suppress("DEPRECATION") @Sample(name = "Toast", description = "吐司展示", tags = ["A-Self_demos"]) class ep2_11 : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -615,7 +611,7 @@ class ep2_13 : AppCompatActivity() { button1.setOnClickListener { val alertDialog = AlertDialog.Builder(this@ep2_13).create() - alertDialog.setIcon(R.drawable.img01) + alertDialog.setIcon(R.drawable.icon_swimming) alertDialog.setTitle("提示一：") alertDialog.setMessage("取消、中立和确定") // 消极的 @@ -697,7 +693,7 @@ class ep2_14 : AppCompatActivity() { button.setOnClickListener { val builder = AlertDialog.Builder(this@ep2_14) - builder.setIcon(R.drawable.img01) + builder.setIcon(R.drawable.icon_soccer) builder.setTitle("是否退出？") builder.setMessage("是否真的要退出码？") builder.setNegativeButton( diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt new file mode 100644 index 0000000..714b672 --- /dev/null +++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt @@ -0,0 +1,479 @@ +/* + * Copyright 2023-2024 wintmain + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.wintmain.foundation.prejob.uiDemo + +import android.content.Intent +import android.content.res.Configuration +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.ViewGroup.LayoutParams +import android.widget.AdapterView +import android.widget.ArrayAdapter +import android.widget.BaseAdapter +import android.widget.Button +import android.widget.EditText +import android.widget.GridView +import android.widget.ImageView +import android.widget.ImageView.ScaleType.FIT_XY +import android.widget.LinearLayout +import android.widget.ListView +import android.widget.RadioButton +import android.widget.RadioGroup +import android.widget.ScrollView +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.google.android.catalog.framework.annotations.Sample +import com.wintmain.foundation.R +import com.wintmain.foundation.prejob.uiDemo.ep3_7.DetailActivity +import java.io.Serializable +import java.text.DecimalFormat + +@Sample(name = "Activity跳转", description = "跳转示例", tags = ["A-Self_demos"]) +class ep3_1 : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.ep3_1) + val button = findViewById