diff --git a/README.md b/README.md index 705c091..55855ce 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,13 @@ For personal study use only. 一款以Google/casa-log为框架来学习Android基础的App，在学习其他优秀的三方库中进行集成开发。仅供个人学习使用。 -## Topics List[update here] +## Topics List * [AndroidRes](app-catalog/samples/androidres) -* [Foundation](app-catalog/samples/foundation) -* [ShadowLayout](app-catalog/samples/shadowlayout) -* [Titlebar](app-catalog/samples/titlebar) -* [Toaster](app-catalog/samples/toaster) -* [Xperimissions](app-catalog/samples/xpermissions) -* [Xplayer](app-catalog/samples/xplayer) +* [wBasis](app-catalog/samples/wBasis) +* [wNdk](app-catalog/samples/wNdk) +* [wPermission](app-catalog/samples/wPermission) +* [wPlayer](app-catalog/samples/wPlayer) +* [wShadowLayout](app-catalog/samples/wShadowLayout) +* [wTitlebar](app-catalog/samples/wTitlebar) +* [wToaster](app-catalog/samples/wToaster) diff --git a/app-catalog/app/build.gradle b/app-catalog/app/build.gradle index bee6e7d..c5574b3 100644 --- a/app-catalog/app/build.gradle +++ b/app-catalog/app/build.gradle @@ -1,6 +1,6 @@ /* * Copyright 2022 Google LLC - * Copyright 2023-2024 wintmain + * Copyright 2023-2025 wintmain * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,21 +27,24 @@ plugins { android { namespace 'com.wintmain.catalog.app' - compileSdk 34 + compileSdk 35 + // target -> Platform that needs to be adapted; compileSdk above can be ignored + // Intuitive example, edge-to-edge starting from 35 defaultConfig { applicationId "com.wintmain.catalog.app" minSdk 26 targetSdk 34 - versionCode 20250101 - versionName 'V20250101' + versionCode 20250601 + versionName 'V20250601' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { - release { - minifyEnabled false + debug { + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -92,7 +95,6 @@ dependencies { androidTestImplementation libs.androidx.test.ext.junit testImplementation libs.androidx.test.ext.junit - // App中集成CodeLocator: https://github.com/bytedance/CodeLocator - // 暂时禁用 -// debugImplementation libs.codelocator.core + // 暂时禁用 App中集成CodeLocator: https://github.com/bytedance/CodeLocator + // debugImplementation libs.codelocator.core } diff --git a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/Book.aidl b/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/Book.aidl deleted file mode 100644 index 3823130..0000000 --- a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/Book.aidl +++ /dev/null @@ -1,5 +0,0 @@ -package com.wintmain.foundation.aidl; - -import com.wintmain.foundation.aidl.Book; - -parcelable Book; diff --git a/app-catalog/samples/titlebar/build.gradle b/app-catalog/samples/titlebar/build.gradle deleted file mode 100644 index 872bc4c..0000000 --- a/app-catalog/samples/titlebar/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -apply from: "$rootDir/gradle/sample-build.gradle" - -android { - namespace 'com.wintmain.titlebar' -} - -dependencies { - implementation project(path: ':app-catalog:samples:titlebar:libtitlebar') -} diff --git a/app-catalog/samples/toaster/build.gradle b/app-catalog/samples/toaster/build.gradle deleted file mode 100644 index fd021a4..0000000 --- a/app-catalog/samples/toaster/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -apply from: "$rootDir/gradle/sample-build.gradle" - -android { - namespace 'com.wintmain.toaster' -} - -dependencies { - implementation project(path: ':app-catalog:samples:toaster:libtoaster') -} \ No newline at end of file diff --git a/app-catalog/samples/foundation/README.md b/app-catalog/samples/wBasis/README.md similarity index 100% rename from app-catalog/samples/foundation/README.md rename to app-catalog/samples/wBasis/README.md diff --git a/app-catalog/samples/foundation/build.gradle b/app-catalog/samples/wBasis/build.gradle similarity index 75% rename from app-catalog/samples/foundation/build.gradle rename to app-catalog/samples/wBasis/build.gradle index faaecee..f9a9f72 100644 --- a/app-catalog/samples/foundation/build.gradle +++ b/app-catalog/samples/wBasis/build.gradle @@ -16,14 +16,14 @@ android { viewBinding = true aidl = true } - namespace 'com.wintmain.foundation' + namespace 'com.wintmain.wBasis' } dependencies { - implementation project(path: ':app-catalog:samples:xpermissions:libxpermissions') - implementation project(path: ':app-catalog:samples:foundation:libfoundation') - implementation project(path: ':app-catalog:samples:toaster:libtoaster') - implementation project(path: ':app-catalog:samples:titlebar:libtitlebar') + implementation project(path: ':app-catalog:samples:wPermission:libwPermission') + implementation project(path: ':app-catalog:samples:wBasis:libwBasis') + implementation project(path: ':app-catalog:samples:wToaster:libwToaster') + implementation project(path: ':app-catalog:samples:wTitlebar:libwTitlebar') implementation libs.androidx.constraintlayout implementation libs.androidx.activity.compose diff --git a/app-catalog/samples/foundation/libfoundation/build.gradle b/app-catalog/samples/wBasis/libwBasis/build.gradle similarity index 87% rename from app-catalog/samples/foundation/libfoundation/build.gradle rename to app-catalog/samples/wBasis/libwBasis/build.gradle index cfc9685..67af3e9 100644 --- a/app-catalog/samples/foundation/libfoundation/build.gradle +++ b/app-catalog/samples/wBasis/libwBasis/build.gradle @@ -11,7 +11,7 @@ android { } } - namespace 'lib.wintmain.foundation' + namespace 'lib.wintmain.wBasis' } dependencies { diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/AndroidManifest.xml b/app-catalog/samples/wBasis/libwBasis/src/main/AndroidManifest.xml similarity index 93% rename from app-catalog/samples/titlebar/libtitlebar/src/main/AndroidManifest.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/AndroidManifest.xml index a6e5522..1104572 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/AndroidManifest.xml +++ b/app-catalog/samples/wBasis/libwBasis/src/main/AndroidManifest.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - + \ No newline at end of file diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseActivity.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseActivity.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseActivity.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseActivity.java index bbaeb76..3514ec8 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseActivity.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; 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.foundation.action.*; +import lib.wintmain.wBasis.action.*; import java.util.List; import java.util.Random; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseAdapter.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseAdapter.java similarity index 99% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseAdapter.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseAdapter.java index 1cb49dd..d0fc8e0 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseAdapter.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; 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.foundation.action.ResourcesAction; +import lib.wintmain.wBasis.action.ResourcesAction; /** desc : RecyclerView 适配器技术基类 */ public abstract class BaseAdapter.ViewHolder> diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseDialog.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseDialog.java similarity index 99% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseDialog.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseDialog.java index 8252f64..48607ab 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseDialog.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; 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.foundation.action.*; +import lib.wintmain.wBasis.action.*; import java.lang.ref.SoftReference; import java.util.ArrayList; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseFragment.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseFragment.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseFragment.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseFragment.java index e010c19..4974e08 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BaseFragment.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BaseFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; 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.foundation.action.*; +import lib.wintmain.wBasis.action.*; import java.util.List; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BasePopupWindow.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BasePopupWindow.java similarity index 99% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BasePopupWindow.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BasePopupWindow.java index efbd714..33adda9 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BasePopupWindow.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BasePopupWindow.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; 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.foundation.action.*; +import lib.wintmain.wBasis.action.*; import java.lang.ref.SoftReference; import java.util.ArrayList; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BottomSheetDialog.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BottomSheetDialog.java similarity index 99% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BottomSheetDialog.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BottomSheetDialog.java index 5da9588..186f7b7 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/BottomSheetDialog.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/BottomSheetDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/FragmentPagerAdapter.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/FragmentPagerAdapter.java similarity index 99% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/FragmentPagerAdapter.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/FragmentPagerAdapter.java index f6b0cf9..ee88a50 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/FragmentPagerAdapter.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/FragmentPagerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; import android.view.ViewGroup; import androidx.annotation.NonNull; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/RecyclerPagerAdapter.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/RecyclerPagerAdapter.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/RecyclerPagerAdapter.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/RecyclerPagerAdapter.java index 1225190..a050290 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/RecyclerPagerAdapter.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/RecyclerPagerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation; +package lib.wintmain.wBasis; import android.view.View; import android.view.ViewGroup; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ActivityAction.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ActivityAction.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ActivityAction.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ActivityAction.java index 7c0c8de..636c64a 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ActivityAction.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ActivityAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation.action; +package lib.wintmain.wBasis.action; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/AnimAction.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/AnimAction.java similarity index 94% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/AnimAction.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/AnimAction.java index b69fde6..de00577 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/AnimAction.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/AnimAction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package lib.wintmain.foundation.action; +package lib.wintmain.wBasis.action; -import lib.wintmain.foundation.R; +import lib.wintmain.wBasis.R; /** desc : 动画样式 */ public interface AnimAction { diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/BundleAction.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/BundleAction.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/BundleAction.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/BundleAction.java index 18f2baa..3f682cd 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/BundleAction.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/BundleAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation.action; +package lib.wintmain.wBasis.action; import android.os.Bundle; import android.os.Parcelable; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ClickAction.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ClickAction.java similarity index 97% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ClickAction.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ClickAction.java index 61aa68f..715359e 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ClickAction.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ClickAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation.action; +package lib.wintmain.wBasis.action; import android.view.View; import androidx.annotation.IdRes; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/HandlerAction.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/HandlerAction.java similarity index 97% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/HandlerAction.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/HandlerAction.java index 1178e8e..0005b6c 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/HandlerAction.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/HandlerAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation.action; +package lib.wintmain.wBasis.action; import android.os.Handler; import android.os.Looper; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/KeyboardAction.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/KeyboardAction.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/KeyboardAction.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/KeyboardAction.java index 8153378..7718489 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/KeyboardAction.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/KeyboardAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation.action; +package lib.wintmain.wBasis.action; import android.content.Context; import android.view.View; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ResourcesAction.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ResourcesAction.java similarity index 97% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ResourcesAction.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ResourcesAction.java index 57852ab..0794763 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/action/ResourcesAction.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/action/ResourcesAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation.action; +package lib.wintmain.wBasis.action; import android.content.Context; import android.content.res.Resources; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/Log.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/Log.java similarity index 99% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/Log.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/Log.java index ab9e49e..1d92061 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/Log.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/Log.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package lib.wintmain.foundation.logger; +package lib.wintmain.wBasis.logger; /** * Helper class for a list (or tree) of LoggerNodes. diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogFragment.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogFragment.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogFragment.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogFragment.java index 1f863b0..9b52467 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogFragment.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.foundation.logger; +package lib.wintmain.wBasis.logger; import android.graphics.Typeface; import android.os.Bundle; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogNode.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogNode.java similarity index 97% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogNode.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogNode.java index 1c5e11b..633e57a 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogNode.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogNode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package lib.wintmain.foundation.logger; +package lib.wintmain.wBasis.logger; /** * Basic interface for a logging system that can output to one or more targets. diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogView.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogView.java similarity index 99% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogView.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogView.java index 6d41aef..254fd90 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogView.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package lib.wintmain.foundation.logger; +package lib.wintmain.wBasis.logger; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogWrapper.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogWrapper.java similarity index 98% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogWrapper.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogWrapper.java index 402fe7e..19a734b 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/LogWrapper.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/LogWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package lib.wintmain.foundation.logger; +package lib.wintmain.wBasis.logger; import android.util.Log; diff --git a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/MessageOnlyLogFilter.java b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/MessageOnlyLogFilter.java similarity index 97% rename from app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/MessageOnlyLogFilter.java rename to app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/MessageOnlyLogFilter.java index aedf53b..882cd64 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/java/lib/wintmain/foundation/logger/MessageOnlyLogFilter.java +++ b/app-catalog/samples/wBasis/libwBasis/src/main/java/lib/wintmain/wBasis/logger/MessageOnlyLogFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package lib.wintmain.foundation.logger; +package lib.wintmain.wBasis.logger; /** * Simple {@link LogNode} filter, removes everything except the message. diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1024dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1024dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1024dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1024dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1024dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1280dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1280dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1280dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1280dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1280dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1365dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1365dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1365dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw1365dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw1365dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw240dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw240dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw240dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw240dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw240dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw320dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw320dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw320dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw320dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw320dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw360dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw360dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw360dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw360dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw360dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw362dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw362dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw362dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw362dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw362dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw384dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw384dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw384dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw384dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw384dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw392dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw392dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw392dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw392dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw392dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw400dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw400dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw400dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw400dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw400dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw410dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw410dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw410dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw410dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw410dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw411dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw411dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw411dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw411dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw411dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw432dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw432dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw432dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw432dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw432dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw480dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw480dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw480dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw480dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw480dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw533dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw533dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw533dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw533dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw533dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw540dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw540dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw540dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw540dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw540dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw592dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw592dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw592dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw592dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw592dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw600dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw600dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw600dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw600dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw600dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw640dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw640dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw640dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw640dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw640dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw662dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw662dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw662dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw662dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw662dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw720dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw720dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw720dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw720dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw720dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw768dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw768dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw768dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw768dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw768dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw800dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw800dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw800dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw800dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw800dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw811dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw811dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw811dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw811dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw811dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw820dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw820dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw820dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw820dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw820dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw960dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw960dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw960dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw960dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw960dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw961dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw961dp/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw961dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values-sw961dp/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values-sw961dp/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_dp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values/dimens_dp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_dp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values/dimens_dp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_sp.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values/dimens_sp.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res-sw/values/dimens_sp.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res-sw/values/dimens_sp.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_fall_down.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_fall_down.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down_item.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_fall_down_item.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_fall_down_item.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_fall_down_item.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_bottom.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_bottom.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom_item.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_bottom_item.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_bottom_item.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_bottom_item.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_right.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_right.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right_item.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_right_item.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/layout_from_right_item.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/layout_from_right_item.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_in.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_bottom_in.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_in.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_bottom_in.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_out.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_bottom_out.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_bottom_out.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_bottom_out.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_in.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_ios_in.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_in.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_ios_in.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_out.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_ios_out.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_ios_out.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_ios_out.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_in.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_left_in.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_in.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_left_in.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_out.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_left_out.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_left_out.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_left_out.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_in.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_right_in.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_in.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_right_in.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_out.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_right_out.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_right_out.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_right_out.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_in.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_scale_in.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_in.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_scale_in.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_out.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_scale_out.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_scale_out.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_scale_out.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_in.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_top_in.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_in.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_top_in.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_out.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_top_out.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/anim/window_top_out.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/anim/window_top_out.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/values/colors.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/values/colors.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/values/colors.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/values/integers.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/values/integers.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/values/integers.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/values/integers.xml diff --git a/app-catalog/samples/foundation/libfoundation/src/main/res/values/styles.xml b/app-catalog/samples/wBasis/libwBasis/src/main/res/values/styles.xml similarity index 100% rename from app-catalog/samples/foundation/libfoundation/src/main/res/values/styles.xml rename to app-catalog/samples/wBasis/libwBasis/src/main/res/values/styles.xml diff --git a/app-catalog/samples/foundation/src/main/AndroidManifest.xml b/app-catalog/samples/wBasis/src/main/AndroidManifest.xml similarity index 99% rename from app-catalog/samples/foundation/src/main/AndroidManifest.xml rename to app-catalog/samples/wBasis/src/main/AndroidManifest.xml index bf913d8..14a79b4 100644 --- a/app-catalog/samples/foundation/src/main/AndroidManifest.xml +++ b/app-catalog/samples/wBasis/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ + package="com.wintmain.wBasis"> diff --git a/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/Book.aidl b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/Book.aidl new file mode 100644 index 0000000..28627bd --- /dev/null +++ b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/Book.aidl @@ -0,0 +1,5 @@ +package com.wintmain.wBasis.aidl; + +import com.wintmain.wBasis.aidl.Book; + +parcelable Book; diff --git a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/INewPeopleListener.aidl b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/INewPeopleListener.aidl similarity index 66% rename from app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/INewPeopleListener.aidl rename to app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/INewPeopleListener.aidl index a78b558..e81c97b 100644 --- a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/INewPeopleListener.aidl +++ b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/INewPeopleListener.aidl @@ -1,7 +1,7 @@ // INewPeopleListener.aidl -package com.wintmain.foundation.aidl; +package com.wintmain.wBasis.aidl; -import com.wintmain.foundation.aidl.People; +import com.wintmain.wBasis.aidl.People; // AIDL中无法使用普通接口，所以创建此文件 diff --git a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/IPeopleManager.aidl b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/IPeopleManager.aidl similarity index 81% rename from app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/IPeopleManager.aidl rename to app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/IPeopleManager.aidl index 289bb3d..a2da0ef 100644 --- a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/IPeopleManager.aidl +++ b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/IPeopleManager.aidl @@ -1,12 +1,12 @@ // IPeopleManager.aidl // AIDL接口中只支持方法，不支持声明静态常量 -package com.wintmain.foundation.aidl; +package com.wintmain.wBasis.aidl; // 自定义的Parcelable对象和AIDL对象不管是否和当前的AIDL文件位于同一个包内，也必须要显式import进来 -import com.wintmain.foundation.aidl.Book; -import com.wintmain.foundation.aidl.People; -import com.wintmain.foundation.aidl.INewPeopleListener; +import com.wintmain.wBasis.aidl.Book; +import com.wintmain.wBasis.aidl.People; +import com.wintmain.wBasis.aidl.INewPeopleListener; interface IPeopleManager { List getPeopleList(); diff --git a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/People.aidl b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/People.aidl similarity index 81% rename from app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/People.aidl rename to app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/People.aidl index 8e23aa8..aeda80b 100644 --- a/app-catalog/samples/foundation/src/main/aidl/com/wintmain/foundation/aidl/People.aidl +++ b/app-catalog/samples/wBasis/src/main/aidl/com/wintmain/wBasis/aidl/People.aidl @@ -1,5 +1,5 @@ // People.aidl -package com.wintmain.foundation.aidl; +package com.wintmain.wBasis.aidl; // Declare any non-default types here with import statements @@ -14,7 +14,7 @@ package com.wintmain.foundation.aidl; // Parcelable的作用是序列化对象，因为跨进程通信传输对象必须是以序列化和反序列化的方式进行。 // Parcelable的实现有些繁琐，但性能效率很高。 -import com.wintmain.foundation.aidl.People; +import com.wintmain.wBasis.aidl.People; -// People should be declared in a file called com/wintmain/foundation/aidl/People.aidl +// People should be declared in a file called com/wintmain/wBasis/aidl/People.aidl parcelable People; diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/PlaceHolderActivity.java b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/PlaceHolderActivity.java similarity index 94% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/PlaceHolderActivity.java rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/PlaceHolderActivity.java index 42cf032..04fa3f9 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/PlaceHolderActivity.java +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/PlaceHolderActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation; +package com.wintmain.wBasis; import android.app.Application; import android.content.ComponentName; @@ -26,10 +26,10 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.AppCompatTextView; import com.google.android.catalog.framework.annotations.Sample; -import lib.wintmain.titlebar.OnTitleBarListener; -import lib.wintmain.titlebar.TitleBarExt; -import lib.wintmain.titlebar.style.LightBarStyle; -import lib.wintmain.toaster.toast.ToastUtils; +import lib.wintmain.wTitlebar.OnTitleBarListener; +import lib.wintmain.wTitlebar.TitleBarExt; +import lib.wintmain.wTitlebar.style.LightBarStyle; +import lib.wintmain.wToaster.toast.ToastUtils; @Sample( name = "0-Android-Demo", diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/AidlSampleActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/AidlSampleActivity.kt similarity index 97% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/AidlSampleActivity.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/AidlSampleActivity.kt index 0a96d68..c472e89 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/AidlSampleActivity.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/AidlSampleActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.aidl +package com.wintmain.wBasis.aidl import android.content.ComponentName import android.content.Intent @@ -25,7 +25,7 @@ import android.os.RemoteException import android.util.Log import androidx.appcompat.app.AppCompatActivity import com.google.android.catalog.framework.annotations.Sample -import lib.wintmain.toaster.toast.ToastUtils +import lib.wintmain.wToaster.toast.ToastUtils @Sample(name = "AIDL-SampleActivity", description = "AIDL简单示例", tags =["A-Self_demos"]) class AidlSampleActivity: AppCompatActivity() { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/Book.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/Book.kt similarity index 95% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/Book.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/Book.kt index 9c1535c..ad93afc 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/Book.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/Book.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.aidl +package com.wintmain.wBasis.aidl import android.os.Parcelable import kotlinx.android.parcel.Parcelize diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/People.java b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/People.java similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/People.java rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/People.java index ff7d26c..d02a994 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/People.java +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/People.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.aidl; +package com.wintmain.wBasis.aidl; import android.os.Parcel; import android.os.Parcelable; diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/PeopleRemoteService.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/PeopleRemoteService.kt similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/PeopleRemoteService.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/PeopleRemoteService.kt index ff6cc5b..4e61167 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/aidl/PeopleRemoteService.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/aidl/PeopleRemoteService.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.aidl +package com.wintmain.wBasis.aidl import android.app.Service import android.content.Intent diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/DbEntryActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/DbEntryActivity.kt similarity index 97% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/DbEntryActivity.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/DbEntryActivity.kt index 9dac248..612d3c4 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/DbEntryActivity.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/DbEntryActivity.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview import android.os.Bundle import android.widget.Button 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.wBasis.R @Sample( name = "数据库示例", diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/DbHelper.java b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/DbHelper.java similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/DbHelper.java rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/DbHelper.java index 7b9b0ca..6ea0983 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/DbHelper.java +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/DbHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview; +package com.wintmain.wBasis.overview; import android.content.ContentValues; import android.content.Context; diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep1_UI.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep1_UI.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep1_UI.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep1_UI.kt index 0307d85..9b802bd 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep1_UI.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep1_UI.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview 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.foundation.R +import com.wintmain.wBasis.R import java.util.Calendar @Sample( diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep2_UIWidget.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep2_UIWidget.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep2_UIWidget.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep2_UIWidget.kt index cc9cb7a..f913453 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep2_UIWidget.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep2_UIWidget.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview 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.foundation.R +import com.wintmain.wBasis.R @Sample(name = "ArrayAdapter", description = "Adapter适配器入门", tags = ["A-Self_demos"]) class ep2_1 : AppCompatActivity() { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep3_UIInteraction.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep3_UIInteraction.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep3_UIInteraction.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep3_UIInteraction.kt index 8eba8f0..6dd5eeb 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep3_UIInteraction.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep3_UIInteraction.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview import android.content.Intent import android.content.res.Configuration @@ -40,8 +40,8 @@ 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.overview.ep3_7.DetailActivity +import com.wintmain.wBasis.R +import com.wintmain.wBasis.overview.ep3_7.DetailActivity import java.io.Serializable import java.text.DecimalFormat diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep4_Intent.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep4_Intent.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep4_Intent.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep4_Intent.kt index c95d775..2ae3935 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep4_Intent.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep4_Intent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview import android.content.Intent import android.net.Uri @@ -25,7 +25,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R +import com.wintmain.wBasis.R @Sample(name = "Intent", description = "意图示例", tags = ["A-Self_demos"]) class ep4_1 : AppCompatActivity() { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep5_Menu.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep5_Menu.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep5_Menu.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep5_Menu.kt index f452e53..2821a93 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep5_Menu.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep5_Menu.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview import android.content.res.XmlResourceParser import android.graphics.Color @@ -34,7 +34,7 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R +import com.wintmain.wBasis.R import org.xmlpull.v1.XmlPullParser import org.xmlpull.v1.XmlPullParserException import java.io.IOException diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep6_ContentResolver.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep6_ContentResolver.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep6_ContentResolver.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep6_ContentResolver.kt index b62bca0..16c470b 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep6_ContentResolver.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep6_ContentResolver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview import android.content.ContentResolver import android.content.Context @@ -33,7 +33,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R +import com.wintmain.wBasis.R // TODO 授予读取contacts权限 @Sample(name = "ep6_1", description = "ContentResolver示例", tags = ["A-Self_demos"]) diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep7_Runable.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep7_Runable.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep7_Runable.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep7_Runable.kt index cdd688f..e313cbb 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep7_Runable.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep7_Runable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview import android.media.MediaPlayer import android.os.Bundle @@ -28,7 +28,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.foundation.R +import com.wintmain.wBasis.R import java.io.IOException import java.util.Random diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep8_Receiver.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep8_Receiver.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep8_Receiver.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep8_Receiver.kt index 1821818..7f8425a 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/overview/Ep8_Receiver.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/overview/Ep8_Receiver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.overview +package com.wintmain.wBasis.overview import android.content.BroadcastReceiver import android.content.ComponentName @@ -31,7 +31,7 @@ import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R +import com.wintmain.wBasis.R @Sample(name = "LocalBroadcastActivity", description = "广播示例", tags = ["A-Self_demos"]) class LocalBroadcastActivity : AppCompatActivity() { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/callnotification/CallNotificationSample.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/callnotification/CallNotificationSample.kt similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/callnotification/CallNotificationSample.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/callnotification/CallNotificationSample.kt index e523170..18ecc1a 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/callnotification/CallNotificationSample.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/callnotification/CallNotificationSample.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.telephony.callnotification +package com.wintmain.wBasis.telephony.callnotification import android.Manifest import android.content.BroadcastReceiver diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/callnotification/NotificationSource.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/callnotification/NotificationSource.kt similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/callnotification/NotificationSource.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/callnotification/NotificationSource.kt index b9c98ee..10f79e2 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/callnotification/NotificationSource.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/callnotification/NotificationSource.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.telephony.callnotification +package com.wintmain.wBasis.telephony.callnotification import android.app.Notification import android.app.NotificationChannel @@ -33,7 +33,7 @@ import androidx.core.app.NotificationCompat.VISIBILITY_PUBLIC import androidx.core.app.NotificationManagerCompat import androidx.core.app.Person import androidx.core.content.getSystemService -import com.wintmain.foundation.R +import com.wintmain.wBasis.R /** Source for creating notifications and notification channels */ @RequiresApi(Build.VERSION_CODES.P) diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/DownloadCallback.java b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/DownloadCallback.java similarity index 96% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/DownloadCallback.java rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/DownloadCallback.java index 2ab1ad1..81ebe80 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/DownloadCallback.java +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/DownloadCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.telephony.networkconnectivity; +package com.wintmain.wBasis.telephony.networkconnectivity; import android.net.NetworkInfo; diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/NetworkConnActivity.java b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/NetworkConnActivity.java similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/NetworkConnActivity.java rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/NetworkConnActivity.java index d3358a1..42b2128 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/NetworkConnActivity.java +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/NetworkConnActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.telephony.networkconnectivity; +package com.wintmain.wBasis.telephony.networkconnectivity; import android.annotation.SuppressLint; import android.content.Context; @@ -27,7 +27,7 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; import com.google.android.catalog.framework.annotations.Sample; -import com.wintmain.foundation.R; +import com.wintmain.wBasis.R; /** * @Description Sample Activity demonstrating how to connect to the network and fetch raw HTML. It diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/NetworkFragment.java b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/NetworkFragment.java similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/NetworkFragment.java rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/NetworkFragment.java index 35e94ee..4830328 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/NetworkFragment.java +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/NetworkFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.telephony.networkconnectivity; +package com.wintmain.wBasis.telephony.networkconnectivity; import android.content.Context; import android.net.ConnectivityManager; diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/README.md b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/README.md similarity index 100% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/telephony/networkconnectivity/README.md rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/telephony/networkconnectivity/README.md diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Color.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Color.kt similarity index 95% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Color.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Color.kt index 3ba3fcf..6cca86f 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Color.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Color.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.compose +package com.wintmain.wBasis.ui.compose import androidx.compose.ui.graphics.Color diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/ComposeActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/ComposeActivity.kt similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/ComposeActivity.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/ComposeActivity.kt index aa10e44..8c4a623 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/ComposeActivity.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/ComposeActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.compose +package com.wintmain.wBasis.ui.compose import android.os.Build.VERSION_CODES import android.os.Bundle @@ -43,7 +43,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.view.WindowInsetsCompat import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R +import com.wintmain.wBasis.R @Sample( name = "Compose Activity", diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Theme.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Theme.kt similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Theme.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Theme.kt index e85330a..45a036e 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Theme.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Theme.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.compose +package com.wintmain.wBasis.ui.compose import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Type.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Type.kt similarity index 97% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Type.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Type.kt index d4caa71..b5527e6 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/compose/Type.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/compose/Type.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.compose +package com.wintmain.wBasis.ui.compose import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureDetectActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureDetectActivity.kt similarity index 89% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureDetectActivity.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureDetectActivity.kt index d454aef..3a18a6d 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureDetectActivity.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureDetectActivity.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.gesture +package com.wintmain.wBasis.ui.views.gesture import android.graphics.Color import android.os.Bundle import android.view.Menu import androidx.appcompat.app.AppCompatActivity import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R -import lib.wintmain.foundation.logger.Log -import lib.wintmain.foundation.logger.LogFragment -import lib.wintmain.foundation.logger.LogWrapper -import lib.wintmain.foundation.logger.MessageOnlyLogFilter +import com.wintmain.wBasis.R +import lib.wintmain.wBasis.logger.Log +import lib.wintmain.wBasis.logger.LogFragment +import lib.wintmain.wBasis.logger.LogWrapper +import lib.wintmain.wBasis.logger.MessageOnlyLogFilter @Sample( name = "Gesture Detect", diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureDetectFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureDetectFragment.kt similarity index 92% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureDetectFragment.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureDetectFragment.kt index 0a06d74..885bf63 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureDetectFragment.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureDetectFragment.kt @@ -14,19 +14,17 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.gesture +package com.wintmain.wBasis.ui.views.gesture import android.annotation.SuppressLint import android.os.Bundle import android.view.GestureDetector import android.view.GestureDetector.SimpleOnGestureListener -import android.view.Menu -import android.view.MenuInflater import android.view.MenuItem import android.widget.TextView import androidx.fragment.app.Fragment -import com.wintmain.foundation.R -import lib.wintmain.foundation.logger.LogFragment +import com.wintmain.wBasis.R +import lib.wintmain.wBasis.logger.LogFragment class GestureDetectFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureListener.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureListener.kt similarity index 98% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureListener.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureListener.kt index 914c38a..ee7d023 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/gesture/GestureListener.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/gesture/GestureListener.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.gesture +package com.wintmain.wBasis.ui.views.gesture import android.os.Build.VERSION import android.view.GestureDetector.SimpleOnGestureListener import android.view.MotionEvent -import lib.wintmain.foundation.logger.Log +import lib.wintmain.wBasis.logger.Log class GestureListener : SimpleOnGestureListener() { companion object { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/ConstraintLayout.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/ConstraintLayout.kt similarity index 96% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/ConstraintLayout.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/ConstraintLayout.kt index 1bcb56a..5616b91 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/ConstraintLayout.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/ConstraintLayout.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout +package com.wintmain.wBasis.ui.views.layout import android.os.Bundle import android.view.View import androidx.constraintlayout.widget.ConstraintSet import androidx.fragment.app.Fragment import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R -import com.wintmain.foundation.databinding.ConstraintSetMainBinding +import com.wintmain.wBasis.R +import com.wintmain.wBasis.databinding.ConstraintSetMainBinding @Sample( name = "1. Centering Views", diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/NewsDetailsFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/NewsDetailsFragment.kt similarity index 93% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/NewsDetailsFragment.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/NewsDetailsFragment.kt index b79ec78..626609e 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/NewsDetailsFragment.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/NewsDetailsFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout.slidingpanelayout +package com.wintmain.wBasis.ui.views.layout.slidingpanelayout import android.os.Bundle import android.view.LayoutInflater @@ -23,7 +23,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import coil.load -import com.wintmain.foundation.databinding.FragmentSportsNewsBinding +import com.wintmain.wBasis.databinding.FragmentSportsNewsBinding /** * A simple [Fragment] subclass as the second destination in the navigation. diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SlidingPaneLayoutMain.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SlidingPaneLayoutMain.kt similarity index 92% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SlidingPaneLayoutMain.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SlidingPaneLayoutMain.kt index e00c2e3..04245b9 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SlidingPaneLayoutMain.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SlidingPaneLayoutMain.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout.slidingpanelayout +package com.wintmain.wBasis.ui.views.layout.slidingpanelayout import android.os.Bundle import androidx.appcompat.app.AppCompatActivity @@ -24,8 +24,8 @@ import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.navigateUp import androidx.navigation.ui.setupWithNavController import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R -import com.wintmain.foundation.databinding.SlidingPanelMainBinding +import com.wintmain.wBasis.R +import com.wintmain.wBasis.databinding.SlidingPanelMainBinding /** * @Description diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/Sport.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/Sport.kt similarity index 90% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/Sport.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/Sport.kt index 89803f5..2f0a049 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/Sport.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/Sport.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout.slidingpanelayout +package com.wintmain.wBasis.ui.views.layout.slidingpanelayout -import com.wintmain.foundation.R +import com.wintmain.wBasis.R /** * Data model for each row of the RecyclerView diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsAdapter.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsAdapter.kt similarity index 92% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsAdapter.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsAdapter.kt index 05472d1..561daa0 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsAdapter.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsAdapter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout.slidingpanelayout +package com.wintmain.wBasis.ui.views.layout.slidingpanelayout import android.content.Context import android.view.LayoutInflater @@ -23,8 +23,8 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import coil.load -import com.wintmain.foundation.databinding.SportsListItemBinding -import com.wintmain.foundation.ui.views.layout.slidingpanelayout.SportsAdapter.SportsViewHolder +import com.wintmain.wBasis.databinding.SportsListItemBinding +import com.wintmain.wBasis.ui.views.layout.slidingpanelayout.SportsAdapter.SportsViewHolder class SportsAdapter(private val onItemClicked: (Sport) -> Unit) : ListAdapter(DiffCallback) { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsData.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsData.kt similarity index 97% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsData.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsData.kt index 2c2295b..e4a7e41 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsData.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsData.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout.slidingpanelayout +package com.wintmain.wBasis.ui.views.layout.slidingpanelayout -import com.wintmain.foundation.R +import com.wintmain.wBasis.R /** * Sports data diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsListFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsListFragment.kt similarity index 96% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsListFragment.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsListFragment.kt index bb61293..c1a2460 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsListFragment.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsListFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout.slidingpanelayout +package com.wintmain.wBasis.ui.views.layout.slidingpanelayout import android.os.Bundle import android.view.LayoutInflater @@ -24,7 +24,7 @@ import androidx.activity.OnBackPressedCallback import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.slidingpanelayout.widget.SlidingPaneLayout -import com.wintmain.foundation.databinding.FragmentSportsListBinding +import com.wintmain.wBasis.databinding.FragmentSportsListBinding /** * A simple [Fragment] subclass as the default destination in the navigation. diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsViewModel.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsViewModel.kt similarity index 95% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsViewModel.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsViewModel.kt index bea774c..5aa72dc 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/layout/slidingpanelayout/SportsViewModel.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/layout/slidingpanelayout/SportsViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.layout.slidingpanelayout +package com.wintmain.wBasis.ui.views.layout.slidingpanelayout import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/CustomAdapter.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/CustomAdapter.kt similarity index 89% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/CustomAdapter.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/CustomAdapter.kt index f0a3baa..faf128a 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/CustomAdapter.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/CustomAdapter.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.wintmain.foundation.ui.views.recyclerview +package com.wintmain.wBasis.ui.views.recyclerview import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.wintmain.foundation.R -import com.wintmain.foundation.ui.views.recyclerview.CustomAdapter.ViewHolder -import lib.wintmain.foundation.logger.Log +import com.wintmain.wBasis.R +import com.wintmain.wBasis.ui.views.recyclerview.CustomAdapter.ViewHolder +import lib.wintmain.wBasis.logger.Log class CustomAdapter(private val dataSet: Array) : RecyclerView.Adapter() { diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/RecyclerViewActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/RecyclerViewActivity.kt similarity index 92% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/RecyclerViewActivity.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/RecyclerViewActivity.kt index 0bd904a..8571f43 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/RecyclerViewActivity.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/RecyclerViewActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wintmain.foundation.ui.views.recyclerview +package com.wintmain.wBasis.ui.views.recyclerview import android.os.Bundle import android.view.Menu @@ -21,11 +21,11 @@ import android.view.MenuItem import android.widget.ViewAnimator import androidx.appcompat.app.AppCompatActivity import com.google.android.catalog.framework.annotations.Sample -import com.wintmain.foundation.R -import lib.wintmain.foundation.logger.Log -import lib.wintmain.foundation.logger.LogFragment -import lib.wintmain.foundation.logger.LogWrapper -import lib.wintmain.foundation.logger.MessageOnlyLogFilter +import com.wintmain.wBasis.R +import lib.wintmain.wBasis.logger.Log +import lib.wintmain.wBasis.logger.LogFragment +import lib.wintmain.wBasis.logger.LogWrapper +import lib.wintmain.wBasis.logger.MessageOnlyLogFilter /** * A simple launcher activity containing a summary sample description, sample log and a custom diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/RecyclerViewFragment.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/RecyclerViewFragment.kt similarity index 94% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/RecyclerViewFragment.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/RecyclerViewFragment.kt index f9551e9..b90b37a 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/ui/views/recyclerview/RecyclerViewFragment.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/ui/views/recyclerview/RecyclerViewFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wintmain.foundation.ui.views.recyclerview +package com.wintmain.wBasis.ui.views.recyclerview import android.os.Bundle import android.view.LayoutInflater @@ -25,9 +25,9 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.LayoutManager -import com.wintmain.foundation.R -import com.wintmain.foundation.ui.views.recyclerview.RecyclerViewFragment.LayoutManagerType.GRID_LAYOUT_MANAGER -import com.wintmain.foundation.ui.views.recyclerview.RecyclerViewFragment.LayoutManagerType.LINEAR_LAYOUT_MANAGER +import com.wintmain.wBasis.R +import com.wintmain.wBasis.ui.views.recyclerview.RecyclerViewFragment.LayoutManagerType.GRID_LAYOUT_MANAGER +import com.wintmain.wBasis.ui.views.recyclerview.RecyclerViewFragment.LayoutManagerType.LINEAR_LAYOUT_MANAGER import java.util.Objects /** diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/webview/CustomActionWebView.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/webview/CustomActionWebView.kt similarity index 99% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/webview/CustomActionWebView.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/webview/CustomActionWebView.kt index 5ab7915..4a815bf 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/webview/CustomActionWebView.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/webview/CustomActionWebView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.webview +package com.wintmain.wBasis.webview import android.content.Context import android.os.Build.VERSION diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/webview/CustomActionWebViewActivity.kt b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/webview/CustomActionWebViewActivity.kt similarity index 97% rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/webview/CustomActionWebViewActivity.kt rename to app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/webview/CustomActionWebViewActivity.kt index 1a7eea2..749ce46 100644 --- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/webview/CustomActionWebViewActivity.kt +++ b/app-catalog/samples/wBasis/src/main/java/com/wintmain/wBasis/webview/CustomActionWebViewActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.foundation.webview +package com.wintmain.wBasis.webview import android.os.Bundle import android.webkit.WebSettings.LayoutAlgorithm.SINGLE_COLUMN @@ -22,7 +22,7 @@ import android.webkit.WebViewClient 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.wBasis.R @Sample(name = "CustomActionWebViewActivity", description = "", tags = ["webkit"]) class CustomActionWebViewActivity : AppCompatActivity() { diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_badminton.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_badminton.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_badminton.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_badminton.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_baseball.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_baseball.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_baseball.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_baseball.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_basketball.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_basketball.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_basketball.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_basketball.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_bowling.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_bowling.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_bowling.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_bowling.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_cycling.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_cycling.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_cycling.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_cycling.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_golf.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_golf.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_golf.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_golf.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_running.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_running.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_running.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_running.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_soccer.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_soccer.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_soccer.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_soccer.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_swimming.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_swimming.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_swimming.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_swimming.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_tabletennis.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_tabletennis.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_tabletennis.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_tabletennis.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/icon_tennis.jpeg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_tennis.jpeg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/icon_tennis.jpeg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/icon_tennis.jpeg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_badminton.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_badminton.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_badminton.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_badminton.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_baseball.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_baseball.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_baseball.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_baseball.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_basketball.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_basketball.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_basketball.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_basketball.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_bowling.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_bowling.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_bowling.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_bowling.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_cycling.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_cycling.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_cycling.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_cycling.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_golf.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_golf.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_golf.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_golf.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_running.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_running.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_running.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_running.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_soccer.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_soccer.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_soccer.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_soccer.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_swimming.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_swimming.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_swimming.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_swimming.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_tabletennis.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_tabletennis.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_tabletennis.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_tabletennis.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/drawable/img_tennis.jpg b/app-catalog/samples/wBasis/src/main/res-ext/drawable/img_tennis.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/drawable/img_tennis.jpg rename to app-catalog/samples/wBasis/src/main/res-ext/drawable/img_tennis.jpg diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/advanced_arrangement.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/advanced_arrangement.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/advanced_arrangement.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/advanced_arrangement.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/advanced_chains.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/advanced_chains.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/advanced_chains.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/advanced_chains.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/aspect_ratio.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/aspect_ratio.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/aspect_ratio.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/aspect_ratio.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/basic_chains.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/basic_chains.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/basic_chains.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/basic_chains.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/card_view.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/card_view.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/card_view.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/card_view.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/conn_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/conn_main.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/conn_main.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/conn_main.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/constraint_set_big.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/constraint_set_big.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/constraint_set_big.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/constraint_set_big.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/constraint_set_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/constraint_set_main.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/constraint_set_main.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/constraint_set_main.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/constraintlayout_basic_arrangement.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/constraintlayout_basic_arrangement.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/constraintlayout_basic_arrangement.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/constraintlayout_basic_arrangement.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/constraintlayout_centering_views.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/constraintlayout_centering_views.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/constraintlayout_centering_views.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/constraintlayout_centering_views.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/content_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/content_main.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/content_main.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/content_main.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/fragment_sports_list.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_list.xml similarity index 95% rename from app-catalog/samples/foundation/src/main/res-ext/layout/fragment_sports_list.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_list.xml index 44d8909..98844d0 100644 --- a/app-catalog/samples/foundation/src/main/res-ext/layout/fragment_sports_list.xml +++ b/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_list.xml @@ -42,5 +42,5 @@ android:layout_width="300dp" android:layout_weight="1" android:layout_height="match_parent" - android:name="com.wintmain.foundation.ui.views.layout.slidingpanelayout.NewsDetailsFragment" /> + android:name="com.wintmain.wBasis.ui.views.layout.slidingpanelayout.NewsDetailsFragment" /> diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/fragment_sports_news.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_news.xml similarity index 97% rename from app-catalog/samples/foundation/src/main/res-ext/layout/fragment_sports_news.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_news.xml index 21e5456..d683520 100644 --- a/app-catalog/samples/foundation/src/main/res-ext/layout/fragment_sports_news.xml +++ b/app-catalog/samples/wBasis/src/main/res-ext/layout/fragment_sports_news.xml @@ -18,7 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - tools:context="com.wintmain.foundation.ui.views.layout.slidingpanelayout.SlidingPaneLayoutMain" + tools:context="com.wintmain.wBasis.ui.views.layout.slidingpanelayout.SlidingPaneLayoutMain" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="16dp" diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/gesture_detect_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/gesture_detect_main.xml similarity index 95% rename from app-catalog/samples/foundation/src/main/res-ext/layout/gesture_detect_main.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/gesture_detect_main.xml index b69c465..77975ec 100644 --- a/app-catalog/samples/foundation/src/main/res-ext/layout/gesture_detect_main.xml +++ b/app-catalog/samples/wBasis/src/main/res-ext/layout/gesture_detect_main.xml @@ -33,7 +33,7 @@ android:layout_height="1dp" android:background="@android:color/darker_gray"/> - diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/sliding_panel_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/sliding_panel_main.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/sliding_panel_main.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/sliding_panel_main.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/sports_list_item.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/sports_list_item.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/sports_list_item.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/sports_list_item.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/layout/text_row_item.xml b/app-catalog/samples/wBasis/src/main/res-ext/layout/text_row_item.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/layout/text_row_item.xml rename to app-catalog/samples/wBasis/src/main/res-ext/layout/text_row_item.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/menu/connmain.xml b/app-catalog/samples/wBasis/src/main/res-ext/menu/connmain.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/menu/connmain.xml rename to app-catalog/samples/wBasis/src/main/res-ext/menu/connmain.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/menu/gesture_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/menu/gesture_main.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/menu/gesture_main.xml rename to app-catalog/samples/wBasis/src/main/res-ext/menu/gesture_main.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/menu/recycler_main.xml b/app-catalog/samples/wBasis/src/main/res-ext/menu/recycler_main.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/menu/recycler_main.xml rename to app-catalog/samples/wBasis/src/main/res-ext/menu/recycler_main.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/navigation/nav_graph.xml b/app-catalog/samples/wBasis/src/main/res-ext/navigation/nav_graph.xml similarity index 88% rename from app-catalog/samples/foundation/src/main/res-ext/navigation/nav_graph.xml rename to app-catalog/samples/wBasis/src/main/res-ext/navigation/nav_graph.xml index 0183a48..04bf302 100644 --- a/app-catalog/samples/foundation/src/main/res-ext/navigation/nav_graph.xml +++ b/app-catalog/samples/wBasis/src/main/res-ext/navigation/nav_graph.xml @@ -23,7 +23,7 @@ @@ -33,7 +33,7 @@ diff --git a/app-catalog/samples/foundation/src/main/res-ext/values/colors.xml b/app-catalog/samples/wBasis/src/main/res-ext/values/colors.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/values/colors.xml rename to app-catalog/samples/wBasis/src/main/res-ext/values/colors.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/values/strings.xml b/app-catalog/samples/wBasis/src/main/res-ext/values/strings.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/values/strings.xml rename to app-catalog/samples/wBasis/src/main/res-ext/values/strings.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/values/styles.xml b/app-catalog/samples/wBasis/src/main/res-ext/values/styles.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/values/styles.xml rename to app-catalog/samples/wBasis/src/main/res-ext/values/styles.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/values/themes.xml b/app-catalog/samples/wBasis/src/main/res-ext/values/themes.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/values/themes.xml rename to app-catalog/samples/wBasis/src/main/res-ext/values/themes.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/xml/backup_rules.xml b/app-catalog/samples/wBasis/src/main/res-ext/xml/backup_rules.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/xml/backup_rules.xml rename to app-catalog/samples/wBasis/src/main/res-ext/xml/backup_rules.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/xml/data_extraction_rules.xml b/app-catalog/samples/wBasis/src/main/res-ext/xml/data_extraction_rules.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/xml/data_extraction_rules.xml rename to app-catalog/samples/wBasis/src/main/res-ext/xml/data_extraction_rules.xml diff --git a/app-catalog/samples/foundation/src/main/res-ext/xml/network_security_config.xml b/app-catalog/samples/wBasis/src/main/res-ext/xml/network_security_config.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res-ext/xml/network_security_config.xml rename to app-catalog/samples/wBasis/src/main/res-ext/xml/network_security_config.xml diff --git a/app-catalog/samples/foundation/src/main/res/drawable-nodpi/androidparty.png b/app-catalog/samples/wBasis/src/main/res/drawable-nodpi/androidparty.png similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable-nodpi/androidparty.png rename to app-catalog/samples/wBasis/src/main/res/drawable-nodpi/androidparty.png diff --git a/app-catalog/samples/foundation/src/main/res/drawable/button_state.xml b/app-catalog/samples/wBasis/src/main/res/drawable/button_state.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/button_state.xml rename to app-catalog/samples/wBasis/src/main/res/drawable/button_state.xml diff --git a/app-catalog/samples/foundation/src/main/res/drawable/green.9.png b/app-catalog/samples/wBasis/src/main/res/drawable/green.9.png similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/green.9.png rename to app-catalog/samples/wBasis/src/main/res/drawable/green.9.png diff --git a/app-catalog/samples/foundation/src/main/res/drawable/green1.png b/app-catalog/samples/wBasis/src/main/res/drawable/green1.png similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/green1.png rename to app-catalog/samples/wBasis/src/main/res/drawable/green1.png diff --git a/app-catalog/samples/foundation/src/main/res/drawable/grey.9.png b/app-catalog/samples/wBasis/src/main/res/drawable/grey.9.png similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/grey.9.png rename to app-catalog/samples/wBasis/src/main/res/drawable/grey.9.png diff --git a/app-catalog/samples/foundation/src/main/res/drawable/grey1.png b/app-catalog/samples/wBasis/src/main/res/drawable/grey1.png similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/grey1.png rename to app-catalog/samples/wBasis/src/main/res/drawable/grey1.png diff --git a/app-catalog/samples/foundation/src/main/res/drawable/ic_launcher_foreground.xml b/app-catalog/samples/wBasis/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/ic_launcher_foreground.xml rename to app-catalog/samples/wBasis/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/app-catalog/samples/foundation/src/main/res/drawable/rabbit.jpg b/app-catalog/samples/wBasis/src/main/res/drawable/rabbit.jpg similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/rabbit.jpg rename to app-catalog/samples/wBasis/src/main/res/drawable/rabbit.jpg diff --git a/app-catalog/samples/foundation/src/main/res/drawable/red.9.png b/app-catalog/samples/wBasis/src/main/res/drawable/red.9.png similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/red.9.png rename to app-catalog/samples/wBasis/src/main/res/drawable/red.9.png diff --git a/app-catalog/samples/foundation/src/main/res/drawable/red1.png b/app-catalog/samples/wBasis/src/main/res/drawable/red1.png similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/red1.png rename to app-catalog/samples/wBasis/src/main/res/drawable/red1.png diff --git a/app-catalog/samples/foundation/src/main/res/drawable/shape_gradient.xml b/app-catalog/samples/wBasis/src/main/res/drawable/shape_gradient.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/drawable/shape_gradient.xml rename to app-catalog/samples/wBasis/src/main/res/drawable/shape_gradient.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout-land/ep3_7.xml b/app-catalog/samples/wBasis/src/main/res/layout-land/ep3_7.xml similarity index 95% rename from app-catalog/samples/foundation/src/main/res/layout-land/ep3_7.xml rename to app-catalog/samples/wBasis/src/main/res/layout-land/ep3_7.xml index 95529ea..5e1a7a8 100644 --- a/app-catalog/samples/foundation/src/main/res/layout-land/ep3_7.xml +++ b/app-catalog/samples/wBasis/src/main/res/layout-land/ep3_7.xml @@ -22,7 +22,7 @@ - - + \ No newline at end of file diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_1.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_11.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_11.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_11.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_11.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_12.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_12.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_12.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_12.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_14.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_14.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_14.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_14.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_15.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_15.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_15.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_15.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_19.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_19.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_19.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_19.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_21.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_21.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_21.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_21.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_22.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_22.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_22.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_22.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_4.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_4.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_4.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_4.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_6.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_6.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_6.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_6.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_7.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_7.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_7.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_7.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep1_8.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep1_8.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep1_8.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep1_8.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep3_1.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep3_1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep3_1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep3_1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep3_1second.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep3_1second.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep3_1second.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep3_1second.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep3_3.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep3_3.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep3_3.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep3_3.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep3_6.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep3_6.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep3_6.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep3_6.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep3_6second.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep3_6second.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep3_6second.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep3_6second.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep3_7.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep3_7.xml similarity index 94% rename from app-catalog/samples/foundation/src/main/res/layout/ep3_7.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep3_7.xml index 213aa1e..4e8b930 100644 --- a/app-catalog/samples/foundation/src/main/res/layout/ep3_7.xml +++ b/app-catalog/samples/wBasis/src/main/res/layout/ep3_7.xml @@ -22,7 +22,7 @@ diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep3_7_detail.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep3_7_detail.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep3_7_detail.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep3_7_detail.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep4_1.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep4_1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep4_1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep4_1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep4_1second.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep4_1second.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep4_1second.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep4_1second.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep5_1.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep5_1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep5_1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep5_1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep5_2.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep5_2.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep5_2.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep5_2.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep5_3.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep5_3.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep5_3.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep5_3.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep5_4.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep5_4.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep5_4.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep5_4.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep5_7.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep5_7.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep5_7.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep5_7.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep5_9.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep5_9.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep5_9.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep5_9.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep6_1.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep6_1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep6_1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep6_1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep6_3.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep6_3.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep6_3.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep6_3.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep7_6.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep7_6.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep7_6.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep7_6.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep9_1.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep9_1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep9_1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep9_1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ep9_3.xml b/app-catalog/samples/wBasis/src/main/res/layout/ep9_3.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ep9_3.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ep9_3.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_1.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_10.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_10.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_10.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_10.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_11.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_11.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_11.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_11.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_15.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_15.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_15.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_15.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_2.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_2.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_2.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_2.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_3.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_3.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_3.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_3.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_4.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_4.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_4.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_4.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_5.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_5.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_5.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_5.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_6.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_6.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_6.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_6.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_7.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_7.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_7.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_7.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/example2_8.xml b/app-catalog/samples/wBasis/src/main/res/layout/example2_8.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/example2_8.xml rename to app-catalog/samples/wBasis/src/main/res/layout/example2_8.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/ext_activity_main.xml b/app-catalog/samples/wBasis/src/main/res/layout/ext_activity_main.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/ext_activity_main.xml rename to app-catalog/samples/wBasis/src/main/res/layout/ext_activity_main.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/items.xml b/app-catalog/samples/wBasis/src/main/res/layout/items.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/items.xml rename to app-catalog/samples/wBasis/src/main/res/layout/items.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/linearlayout_view.xml b/app-catalog/samples/wBasis/src/main/res/layout/linearlayout_view.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/linearlayout_view.xml rename to app-catalog/samples/wBasis/src/main/res/layout/linearlayout_view.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/tab1.xml b/app-catalog/samples/wBasis/src/main/res/layout/tab1.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/tab1.xml rename to app-catalog/samples/wBasis/src/main/res/layout/tab1.xml diff --git a/app-catalog/samples/foundation/src/main/res/layout/tab2.xml b/app-catalog/samples/wBasis/src/main/res/layout/tab2.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/layout/tab2.xml rename to app-catalog/samples/wBasis/src/main/res/layout/tab2.xml diff --git a/app-catalog/samples/foundation/src/main/res/menu/contextmenu.xml b/app-catalog/samples/wBasis/src/main/res/menu/contextmenu.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/menu/contextmenu.xml rename to app-catalog/samples/wBasis/src/main/res/menu/contextmenu.xml diff --git a/app-catalog/samples/foundation/src/main/res/menu/contextmenu2.xml b/app-catalog/samples/wBasis/src/main/res/menu/contextmenu2.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/menu/contextmenu2.xml rename to app-catalog/samples/wBasis/src/main/res/menu/contextmenu2.xml diff --git a/app-catalog/samples/foundation/src/main/res/menu/optionmenu.xml b/app-catalog/samples/wBasis/src/main/res/menu/optionmenu.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/menu/optionmenu.xml rename to app-catalog/samples/wBasis/src/main/res/menu/optionmenu.xml diff --git a/app-catalog/samples/foundation/src/main/res/values-night/themes.xml b/app-catalog/samples/wBasis/src/main/res/values-night/themes.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values-night/themes.xml rename to app-catalog/samples/wBasis/src/main/res/values-night/themes.xml diff --git a/app-catalog/samples/foundation/src/main/res/values/arrays.xml b/app-catalog/samples/wBasis/src/main/res/values/arrays.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values/arrays.xml rename to app-catalog/samples/wBasis/src/main/res/values/arrays.xml diff --git a/app-catalog/samples/foundation/src/main/res/values/attr.xml b/app-catalog/samples/wBasis/src/main/res/values/attr.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values/attr.xml rename to app-catalog/samples/wBasis/src/main/res/values/attr.xml diff --git a/app-catalog/samples/foundation/src/main/res/values/colors.xml b/app-catalog/samples/wBasis/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values/colors.xml rename to app-catalog/samples/wBasis/src/main/res/values/colors.xml diff --git a/app-catalog/samples/foundation/src/main/res/values/dimen.xml b/app-catalog/samples/wBasis/src/main/res/values/dimen.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values/dimen.xml rename to app-catalog/samples/wBasis/src/main/res/values/dimen.xml diff --git a/app-catalog/samples/foundation/src/main/res/values/strings.xml b/app-catalog/samples/wBasis/src/main/res/values/strings.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values/strings.xml rename to app-catalog/samples/wBasis/src/main/res/values/strings.xml diff --git a/app-catalog/samples/foundation/src/main/res/values/styles.xml b/app-catalog/samples/wBasis/src/main/res/values/styles.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values/styles.xml rename to app-catalog/samples/wBasis/src/main/res/values/styles.xml diff --git a/app-catalog/samples/foundation/src/main/res/values/themes.xml b/app-catalog/samples/wBasis/src/main/res/values/themes.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/values/themes.xml rename to app-catalog/samples/wBasis/src/main/res/values/themes.xml diff --git a/app-catalog/samples/foundation/src/main/res/xml/customers.xml b/app-catalog/samples/wBasis/src/main/res/xml/customers.xml similarity index 100% rename from app-catalog/samples/foundation/src/main/res/xml/customers.xml rename to app-catalog/samples/wBasis/src/main/res/xml/customers.xml diff --git a/app-catalog/samples/ndk/hellojni/build.gradle b/app-catalog/samples/wNdk/hellojni/build-sunset.gradle similarity index 100% rename from app-catalog/samples/ndk/hellojni/build.gradle rename to app-catalog/samples/wNdk/hellojni/build-sunset.gradle diff --git a/app-catalog/samples/ndk/hellojni/src/main/AndroidManifest.xml b/app-catalog/samples/wNdk/hellojni/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/ndk/hellojni/src/main/AndroidManifest.xml rename to app-catalog/samples/wNdk/hellojni/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/ndk/hellojni/src/main/cpp/CMakeLists.txt b/app-catalog/samples/wNdk/hellojni/src/main/cpp/CMakeLists.txt similarity index 100% rename from app-catalog/samples/ndk/hellojni/src/main/cpp/CMakeLists.txt rename to app-catalog/samples/wNdk/hellojni/src/main/cpp/CMakeLists.txt diff --git a/app-catalog/samples/ndk/hellojni/src/main/cpp/hello-jni.cpp b/app-catalog/samples/wNdk/hellojni/src/main/cpp/hello-jni.cpp similarity index 100% rename from app-catalog/samples/ndk/hellojni/src/main/cpp/hello-jni.cpp rename to app-catalog/samples/wNdk/hellojni/src/main/cpp/hello-jni.cpp diff --git a/app-catalog/samples/ndk/hellojni/src/main/java/com/wintmain/hellojni/HelloJni.kt b/app-catalog/samples/wNdk/hellojni/src/main/java/com/wintmain/hellojni/HelloJni.kt similarity index 100% rename from app-catalog/samples/ndk/hellojni/src/main/java/com/wintmain/hellojni/HelloJni.kt rename to app-catalog/samples/wNdk/hellojni/src/main/java/com/wintmain/hellojni/HelloJni.kt diff --git a/app-catalog/samples/ndk/hellojni/src/main/res/layout/activity_hello_jni.xml b/app-catalog/samples/wNdk/hellojni/src/main/res/layout/activity_hello_jni.xml similarity index 100% rename from app-catalog/samples/ndk/hellojni/src/main/res/layout/activity_hello_jni.xml rename to app-catalog/samples/wNdk/hellojni/src/main/res/layout/activity_hello_jni.xml diff --git a/app-catalog/samples/ndk/hellojnicallback/build.gradle b/app-catalog/samples/wNdk/hellojnicallback/build-sunset.gradle similarity index 100% rename from app-catalog/samples/ndk/hellojnicallback/build.gradle rename to app-catalog/samples/wNdk/hellojnicallback/build-sunset.gradle diff --git a/app-catalog/samples/ndk/hellojnicallback/src/main/AndroidManifest.xml b/app-catalog/samples/wNdk/hellojnicallback/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/ndk/hellojnicallback/src/main/AndroidManifest.xml rename to app-catalog/samples/wNdk/hellojnicallback/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/ndk/hellojnicallback/src/main/cpp/CMakeLists.txt b/app-catalog/samples/wNdk/hellojnicallback/src/main/cpp/CMakeLists.txt similarity index 100% rename from app-catalog/samples/ndk/hellojnicallback/src/main/cpp/CMakeLists.txt rename to app-catalog/samples/wNdk/hellojnicallback/src/main/cpp/CMakeLists.txt diff --git a/app-catalog/samples/ndk/hellojnicallback/src/main/cpp/hello-jnicallback.c b/app-catalog/samples/wNdk/hellojnicallback/src/main/cpp/hello-jnicallback.c similarity index 100% rename from app-catalog/samples/ndk/hellojnicallback/src/main/cpp/hello-jnicallback.c rename to app-catalog/samples/wNdk/hellojnicallback/src/main/cpp/hello-jnicallback.c diff --git a/app-catalog/samples/ndk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniCallbackMainActivity.java b/app-catalog/samples/wNdk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniCallbackMainActivity.java similarity index 100% rename from app-catalog/samples/ndk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniCallbackMainActivity.java rename to app-catalog/samples/wNdk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniCallbackMainActivity.java diff --git a/app-catalog/samples/ndk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniHandler.java b/app-catalog/samples/wNdk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniHandler.java similarity index 100% rename from app-catalog/samples/ndk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniHandler.java rename to app-catalog/samples/wNdk/hellojnicallback/src/main/java/com/wintmain/hellojnicallback/JniHandler.java diff --git a/app-catalog/samples/ndk/hellojnicallback/src/main/res/layout/activity_main_jnicallback.xml b/app-catalog/samples/wNdk/hellojnicallback/src/main/res/layout/activity_main_jnicallback.xml similarity index 100% rename from app-catalog/samples/ndk/hellojnicallback/src/main/res/layout/activity_main_jnicallback.xml rename to app-catalog/samples/wNdk/hellojnicallback/src/main/res/layout/activity_main_jnicallback.xml diff --git a/app-catalog/samples/xpermissions/README.md b/app-catalog/samples/wPermission/README.md similarity index 100% rename from app-catalog/samples/xpermissions/README.md rename to app-catalog/samples/wPermission/README.md diff --git a/app-catalog/samples/wPermission/build.gradle b/app-catalog/samples/wPermission/build.gradle new file mode 100644 index 0000000..5c3821f --- /dev/null +++ b/app-catalog/samples/wPermission/build.gradle @@ -0,0 +1,10 @@ +apply from: "$rootDir/gradle/sample-build.gradle" + +android { + namespace 'com.wintmain.wPermission' +} + +dependencies { + implementation project(path: ':app-catalog:samples:wPermission:libwPermission') + implementation project(path: ':app-catalog:samples:wToaster:libwToaster') +} \ No newline at end of file diff --git a/app-catalog/samples/xpermissions/libxpermissions/build.gradle b/app-catalog/samples/wPermission/libwPermission/build.gradle similarity index 63% rename from app-catalog/samples/xpermissions/libxpermissions/build.gradle rename to app-catalog/samples/wPermission/libwPermission/build.gradle index 4193f50..1a170c3 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/build.gradle +++ b/app-catalog/samples/wPermission/libwPermission/build.gradle @@ -1,11 +1,11 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'lib.wintmain' + namespace 'lib.wintmain.wPermission' } dependencies { // Can't useful as we set android.useAndroidX=true -// implementation 'com.android.support:support-v4:28.0.0' + // implementation 'com.android.support:support-v4:28.0.0' implementation libs.accompanist.permissions } \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/AndroidManifest.xml b/app-catalog/samples/wPermission/libwPermission/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/AndroidManifest.xml rename to app-catalog/samples/wPermission/libwPermission/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt similarity index 100% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestInfo.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidManifestInfo.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestInfo.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidManifestInfo.java index 29f7986..241e719 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestInfo.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidManifestInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.content.pm.PackageInfo; import androidx.annotation.NonNull; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestParser.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidManifestParser.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestParser.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidManifestParser.java index dea0bf7..ff3740d 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestParser.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidManifestParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.content.Context; import android.content.res.XmlResourceParser; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidVersion.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidVersion.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidVersion.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidVersion.java index 52f89d9..ef158c7 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidVersion.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/AndroidVersion.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/GetInstalledAppsPermissionCompat.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/GetInstalledAppsPermissionCompat.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/GetInstalledAppsPermissionCompat.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/GetInstalledAppsPermissionCompat.java index 4685db7..e607c77 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/GetInstalledAppsPermissionCompat.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/GetInstalledAppsPermissionCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.AppOpsManager; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/IPermissionInterceptor.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/IPermissionInterceptor.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/IPermissionInterceptor.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/IPermissionInterceptor.java index e293165..66f5bfd 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/IPermissionInterceptor.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/IPermissionInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import androidx.annotation.NonNull; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationListenerPermissionCompat.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/NotificationListenerPermissionCompat.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationListenerPermissionCompat.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/NotificationListenerPermissionCompat.java index a4776a5..94c3755 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationListenerPermissionCompat.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/NotificationListenerPermissionCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.content.ComponentName; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationPermissionCompat.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/NotificationPermissionCompat.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationPermissionCompat.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/NotificationPermissionCompat.java index 5692934..b2c42e2 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationPermissionCompat.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/NotificationPermissionCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.NotificationManager; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionCallback.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/OnPermissionCallback.java similarity index 97% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionCallback.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/OnPermissionCallback.java index 5aee58a..3d13e49 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionCallback.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/OnPermissionCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import androidx.annotation.NonNull; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionPageCallback.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/OnPermissionPageCallback.java similarity index 96% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionPageCallback.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/OnPermissionPageCallback.java index 5617aff..fd437bf 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionPageCallback.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/OnPermissionPageCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; /** * desc : 权限设置页结果回调接口 diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/Permission.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/Permission.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/Permission.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/Permission.java index c0d1373..234f75d 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/Permission.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/Permission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.Manifest; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionApi.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionApi.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionApi.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionApi.java index e67d3e0..f403dbb 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionApi.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionChecker.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionChecker.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionChecker.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionChecker.java index 8ba1164..e0e2130 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionChecker.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionChecker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.Manifest; import android.app.Activity; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegate.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegate.java similarity index 97% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegate.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegate.java index b65e5bd..286edb5 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegate.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV14.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV14.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV14.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV14.java index 822bce3..1a9d07c 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV14.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV14.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV18.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV18.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV18.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV18.java index e8f57af..7a3aa41 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV18.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV18.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV19.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV19.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV19.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV19.java index 2ffe5c3..b6d7824 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV19.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV19.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV21.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV21.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV21.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV21.java index 1217e86..cce8957 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV21.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV21.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.AppOpsManager; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV23.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV23.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV23.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV23.java index 53e6e4a..21b2cf8 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV23.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV23.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.NotificationManager; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV26.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV26.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV26.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV26.java index c110012..2e89283 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV26.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV26.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.AppOpsManager; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV28.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV28.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV28.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV28.java index da9ef74..da5a2a5 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV28.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV28.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV29.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV29.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV29.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV29.java index b2b4c69..b9634c4 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV29.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV29.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV30.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV30.java similarity index 98% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV30.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV30.java index b0acc63..7960b8b 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV30.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV30.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV31.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV31.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV31.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV31.java index 5b28984..acee491 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV31.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV31.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.AlarmManager; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV33.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV33.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV33.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV33.java index f1db694..694bff0 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV33.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionDelegateImplV33.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.content.Context; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionFragment.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionFragment.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionFragment.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionFragment.java index 3a6fba2..0fe04da 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionFragment.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionIntentManager.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionIntentManager.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionIntentManager.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionIntentManager.java index 433420b..45caac6 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionIntentManager.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionIntentManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.content.Context; import android.content.Intent; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionPageFragment.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionPageFragment.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionPageFragment.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionPageFragment.java index 2bac664..4390d16 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionPageFragment.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionPageFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.Fragment; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionUtils.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionUtils.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionUtils.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionUtils.java index 21358ef..30783ff 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionUtils.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PermissionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PhoneRomUtils.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PhoneRomUtils.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PhoneRomUtils.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PhoneRomUtils.java index 14d5688..f51d400 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PhoneRomUtils.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/PhoneRomUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.annotation.SuppressLint; import android.os.Build; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/StartActivityManager.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/StartActivityManager.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/StartActivityManager.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/StartActivityManager.java index 8408034..1a0a41e 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/StartActivityManager.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/StartActivityManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.Fragment; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/WindowPermissionCompat.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/WindowPermissionCompat.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/WindowPermissionCompat.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/WindowPermissionCompat.java index b7bf628..6d023f0 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/WindowPermissionCompat.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/WindowPermissionCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.content.Context; import android.content.Intent; diff --git a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/XPermissions.java b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/XPermissions.java similarity index 99% rename from app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/XPermissions.java rename to app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/XPermissions.java index c861621..ee8f7a4 100644 --- a/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/XPermissions.java +++ b/app-catalog/samples/wPermission/libwPermission/src/main/java/lib/wintmain/wPermission/XPermissions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.xpermissions; +package lib.wintmain.wPermission; import android.app.Activity; import android.app.Fragment; diff --git a/app-catalog/samples/xpermissions/src/main/AndroidManifest.xml b/app-catalog/samples/wPermission/src/main/AndroidManifest.xml similarity index 96% rename from app-catalog/samples/xpermissions/src/main/AndroidManifest.xml rename to app-catalog/samples/wPermission/src/main/AndroidManifest.xml index f384888..0cba994 100644 --- a/app-catalog/samples/xpermissions/src/main/AndroidManifest.xml +++ b/app-catalog/samples/wPermission/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ + package="com.wintmain.wPermission"> @@ -102,13 +102,13 @@ diff --git a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/MyPermissionActivity.java b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/MyPermissionActivity.java similarity index 99% rename from app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/MyPermissionActivity.java rename to app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/MyPermissionActivity.java index bc7e736..ce3e13e 100644 --- a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/MyPermissionActivity.java +++ b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/MyPermissionActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xpermissions; +package com.wintmain.wPermission; import android.content.ComponentName; import android.content.Intent; @@ -38,10 +38,10 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import com.google.android.catalog.framework.annotations.Sample; -import lib.wintmain.toaster.toast.ToastUtils; -import lib.wintmain.xpermissions.OnPermissionCallback; -import lib.wintmain.xpermissions.Permission; -import lib.wintmain.xpermissions.XPermissions; +import lib.wintmain.wToaster.toast.ToastUtils; +import lib.wintmain.wPermission.OnPermissionCallback; +import lib.wintmain.wPermission.Permission; +import lib.wintmain.wPermission.XPermissions; import java.io.IOException; import java.io.InputStream; diff --git a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/NotificationMonitorService.java b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/NotificationMonitorService.java similarity index 95% rename from app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/NotificationMonitorService.java rename to app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/NotificationMonitorService.java index 69e2726..17ccf65 100644 --- a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/NotificationMonitorService.java +++ b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/NotificationMonitorService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.wintmain.xpermissions; +package com.wintmain.wPermission; import android.app.Notification; import android.os.Bundle; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; -import lib.wintmain.toaster.toast.ToastUtils; +import lib.wintmain.wToaster.toast.ToastUtils; /** * 通知消息监控服务 diff --git a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/PermissionInterceptor.java b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/PermissionInterceptor.java similarity index 99% rename from app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/PermissionInterceptor.java rename to app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/PermissionInterceptor.java index 2f2c5ff..554d8af 100644 --- a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/PermissionInterceptor.java +++ b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/PermissionInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xpermissions; +package com.wintmain.wPermission; import android.app.Activity; import android.content.res.Configuration; @@ -30,8 +30,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; -import lib.wintmain.toaster.toast.ToastUtils; -import lib.wintmain.xpermissions.*; +import lib.wintmain.wToaster.toast.ToastUtils; +import lib.wintmain.wPermission.*; import java.util.ArrayList; import java.util.List; diff --git a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/PermissionNameConvert.java b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/PermissionNameConvert.java similarity index 99% rename from app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/PermissionNameConvert.java rename to app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/PermissionNameConvert.java index 618f480..fbe8dd9 100644 --- a/app-catalog/samples/xpermissions/src/main/java/com/wintmain/xpermissions/PermissionNameConvert.java +++ b/app-catalog/samples/wPermission/src/main/java/com/wintmain/wPermission/PermissionNameConvert.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.wintmain.xpermissions; +package com.wintmain.wPermission; import android.content.Context; import android.os.Build; import androidx.annotation.NonNull; -import lib.wintmain.xpermissions.Permission; +import lib.wintmain.wPermission.Permission; import java.util.ArrayList; import java.util.List; diff --git a/app-catalog/samples/xpermissions/src/main/res/drawable/permission_description_popup_bg.xml b/app-catalog/samples/wPermission/src/main/res/drawable/permission_description_popup_bg.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/drawable/permission_description_popup_bg.xml rename to app-catalog/samples/wPermission/src/main/res/drawable/permission_description_popup_bg.xml diff --git a/app-catalog/samples/xpermissions/src/main/res/layout/permission_description_popup.xml b/app-catalog/samples/wPermission/src/main/res/layout/permission_description_popup.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/layout/permission_description_popup.xml rename to app-catalog/samples/wPermission/src/main/res/layout/permission_description_popup.xml diff --git a/app-catalog/samples/xpermissions/src/main/res/layout/permission_main.xml b/app-catalog/samples/wPermission/src/main/res/layout/permission_main.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/layout/permission_main.xml rename to app-catalog/samples/wPermission/src/main/res/layout/permission_main.xml diff --git a/app-catalog/samples/xpermissions/src/main/res/values-zh/strings_demo.xml b/app-catalog/samples/wPermission/src/main/res/values-zh/strings_demo.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/values-zh/strings_demo.xml rename to app-catalog/samples/wPermission/src/main/res/values-zh/strings_demo.xml diff --git a/app-catalog/samples/xpermissions/src/main/res/values-zh/strings_permission.xml b/app-catalog/samples/wPermission/src/main/res/values-zh/strings_permission.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/values-zh/strings_permission.xml rename to app-catalog/samples/wPermission/src/main/res/values-zh/strings_permission.xml diff --git a/app-catalog/samples/xpermissions/src/main/res/values/string_demo.xml b/app-catalog/samples/wPermission/src/main/res/values/string_demo.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/values/string_demo.xml rename to app-catalog/samples/wPermission/src/main/res/values/string_demo.xml diff --git a/app-catalog/samples/xpermissions/src/main/res/values/string_permission.xml b/app-catalog/samples/wPermission/src/main/res/values/string_permission.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/values/string_permission.xml rename to app-catalog/samples/wPermission/src/main/res/values/string_permission.xml diff --git a/app-catalog/samples/xpermissions/src/main/res/xml/locales_config.xml b/app-catalog/samples/wPermission/src/main/res/xml/locales_config.xml similarity index 100% rename from app-catalog/samples/xpermissions/src/main/res/xml/locales_config.xml rename to app-catalog/samples/wPermission/src/main/res/xml/locales_config.xml diff --git a/app-catalog/samples/xplayer/README.md b/app-catalog/samples/wPlayer/README.md similarity index 94% rename from app-catalog/samples/xplayer/README.md rename to app-catalog/samples/wPlayer/README.md index 5cf511e..9eefcc1 100644 --- a/app-catalog/samples/xplayer/README.md +++ b/app-catalog/samples/wPlayer/README.md @@ -1,4 +1,4 @@ -# X player +# wPlayer 缝合怪，实现本地播放音乐文件和在线播放的功能。 入职培训的实训项目，参考的原项目已不可考。 diff --git a/app-catalog/samples/xplayer/build.gradle b/app-catalog/samples/wPlayer/build.gradle similarity index 85% rename from app-catalog/samples/xplayer/build.gradle rename to app-catalog/samples/wPlayer/build.gradle index dffa5c4..2244e7a 100644 --- a/app-catalog/samples/xplayer/build.gradle +++ b/app-catalog/samples/wPlayer/build.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'com.wintmain.xplayer' + namespace 'com.wintmain.wPlayer' buildFeatures { // 模块不加这个，会导致编译报错，找不到import @@ -25,5 +25,5 @@ dependencies { implementation libs.androidx.lifecycle.livedata.ktx implementation libs.androidx.lifecycle.viewmodel.ktx implementation 'com.karumi:dexter:5.0.0' - implementation project(path: ':app-catalog:samples:toaster:libtoaster') + implementation project(path: ':app-catalog:samples:wToaster:libwToaster') } \ No newline at end of file diff --git a/app-catalog/samples/xplayer/libxplayer/build-sunset.gradle b/app-catalog/samples/wPlayer/libxplayer/build-sunset.gradle similarity index 97% rename from app-catalog/samples/xplayer/libxplayer/build-sunset.gradle rename to app-catalog/samples/wPlayer/libxplayer/build-sunset.gradle index db7a724..229ba6d 100644 --- a/app-catalog/samples/xplayer/libxplayer/build-sunset.gradle +++ b/app-catalog/samples/wPlayer/libxplayer/build-sunset.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'lib.wintmain.xplayer' + namespace 'lib.wintmain.wPlayer' buildFeatures { buildConfig = true dataBinding = true diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/AndroidManifest.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/AndroidManifest.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/BaseApp.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/BaseApp.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/BaseApp.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/BaseApp.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseBottomSheetDialog.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseBottomSheetDialog.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseBottomSheetDialog.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseBottomSheetDialog.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLazyLoadingFragment.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLazyLoadingFragment.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLazyLoadingFragment.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLazyLoadingFragment.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingActivity.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingActivity.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingActivity.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingActivity.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingFragment.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingFragment.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingFragment.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseLoadingFragment.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseRepository.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseRepository.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseRepository.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseRepository.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseViewModel.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseViewModel.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseViewModel.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseViewModel.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmActivity.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmActivity.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmActivity.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmActivity.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmFragment.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmFragment.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmFragment.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/BaseVmFragment.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/DataBindingConfig.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/DataBindingConfig.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/DataBindingConfig.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/DataBindingConfig.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/LazyVmFragment.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/LazyVmFragment.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/LazyVmFragment.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/base/LazyVmFragment.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CenterBlurTransformation.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CenterBlurTransformation.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CenterBlurTransformation.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CenterBlurTransformation.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CommonExt.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CommonExt.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CommonExt.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CommonExt.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CustomBindAdapter.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CustomBindAdapter.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CustomBindAdapter.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/CustomBindAdapter.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ImageExt.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ImageExt.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ImageExt.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ImageExt.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/NetExt.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/NetExt.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/NetExt.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/NetExt.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/PlayExt.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/PlayExt.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/PlayExt.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/PlayExt.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ToastExt.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ToastExt.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ToastExt.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ToastExt.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ViewExt.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ViewExt.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ViewExt.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/ViewExt.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/BaseListAdapter.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/BaseListAdapter.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/BaseListAdapter.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/BaseListAdapter.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/DefaultDiff.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/DefaultDiff.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/DefaultDiff.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/DefaultDiff.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/ListUpdateCallbackImp.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/ListUpdateCallbackImp.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/ListUpdateCallbackImp.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/common/adapter/ListUpdateCallbackImp.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/event/SingleLiveEvent.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/event/SingleLiveEvent.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/event/SingleLiveEvent.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/event/SingleLiveEvent.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/ApiException.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/ApiException.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/ApiException.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/ApiException.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/HttpLoggingInterceptor.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/HttpLoggingInterceptor.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/HttpLoggingInterceptor.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/HttpLoggingInterceptor.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/IOUtils.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/IOUtils.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/IOUtils.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/IOUtils.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/JsonUtil.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/JsonUtil.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/JsonUtil.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/JsonUtil.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/OkLogger.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/OkLogger.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/OkLogger.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/http/OkLogger.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/DialogFragmentNavigator.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/DialogFragmentNavigator.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/DialogFragmentNavigator.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/DialogFragmentNavigator.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/FragmentNavigator.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/FragmentNavigator.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/FragmentNavigator.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/FragmentNavigator.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/NavHostFragment.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/NavHostFragment.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/NavHostFragment.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/navigation/NavHostFragment.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayer.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayer.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayer.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayer.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayerStatus.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayerStatus.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayerStatus.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/IPlayerStatus.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/MediaPlayerHelper.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/MediaPlayerHelper.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/MediaPlayerHelper.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/play/MediaPlayerHelper.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/CloseUtils.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/CloseUtils.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/CloseUtils.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/CloseUtils.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ColorUtils.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ColorUtils.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ColorUtils.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ColorUtils.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/KeyBoardUtil.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/KeyBoardUtil.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/KeyBoardUtil.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/KeyBoardUtil.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/OSUtils.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/OSUtils.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/OSUtils.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/OSUtils.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/Param.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/Param.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/Param.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/Param.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ParamUtil.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ParamUtil.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ParamUtil.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ParamUtil.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/PrefUtils.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/PrefUtils.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/PrefUtils.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/PrefUtils.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ScreenUtils.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ScreenUtils.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ScreenUtils.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/ScreenUtils.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/StatusUtils.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/StatusUtils.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/StatusUtils.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/utils/StatusUtils.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/DimPleView.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/DimPleView.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/DimPleView.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/DimPleView.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/GlideRoundTransform.java b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/GlideRoundTransform.java similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/GlideRoundTransform.java rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/GlideRoundTransform.java diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/LoadingTip.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/LoadingTip.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/LoadingTip.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/LoadingTip.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/Particle.kt b/app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/Particle.kt similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/Particle.kt rename to app-catalog/samples/wPlayer/libxplayer/src/main/java/lib/wintmain/xplayer/view/Particle.kt diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/anim/dialog_enter.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/anim/dialog_enter.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/anim/dialog_enter.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/anim/dialog_enter.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/anim/dialog_exit.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/anim/dialog_exit.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/anim/dialog_exit.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/anim/dialog_exit.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/drawable/ic_launcher.png b/app-catalog/samples/wPlayer/libxplayer/src/main/res/drawable/ic_launcher.png similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/drawable/ic_launcher.png rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/drawable/ic_launcher.png diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/drawable/null_data.png b/app-catalog/samples/wPlayer/libxplayer/src/main/res/drawable/null_data.png similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/drawable/null_data.png rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/drawable/null_data.png diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/layout/empty_layout.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/layout/empty_layout.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/layout/empty_layout.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/layout/empty_layout.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/layout/loading_tip.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/layout/loading_tip.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/layout/loading_tip.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/layout/loading_tip.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/layout/view_load_more_common.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/layout/view_load_more_common.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/layout/view_load_more_common.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/layout/view_load_more_common.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/values/attr.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/values/attr.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/values/attr.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/values/attr.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/values/colors.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/values/colors.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/values/colors.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/values/dimens.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/values/dimens.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/values/dimens.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/values/dimens.xml diff --git a/app-catalog/samples/shadowlayout/src/main/res/values/strings.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/values/strings.xml similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/values/strings.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/values/strings.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/values/style.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/values/style.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/values/style.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/values/style.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/values/styles.xml b/app-catalog/samples/wPlayer/libxplayer/src/main/res/values/styles.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/values/styles.xml rename to app-catalog/samples/wPlayer/libxplayer/src/main/res/values/styles.xml diff --git a/app-catalog/samples/xplayer/src/main/AndroidManifest.xml b/app-catalog/samples/wPlayer/src/main/AndroidManifest.xml similarity index 87% rename from app-catalog/samples/xplayer/src/main/AndroidManifest.xml rename to app-catalog/samples/wPlayer/src/main/AndroidManifest.xml index 478c903..dda0820 100644 --- a/app-catalog/samples/xplayer/src/main/AndroidManifest.xml +++ b/app-catalog/samples/wPlayer/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ + package="com.wintmain.wPlayer"> diff --git a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/IExampleAidl.aidl b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/IExampleAidl.aidl similarity index 92% rename from app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/IExampleAidl.aidl rename to app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/IExampleAidl.aidl index 55e54ee..7f758dc 100644 --- a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/IExampleAidl.aidl +++ b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/IExampleAidl.aidl @@ -1,5 +1,5 @@ // IExampleAidl.aidl -package com.wintmain.xplayer; +package com.wintmain.wPlayer; // Declare any non-default types here with import statements diff --git a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnDataIsReadyListener.aidl b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnDataIsReadyListener.aidl similarity index 80% rename from app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnDataIsReadyListener.aidl rename to app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnDataIsReadyListener.aidl index 75be4dc..c9d6b0c 100644 --- a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnDataIsReadyListener.aidl +++ b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnDataIsReadyListener.aidl @@ -1,5 +1,5 @@ // IOnSongChange.aidl -package com.wintmain.xplayer.aidl; +package com.wintmain.wPlayer.aidl; // Declare any non-default types here with import statements diff --git a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnPlayListChangedListener.aidl b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnPlayListChangedListener.aidl similarity index 71% rename from app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnPlayListChangedListener.aidl rename to app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnPlayListChangedListener.aidl index 317cbd7..1e5618d 100644 --- a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnPlayListChangedListener.aidl +++ b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnPlayListChangedListener.aidl @@ -1,6 +1,6 @@ // IOnSongChange.aidl -package com.wintmain.xplayer.aidl; -import com.wintmain.xplayer.aidl.Song; +package com.wintmain.wPlayer.aidl; +import com.wintmain.wPlayer.aidl.Song; // Declare any non-default types here with import statements diff --git a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnPlayStatusChangedListener.aidl b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnPlayStatusChangedListener.aidl similarity index 82% rename from app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnPlayStatusChangedListener.aidl rename to app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnPlayStatusChangedListener.aidl index f45edc0..6a50f51 100644 --- a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnPlayStatusChangedListener.aidl +++ b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnPlayStatusChangedListener.aidl @@ -1,6 +1,6 @@ // IOnSongChange.aidl -package com.wintmain.xplayer.aidl; -import com.wintmain.xplayer.aidl.Song; +package com.wintmain.wPlayer.aidl; +import com.wintmain.wPlayer.aidl.Song; // Declare any non-default types here with import statements diff --git a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnSongChangedListener.aidl b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnSongChangedListener.aidl similarity index 76% rename from app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnSongChangedListener.aidl rename to app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnSongChangedListener.aidl index 41ee2eb..bd5c4d3 100644 --- a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IOnSongChangedListener.aidl +++ b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IOnSongChangedListener.aidl @@ -1,6 +1,6 @@ // IOnSongChange.aidl -package com.wintmain.xplayer.aidl; -import com.wintmain.xplayer.aidl.Song; +package com.wintmain.wPlayer.aidl; +import com.wintmain.wPlayer.aidl.Song; // Declare any non-default types here with import statements diff --git a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IPlayControl.aidl b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IPlayControl.aidl similarity index 87% rename from app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IPlayControl.aidl rename to app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IPlayControl.aidl index 9aa2099..2ad7260 100644 --- a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/IPlayControl.aidl +++ b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/IPlayControl.aidl @@ -1,10 +1,10 @@ // IPlayControl.aidl -package com.wintmain.xplayer.aidl; -import com.wintmain.xplayer.aidl.Song; -import com.wintmain.xplayer.aidl.IOnSongChangedListener; -import com.wintmain.xplayer.aidl.IOnPlayStatusChangedListener; -import com.wintmain.xplayer.aidl.IOnPlayListChangedListener; -import com.wintmain.xplayer.aidl.IOnDataIsReadyListener; +package com.wintmain.wPlayer.aidl; +import com.wintmain.wPlayer.aidl.Song; +import com.wintmain.wPlayer.aidl.IOnSongChangedListener; +import com.wintmain.wPlayer.aidl.IOnPlayStatusChangedListener; +import com.wintmain.wPlayer.aidl.IOnPlayListChangedListener; +import com.wintmain.wPlayer.aidl.IOnDataIsReadyListener; // Declare any non-default types here with import statements interface IPlayControl { diff --git a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/Song.aidl b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/Song.aidl similarity index 69% rename from app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/Song.aidl rename to app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/Song.aidl index 2411181..21c37d1 100644 --- a/app-catalog/samples/xplayer/src/main/aidl/com/wintmain/xplayer/aidl/Song.aidl +++ b/app-catalog/samples/wPlayer/src/main/aidl/com/wintmain/wPlayer/aidl/Song.aidl @@ -1,4 +1,4 @@ -package com.wintmain.xplayer.aidl; +package com.wintmain.wPlayer.aidl; // Declare any non-default types here with import statements parcelable Song; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/DataBaseHelper.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/DataBaseHelper.java similarity index 99% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/DataBaseHelper.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/DataBaseHelper.java index b36f1ff..99f95be 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/DataBaseHelper.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/DataBaseHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; import android.content.ContentValues; import android.content.Context; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/EditPlaylist.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/EditPlaylist.java similarity index 98% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/EditPlaylist.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/EditPlaylist.java index 87280be..b26d52f 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/EditPlaylist.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/EditPlaylist.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; import android.content.Context; import android.view.LayoutInflater; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/ModeSelect.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/ModeSelect.java similarity index 91% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/ModeSelect.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/ModeSelect.java index 2af0d9b..dd5300d 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/ModeSelect.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/ModeSelect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; import android.content.Intent; import android.os.Bundle; @@ -23,10 +23,10 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import com.google.android.catalog.framework.annotations.Sample; -import com.wintmain.xplayer.app.InternetActivity; -import com.wintmain.xplayer.app.LocalActivity; -import com.wintmain.xplayer.app.StartActivity; -import lib.wintmain.toaster.toast.ToastUtils; +import com.wintmain.wPlayer.app.InternetActivity; +import com.wintmain.wPlayer.app.LocalActivity; +import com.wintmain.wPlayer.app.StartActivity; +import lib.wintmain.wToaster.toast.ToastUtils; /** * @Description 选择本地音乐播放器和还是在线音乐播放器，本地播放器会依赖MediaPlayer类读取本机的音频文件进行播放 diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/MusicController.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/MusicController.java similarity index 96% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/MusicController.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/MusicController.java index fee6543..47555e8 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/MusicController.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/MusicController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; import android.content.Context; import android.widget.MediaController; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/MusicService.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/MusicService.java similarity index 99% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/MusicService.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/MusicService.java index 16a6fee..8624217 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/MusicService.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/MusicService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; import android.app.Service; import android.content.ContentUris; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/Playlist.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/Playlist.java similarity index 98% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/Playlist.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/Playlist.java index 3458abf..8b25051 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/Playlist.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/Playlist.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; import android.content.Context; import android.view.LayoutInflater; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/Song.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/Song.java similarity index 97% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/Song.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/Song.java index 9cbdd74..641e203 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/Song.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/Song.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; public class Song { private final long id; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/SongAdapter.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/SongAdapter.java similarity index 98% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/SongAdapter.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/SongAdapter.java index f5709db..eff38f6 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/SongAdapter.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/SongAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer; +package com.wintmain.wPlayer; import android.content.Context; import android.view.LayoutInflater; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnDataIsReadyListener.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnDataIsReadyListener.java similarity index 96% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnDataIsReadyListener.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnDataIsReadyListener.java index 7ccedd2..f941e02 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnDataIsReadyListener.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnDataIsReadyListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer.aidl; +package com.wintmain.wPlayer.aidl; import android.os.IBinder; import android.os.RemoteException; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnPlayListChangedListener.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnPlayListChangedListener.java similarity index 97% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnPlayListChangedListener.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnPlayListChangedListener.java index cc459db..3649c20 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnPlayListChangedListener.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnPlayListChangedListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer.aidl; +package com.wintmain.wPlayer.aidl; import android.os.IBinder; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnPlayStatusChangedListener.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnPlayStatusChangedListener.java similarity index 97% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnPlayStatusChangedListener.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnPlayStatusChangedListener.java index bf07a1a..016942f 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnPlayStatusChangedListener.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnPlayStatusChangedListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer.aidl; +package com.wintmain.wPlayer.aidl; import android.os.IBinder; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnSongChangedListener.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnSongChangedListener.java similarity index 97% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnSongChangedListener.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnSongChangedListener.java index 9abad31..3feb7b9 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/OnSongChangedListener.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/OnSongChangedListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer.aidl; +package com.wintmain.wPlayer.aidl; import android.os.IBinder; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/Song.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/Song.java similarity index 98% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/Song.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/Song.java index 956371a..736a3bf 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/aidl/Song.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/aidl/Song.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer.aidl; +package com.wintmain.wPlayer.aidl; import android.os.Parcel; import android.os.Parcelable; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/InternetActivity.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/InternetActivity.java similarity index 95% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/InternetActivity.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/InternetActivity.java index 5efcba0..6c7f27a 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/InternetActivity.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/InternetActivity.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.wintmain.xplayer.app; +package com.wintmain.wPlayer.app; import android.annotation.SuppressLint; import android.os.Bundle; import android.webkit.WebView; import android.webkit.WebViewClient; import androidx.appcompat.app.AppCompatActivity; -import lib.wintmain.toaster.style.ToastBlackStyle; -import lib.wintmain.toaster.toast.ToastUtils; +import lib.wintmain.wToaster.style.ToastBlackStyle; +import lib.wintmain.wToaster.toast.ToastUtils; /** * @Description diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/LocalActivity.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/LocalActivity.java similarity index 98% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/LocalActivity.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/LocalActivity.java index 4dc792c..2086119 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/LocalActivity.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/LocalActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.xplayer.app; +package com.wintmain.wPlayer.app; import android.Manifest; import android.content.*; @@ -38,9 +38,9 @@ import com.karumi.dexter.listener.PermissionDeniedResponse; import com.karumi.dexter.listener.PermissionGrantedResponse; import com.karumi.dexter.listener.single.PermissionListener; -import com.wintmain.xplayer.*; -import lib.wintmain.toaster.style.ToastBlackStyle; -import lib.wintmain.toaster.toast.ToastUtils; +import com.wintmain.wPlayer.*; +import lib.wintmain.wToaster.style.ToastBlackStyle; +import lib.wintmain.wToaster.toast.ToastUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/StartActivity.java b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/StartActivity.java similarity index 93% rename from app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/StartActivity.java rename to app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/StartActivity.java index 5f5ed10..b242d13 100644 --- a/app-catalog/samples/xplayer/src/main/java/com/wintmain/xplayer/app/StartActivity.java +++ b/app-catalog/samples/wPlayer/src/main/java/com/wintmain/wPlayer/app/StartActivity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.wintmain.xplayer.app; +package com.wintmain.wPlayer.app; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wintmain.xplayer.R; +import com.wintmain.wPlayer.R; public class StartActivity extends AppCompatActivity { diff --git a/app-catalog/samples/xplayer/src/main/res-ext/values/attrs.xml b/app-catalog/samples/wPlayer/src/main/res-ext/values/attrs.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res-ext/values/attrs.xml rename to app-catalog/samples/wPlayer/src/main/res-ext/values/attrs.xml diff --git a/app-catalog/samples/xplayer/src/main/res-ext/values/colors.xml b/app-catalog/samples/wPlayer/src/main/res-ext/values/colors.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res-ext/values/colors.xml rename to app-catalog/samples/wPlayer/src/main/res-ext/values/colors.xml diff --git a/app-catalog/samples/xplayer/src/main/res-ext/values/dimens.xml b/app-catalog/samples/wPlayer/src/main/res-ext/values/dimens.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res-ext/values/dimens.xml rename to app-catalog/samples/wPlayer/src/main/res-ext/values/dimens.xml diff --git a/app-catalog/samples/xplayer/src/main/res-ext/values/strings.xml b/app-catalog/samples/wPlayer/src/main/res-ext/values/strings.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res-ext/values/strings.xml rename to app-catalog/samples/wPlayer/src/main/res-ext/values/strings.xml diff --git a/app-catalog/samples/xplayer/src/main/res-ext/values/styles.xml b/app-catalog/samples/wPlayer/src/main/res-ext/values/styles.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res-ext/values/styles.xml rename to app-catalog/samples/wPlayer/src/main/res-ext/values/styles.xml diff --git a/app-catalog/samples/xplayer/src/main/res/drawable/ic_search_black_24dp.xml b/app-catalog/samples/wPlayer/src/main/res/drawable/ic_search_black_24dp.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/drawable/ic_search_black_24dp.xml rename to app-catalog/samples/wPlayer/src/main/res/drawable/ic_search_black_24dp.xml diff --git a/app-catalog/samples/xplayer/src/main/res/drawable/logo_clean.png b/app-catalog/samples/wPlayer/src/main/res/drawable/logo_clean.png similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/drawable/logo_clean.png rename to app-catalog/samples/wPlayer/src/main/res/drawable/logo_clean.png diff --git a/app-catalog/samples/xplayer/src/main/res/drawable/musicdev.png b/app-catalog/samples/wPlayer/src/main/res/drawable/musicdev.png similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/drawable/musicdev.png rename to app-catalog/samples/wPlayer/src/main/res/drawable/musicdev.png diff --git a/app-catalog/samples/xplayer/src/main/res/layout/editplaylist.xml b/app-catalog/samples/wPlayer/src/main/res/layout/editplaylist.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/layout/editplaylist.xml rename to app-catalog/samples/wPlayer/src/main/res/layout/editplaylist.xml diff --git a/app-catalog/samples/xplayer/src/main/res/layout/internet.xml b/app-catalog/samples/wPlayer/src/main/res/layout/internet.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/layout/internet.xml rename to app-catalog/samples/wPlayer/src/main/res/layout/internet.xml diff --git a/app-catalog/samples/xplayer/src/main/res/layout/music_mode.xml b/app-catalog/samples/wPlayer/src/main/res/layout/music_mode.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/layout/music_mode.xml rename to app-catalog/samples/wPlayer/src/main/res/layout/music_mode.xml diff --git a/app-catalog/samples/xplayer/src/main/res/layout/musicplayer_main.xml b/app-catalog/samples/wPlayer/src/main/res/layout/musicplayer_main.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/layout/musicplayer_main.xml rename to app-catalog/samples/wPlayer/src/main/res/layout/musicplayer_main.xml diff --git a/app-catalog/samples/xplayer/src/main/res/layout/playlist.xml b/app-catalog/samples/wPlayer/src/main/res/layout/playlist.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/layout/playlist.xml rename to app-catalog/samples/wPlayer/src/main/res/layout/playlist.xml diff --git a/app-catalog/samples/xplayer/src/main/res/layout/song.xml b/app-catalog/samples/wPlayer/src/main/res/layout/song.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/layout/song.xml rename to app-catalog/samples/wPlayer/src/main/res/layout/song.xml diff --git a/app-catalog/samples/xplayer/src/main/res/layout/splash_activity.xml b/app-catalog/samples/wPlayer/src/main/res/layout/splash_activity.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/layout/splash_activity.xml rename to app-catalog/samples/wPlayer/src/main/res/layout/splash_activity.xml diff --git a/app-catalog/samples/xplayer/src/main/res/menu/menu.xml b/app-catalog/samples/wPlayer/src/main/res/menu/menu.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/menu/menu.xml rename to app-catalog/samples/wPlayer/src/main/res/menu/menu.xml diff --git a/app-catalog/samples/xplayer/src/main/res/xml/search.xml b/app-catalog/samples/wPlayer/src/main/res/xml/search.xml similarity index 100% rename from app-catalog/samples/xplayer/src/main/res/xml/search.xml rename to app-catalog/samples/wPlayer/src/main/res/xml/search.xml diff --git a/app-catalog/samples/shadowlayout/README.md b/app-catalog/samples/wShadowLayout/README.md similarity index 100% rename from app-catalog/samples/shadowlayout/README.md rename to app-catalog/samples/wShadowLayout/README.md diff --git a/app-catalog/samples/shadowlayout/build.gradle b/app-catalog/samples/wShadowLayout/build.gradle similarity index 73% rename from app-catalog/samples/shadowlayout/build.gradle rename to app-catalog/samples/wShadowLayout/build.gradle index f73b03b..c826354 100644 --- a/app-catalog/samples/shadowlayout/build.gradle +++ b/app-catalog/samples/wShadowLayout/build.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'com.wintmain.shadowlayout' + namespace 'com.wintmain.wShadowLayout' buildFeatures { // 模块不加这个，会导致编译报错，找不到import // 但是不在app层面加这个，会导致启动activity的时候crash @@ -10,6 +10,6 @@ android { } dependencies { - implementation project(path: ':app-catalog:samples:shadowlayout:libshadowlayout') + implementation project(path: ':app-catalog:samples:wShadowLayout:libwShadowLayout') implementation "androidx.databinding:databinding-runtime:8.1.4" } \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/build.gradle b/app-catalog/samples/wShadowLayout/libwShadowLayout/build.gradle similarity index 76% rename from app-catalog/samples/shadowlayout/libshadowlayout/build.gradle rename to app-catalog/samples/wShadowLayout/libwShadowLayout/build.gradle index a337817..5ebc55a 100644 --- a/app-catalog/samples/shadowlayout/libshadowlayout/build.gradle +++ b/app-catalog/samples/wShadowLayout/libwShadowLayout/build.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'lib.wintmain.shadowlayout' + namespace 'lib.wintmain.wShadowLayout' } dependencies { diff --git a/app-catalog/samples/toaster/libtoaster/src/main/AndroidManifest.xml b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/toaster/libtoaster/src/main/AndroidManifest.xml rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundTransform.java b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/GlideRoundTransform.java similarity index 99% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundTransform.java rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/GlideRoundTransform.java index 2a83292..85066f0 100644 --- a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundTransform.java +++ b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/GlideRoundTransform.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.shadowlayout; +package lib.wintmain.wShadowLayout; import android.content.Context; import android.graphics.*; diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundUtils.java b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/GlideRoundUtils.java similarity index 99% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundUtils.java rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/GlideRoundUtils.java index e8d9e16..2dbf3f3 100644 --- a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundUtils.java +++ b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/GlideRoundUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.shadowlayout; +package lib.wintmain.wShadowLayout; import android.graphics.drawable.Drawable; import android.view.View; diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/ShadowLayout.java b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/ShadowLayout.java similarity index 99% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/ShadowLayout.java rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/ShadowLayout.java index 766847b..13566dc 100644 --- a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/ShadowLayout.java +++ b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/java/lib/wintmain/wShadowLayout/ShadowLayout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.shadowlayout; +package lib.wintmain.wShadowLayout; import android.content.Context; import android.content.res.ColorStateList; diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/attrs.xml b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/attrs.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/attrs.xml rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/attrs.xml diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/colors.xml b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/colors.xml rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/colors.xml diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/dimens.xml b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/dimens.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/dimens.xml rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/dimens.xml diff --git a/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/strings.xml b/app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/strings.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/strings.xml rename to app-catalog/samples/wShadowLayout/libwShadowLayout/src/main/res/values/strings.xml diff --git a/app-catalog/samples/shadowlayout/src/main/AndroidManifest.xml b/app-catalog/samples/wShadowLayout/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/AndroidManifest.xml rename to app-catalog/samples/wShadowLayout/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShadowActivity.java b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShadowActivity.java similarity index 92% rename from app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShadowActivity.java rename to app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShadowActivity.java index 94245f7..8694cf1 100644 --- a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShadowActivity.java +++ b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShadowActivity.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.wintmain.shadowlayout; +package com.wintmain.wShadowLayout; import android.content.Intent; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; -import com.wintmain.shadowlayout.databinding.ActivityShadowBinding; +import com.wintmain.wShadowLayout.databinding.ActivityShadowBinding; public class ShadowActivity extends AppCompatActivity { ActivityShadowBinding binding; diff --git a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShadowMainActivity.java b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShadowMainActivity.java similarity index 94% rename from app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShadowMainActivity.java rename to app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShadowMainActivity.java index c7fb4ab..f4603a8 100644 --- a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShadowMainActivity.java +++ b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShadowMainActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.shadowlayout; +package com.wintmain.wShadowLayout; import android.content.Intent; import android.os.Bundle; @@ -22,7 +22,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; import com.google.android.catalog.framework.annotations.Sample; -import com.wintmain.shadowlayout.databinding.ActivityMainBinding; +import com.wintmain.wShadowLayout.databinding.ActivityMainBinding; @Sample( name = "shadowlayout", diff --git a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShapeActivity.java b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShapeActivity.java similarity index 94% rename from app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShapeActivity.java rename to app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShapeActivity.java index c75f454..098c73a 100644 --- a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/ShapeActivity.java +++ b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/ShapeActivity.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.wintmain.shadowlayout; +package com.wintmain.wShadowLayout; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; -import com.wintmain.shadowlayout.databinding.ActivityShapeBinding; +import com.wintmain.wShadowLayout.databinding.ActivityShapeBinding; public class ShapeActivity extends AppCompatActivity { ActivityShapeBinding binding; diff --git a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/StarShowActivity.java b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/StarShowActivity.java similarity index 98% rename from app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/StarShowActivity.java rename to app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/StarShowActivity.java index d629d89..7c5d239 100644 --- a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/StarShowActivity.java +++ b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/StarShowActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.shadowlayout; +package com.wintmain.wShadowLayout; import android.graphics.Color; import android.os.Bundle; @@ -22,7 +22,7 @@ import android.widget.ImageView; import android.widget.SeekBar; import androidx.appcompat.app.AppCompatActivity; -import lib.wintmain.shadowlayout.ShadowLayout; +import lib.wintmain.wShadowLayout.ShadowLayout; public class StarShowActivity extends AppCompatActivity implements View.OnClickListener { private ShadowLayout ShadowLayout; diff --git a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/WikiActivity.java b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/WikiActivity.java similarity index 98% rename from app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/WikiActivity.java rename to app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/WikiActivity.java index 56aa03b..5450f9b 100644 --- a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/WikiActivity.java +++ b/app-catalog/samples/wShadowLayout/src/main/java/com/wintmain/wShadowLayout/WikiActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.wintmain.shadowlayout; +package com.wintmain.wShadowLayout; import android.content.Context; import android.content.Intent; @@ -28,7 +28,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; -import com.wintmain.shadowlayout.databinding.ActivityWikiBinding; +import com.wintmain.wShadowLayout.databinding.ActivityWikiBinding; public class WikiActivity extends AppCompatActivity { diff --git a/app-catalog/samples/shadowlayout/src/main/res/drawable/cb_select_new.xml b/app-catalog/samples/wShadowLayout/src/main/res/drawable/cb_select_new.xml similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/drawable/cb_select_new.xml rename to app-catalog/samples/wShadowLayout/src/main/res/drawable/cb_select_new.xml diff --git a/app-catalog/samples/shadowlayout/src/main/res/drawable/shap_progressbar_web.xml b/app-catalog/samples/wShadowLayout/src/main/res/drawable/shap_progressbar_web.xml similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/drawable/shap_progressbar_web.xml rename to app-catalog/samples/wShadowLayout/src/main/res/drawable/shap_progressbar_web.xml diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_main.xml b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_main.xml similarity index 91% rename from app-catalog/samples/shadowlayout/src/main/res/layout/activity_main.xml rename to app-catalog/samples/wShadowLayout/src/main/res/layout/activity_main.xml index 27d492a..b942cba 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_main.xml +++ b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_main.xml @@ -27,7 +27,7 @@ android:orientation="vertical"> - - + - - + - - + - - + \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shadow.xml b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_shadow.xml similarity index 89% rename from app-catalog/samples/shadowlayout/src/main/res/layout/activity_shadow.xml rename to app-catalog/samples/wShadowLayout/src/main/res/layout/activity_shadow.xml index e771e71..55aa88f 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shadow.xml +++ b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_shadow.xml @@ -26,7 +26,7 @@ android:layout_height="match_parent"> - - - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -281,7 +281,7 @@ - - + \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shape.xml b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_shape.xml similarity index 91% rename from app-catalog/samples/shadowlayout/src/main/res/layout/activity_shape.xml rename to app-catalog/samples/wShadowLayout/src/main/res/layout/activity_shape.xml index 0486223..5be7db9 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shape.xml +++ b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_shape.xml @@ -27,7 +27,7 @@ android:orientation="vertical"> - - - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_starshow.xml b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_starshow.xml similarity index 99% rename from app-catalog/samples/shadowlayout/src/main/res/layout/activity_starshow.xml rename to app-catalog/samples/wShadowLayout/src/main/res/layout/activity_starshow.xml index b35bbd6..0fc6085 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_starshow.xml +++ b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_starshow.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="200dp"> - - + diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_wiki.xml b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_wiki.xml similarity index 93% rename from app-catalog/samples/shadowlayout/src/main/res/layout/activity_wiki.xml rename to app-catalog/samples/wShadowLayout/src/main/res/layout/activity_wiki.xml index 70dcd51..0bed732 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_wiki.xml +++ b/app-catalog/samples/wShadowLayout/src/main/res/layout/activity_wiki.xml @@ -40,7 +40,7 @@ android:max="100" android:progress="5" /> - - - + - + \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/back_icon_black.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/back_icon_black.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/back_icon_black.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/back_icon_black.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/check_off.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/check_off.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/check_off.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/check_off.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/check_on.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/check_on.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/check_on.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/check_on.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/game_6_right.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/game_6_right.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/game_6_right.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/game_6_right.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/game_6_wrong.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/game_6_wrong.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/game_6_wrong.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/game_6_wrong.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/regist_gou_false.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/regist_gou_false.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/regist_gou_false.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/regist_gou_false.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/regist_gou_true.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/regist_gou_true.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/regist_gou_true.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/regist_gou_true.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/test_background_false.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/test_background_false.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/test_background_false.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/test_background_false.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/test_background_true.png b/app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/test_background_true.png similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/mipmap-xhdpi/test_background_true.png rename to app-catalog/samples/wShadowLayout/src/main/res/mipmap-xhdpi/test_background_true.png diff --git a/app-catalog/samples/shadowlayout/src/main/res/values/colors.xml b/app-catalog/samples/wShadowLayout/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/values/colors.xml rename to app-catalog/samples/wShadowLayout/src/main/res/values/colors.xml diff --git a/app-catalog/samples/xplayer/libxplayer/src/main/res/values/strings.xml b/app-catalog/samples/wShadowLayout/src/main/res/values/strings.xml similarity index 100% rename from app-catalog/samples/xplayer/libxplayer/src/main/res/values/strings.xml rename to app-catalog/samples/wShadowLayout/src/main/res/values/strings.xml diff --git a/app-catalog/samples/shadowlayout/src/main/res/values/styles.xml b/app-catalog/samples/wShadowLayout/src/main/res/values/styles.xml similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/values/styles.xml rename to app-catalog/samples/wShadowLayout/src/main/res/values/styles.xml diff --git a/app-catalog/samples/shadowlayout/src/main/res/values/themes.xml b/app-catalog/samples/wShadowLayout/src/main/res/values/themes.xml similarity index 100% rename from app-catalog/samples/shadowlayout/src/main/res/values/themes.xml rename to app-catalog/samples/wShadowLayout/src/main/res/values/themes.xml diff --git a/app-catalog/samples/titlebar/README.md b/app-catalog/samples/wTitlebar/README.md similarity index 100% rename from app-catalog/samples/titlebar/README.md rename to app-catalog/samples/wTitlebar/README.md diff --git a/app-catalog/samples/wTitlebar/build.gradle b/app-catalog/samples/wTitlebar/build.gradle new file mode 100644 index 0000000..434079a --- /dev/null +++ b/app-catalog/samples/wTitlebar/build.gradle @@ -0,0 +1,9 @@ +apply from: "$rootDir/gradle/sample-build.gradle" + +android { + namespace 'com.wintmain.wTitlebar' +} + +dependencies { + implementation project(path: ':app-catalog:samples:wTitlebar:libwTitlebar') +} diff --git a/app-catalog/samples/titlebar/libtitlebar/build.gradle b/app-catalog/samples/wTitlebar/libwTitlebar/build.gradle similarity index 67% rename from app-catalog/samples/titlebar/libtitlebar/build.gradle rename to app-catalog/samples/wTitlebar/libwTitlebar/build.gradle index 864be6f..4321bf9 100644 --- a/app-catalog/samples/titlebar/libtitlebar/build.gradle +++ b/app-catalog/samples/wTitlebar/libwTitlebar/build.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'lib.wintmain.titlebar' + namespace 'lib.wintmain.wTitlebar' } dependencies { diff --git a/app-catalog/samples/foundation/libfoundation/src/main/AndroidManifest.xml b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/AndroidManifest.xml similarity index 93% rename from app-catalog/samples/foundation/libfoundation/src/main/AndroidManifest.xml rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/AndroidManifest.xml index 09ec537..cfe1638 100644 --- a/app-catalog/samples/foundation/libfoundation/src/main/AndroidManifest.xml +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/AndroidManifest.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - + \ No newline at end of file diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/ITitleBarStyle.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/ITitleBarStyle.java similarity index 99% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/ITitleBarStyle.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/ITitleBarStyle.java index 4ff64d7..38fcbed 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/ITitleBarStyle.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/ITitleBarStyle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.titlebar; +package lib.wintmain.wTitlebar; import android.content.Context; import android.content.res.ColorStateList; diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/OnTitleBarListener.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/OnTitleBarListener.java similarity index 97% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/OnTitleBarListener.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/OnTitleBarListener.java index 17c72c7..993ab32 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/OnTitleBarListener.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/OnTitleBarListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.titlebar; +package lib.wintmain.wTitlebar; /** desc : 标题栏点击监听接口 */ public interface OnTitleBarListener { diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/SelectorDrawable.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/SelectorDrawable.java similarity index 99% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/SelectorDrawable.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/SelectorDrawable.java index 8453a6f..126ce23 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/SelectorDrawable.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/SelectorDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.titlebar; +package lib.wintmain.wTitlebar; import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarExt.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/TitleBarExt.java similarity index 99% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarExt.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/TitleBarExt.java index 5908b4a..19937d4 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarExt.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/TitleBarExt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.titlebar; +package lib.wintmain.wTitlebar; import android.annotation.SuppressLint; import android.content.Context; @@ -31,10 +31,10 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.TextView; -import lib.wintmain.titlebar.style.LightBarStyle; -import lib.wintmain.titlebar.style.NightBarStyle; -import lib.wintmain.titlebar.style.RippleBarStyle; -import lib.wintmain.titlebar.style.TransparentBarStyle; +import lib.wintmain.wTitlebar.style.LightBarStyle; +import lib.wintmain.wTitlebar.style.NightBarStyle; +import lib.wintmain.wTitlebar.style.RippleBarStyle; +import lib.wintmain.wTitlebar.style.TransparentBarStyle; /** * desc : 标题栏框架 diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarSupport.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/TitleBarSupport.java similarity index 99% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarSupport.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/TitleBarSupport.java index a0c63fc..a5c064b 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarSupport.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/TitleBarSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.titlebar; +package lib.wintmain.wTitlebar; import android.content.Context; import android.graphics.*; diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/CommonBarStyle.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/CommonBarStyle.java similarity index 98% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/CommonBarStyle.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/CommonBarStyle.java index b287d32..f862150 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/CommonBarStyle.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/CommonBarStyle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.titlebar.style; +package lib.wintmain.wTitlebar.style; import android.app.Activity; import android.content.Context; @@ -27,8 +27,8 @@ import android.view.Gravity; import android.view.View; import android.widget.TextView; -import lib.wintmain.titlebar.ITitleBarStyle; -import lib.wintmain.titlebar.TitleBarSupport; +import lib.wintmain.wTitlebar.ITitleBarStyle; +import lib.wintmain.wTitlebar.TitleBarSupport; /** * desc : 默认初始化器基类 diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/LightBarStyle.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/LightBarStyle.java similarity index 93% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/LightBarStyle.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/LightBarStyle.java index 9a08de7..f391d83 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/LightBarStyle.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/LightBarStyle.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package lib.wintmain.titlebar.style; +package lib.wintmain.wTitlebar.style; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import lib.wintmain.titlebar.R; -import lib.wintmain.titlebar.SelectorDrawable; -import lib.wintmain.titlebar.TitleBarSupport; +import lib.wintmain.wTitlebar.R; +import lib.wintmain.wTitlebar.SelectorDrawable; +import lib.wintmain.wTitlebar.TitleBarSupport; /** desc : 日间主题样式实现（对应布局属性：app:barStyle="light"） */ public class LightBarStyle extends CommonBarStyle { diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/NightBarStyle.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/NightBarStyle.java similarity index 93% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/NightBarStyle.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/NightBarStyle.java index 4c37e0d..07963f9 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/NightBarStyle.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/NightBarStyle.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package lib.wintmain.titlebar.style; +package lib.wintmain.wTitlebar.style; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import lib.wintmain.titlebar.R; -import lib.wintmain.titlebar.SelectorDrawable; -import lib.wintmain.titlebar.TitleBarSupport; +import lib.wintmain.wTitlebar.R; +import lib.wintmain.wTitlebar.SelectorDrawable; +import lib.wintmain.wTitlebar.TitleBarSupport; /** * desc : 夜间主题样式实现（对应布局属性：app:barStyle="night"） diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/RippleBarStyle.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/RippleBarStyle.java similarity index 95% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/RippleBarStyle.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/RippleBarStyle.java index 8e3502e..dec75a1 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/RippleBarStyle.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/RippleBarStyle.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package lib.wintmain.titlebar.style; +package lib.wintmain.wTitlebar.style; import android.content.Context; import android.graphics.drawable.Drawable; import android.util.TypedValue; -import lib.wintmain.titlebar.TitleBarSupport; +import lib.wintmain.wTitlebar.TitleBarSupport; /** desc : 水波纹样式实现（对应布局属性：app:barStyle="ripple"） */ public class RippleBarStyle extends TransparentBarStyle { diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/TransparentBarStyle.java b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/TransparentBarStyle.java similarity index 93% rename from app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/TransparentBarStyle.java rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/TransparentBarStyle.java index 0521abb..cc86f3d 100644 --- a/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/TransparentBarStyle.java +++ b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/java/lib/wintmain/wTitlebar/style/TransparentBarStyle.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package lib.wintmain.titlebar.style; +package lib.wintmain.wTitlebar.style; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import lib.wintmain.titlebar.R; -import lib.wintmain.titlebar.SelectorDrawable; -import lib.wintmain.titlebar.TitleBarSupport; +import lib.wintmain.wTitlebar.R; +import lib.wintmain.wTitlebar.SelectorDrawable; +import lib.wintmain.wTitlebar.TitleBarSupport; /** desc : 透明主题样式实现（对应布局属性：app:barStyle="transparent"） */ public class TransparentBarStyle extends CommonBarStyle { diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_black.xml b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/drawable/bar_arrows_left_black.xml similarity index 100% rename from app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_black.xml rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/drawable/bar_arrows_left_black.xml diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_white.xml b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/drawable/bar_arrows_left_white.xml similarity index 100% rename from app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_white.xml rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/drawable/bar_arrows_left_white.xml diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_drawable_placeholder.xml b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/drawable/bar_drawable_placeholder.xml similarity index 100% rename from app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_drawable_placeholder.xml rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/drawable/bar_drawable_placeholder.xml diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/res/values/attrs.xml b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/values/attrs.xml similarity index 100% rename from app-catalog/samples/titlebar/libtitlebar/src/main/res/values/attrs.xml rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/values/attrs.xml diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/res/values/string.xml b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/values/string.xml similarity index 100% rename from app-catalog/samples/titlebar/libtitlebar/src/main/res/values/string.xml rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/values/string.xml diff --git a/app-catalog/samples/titlebar/libtitlebar/src/main/res/values/style.xml b/app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/values/style.xml similarity index 100% rename from app-catalog/samples/titlebar/libtitlebar/src/main/res/values/style.xml rename to app-catalog/samples/wTitlebar/libwTitlebar/src/main/res/values/style.xml diff --git a/app-catalog/samples/titlebar/src/main/AndroidManifest.xml b/app-catalog/samples/wTitlebar/src/main/AndroidManifest.xml similarity index 96% rename from app-catalog/samples/titlebar/src/main/AndroidManifest.xml rename to app-catalog/samples/wTitlebar/src/main/AndroidManifest.xml index 85438d8..4483b4e 100644 --- a/app-catalog/samples/titlebar/src/main/AndroidManifest.xml +++ b/app-catalog/samples/wTitlebar/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ --> + package="com.wintmain.wTitlebar"> - - - - - - - - - - - - - - - + - - + - @@ -329,9 +329,9 @@ - + - - + package="com.wintmain.wToaster">