diff --git a/app-catalog/app/build.gradle b/app-catalog/app/build.gradle
index 487a5c2..0ebc6d1 100644
--- a/app-catalog/app/build.gradle
+++ b/app-catalog/app/build.gradle
@@ -33,8 +33,8 @@ android {
applicationId "com.wintmain.catalog.app"
minSdk 26
targetSdk 34
- versionCode 20241003
- versionName 'V20241003'
+ versionCode 20241009
+ versionName 'V20241009'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app-catalog/samples/foundation/src/main/AndroidManifest.xml b/app-catalog/samples/foundation/src/main/AndroidManifest.xml
index 9b3dbbe..91e872c 100644
--- a/app-catalog/samples/foundation/src/main/AndroidManifest.xml
+++ b/app-catalog/samples/foundation/src/main/AndroidManifest.xml
@@ -65,186 +65,186 @@
android:theme="@style/Theme.AppCompat.DayNight" />
-
-
-
-
-
-
@@ -254,83 +254,83 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -340,7 +340,7 @@
android:theme="@style/Theme.AppCompat.DayNight" />
@@ -349,7 +349,7 @@
@@ -358,7 +358,7 @@
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep1_UI.kt
similarity index 99%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep1_UI.kt
index b61eef6..05aed59 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep1_UI.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.uiDemo
+package com.wintmain.foundation.prejob
import android.annotation.SuppressLint
import android.content.Context
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep2_UIWidget.kt
similarity index 99%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep2_UIWidget.kt
index 02df9c3..5214684 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep2_UIWidget.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.uiDemo
+package com.wintmain.foundation.prejob
import android.app.AlertDialog
import android.app.Notification.Builder
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep3_UIInteraction.kt
similarity index 99%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep3_UIInteraction.kt
index 09f83d1..238446a 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep3_UIInteraction.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.uiDemo
+package com.wintmain.foundation.prejob
import android.content.Intent
import android.content.res.Configuration
@@ -41,7 +41,7 @@ import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.google.android.catalog.framework.annotations.Sample
import com.wintmain.foundation.R
-import com.wintmain.foundation.prejob.uiDemo.ep3_7.DetailActivity
+import com.wintmain.foundation.prejob.ep3_7.DetailActivity
import java.io.Serializable
import java.text.DecimalFormat
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep4_Intent.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep4_Intent.kt
similarity index 99%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep4_Intent.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep4_Intent.kt
index aa12df7..7650857 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep4_Intent.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep4_Intent.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.extDemo
+package com.wintmain.foundation.prejob
import android.content.Intent
import android.net.Uri
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep5_Menu.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep5_Menu.kt
similarity index 99%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep5_Menu.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep5_Menu.kt
index 100af68..976b1a1 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep5_Menu.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep5_Menu.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.extDemo
+package com.wintmain.foundation.prejob
import android.content.res.XmlResourceParser
import android.graphics.Color
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep6_ContentResolver.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep6_ContentResolver.kt
similarity index 99%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep6_ContentResolver.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep6_ContentResolver.kt
index 47fed29..54b71bf 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep6_ContentResolver.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep6_ContentResolver.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.extDemo
+package com.wintmain.foundation.prejob
import android.content.ContentResolver
import android.content.Context
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/upDemo/Ep7_Runable.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep7_Runable.kt
similarity index 99%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/upDemo/Ep7_Runable.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep7_Runable.kt
index 6d6308b..433c28a 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/upDemo/Ep7_Runable.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep7_Runable.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.upDemo
+package com.wintmain.foundation.prejob
import android.media.MediaPlayer
import android.os.Bundle
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/upDemo/Ep8_Receiver.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep8_Receiver.kt
similarity index 97%
rename from app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/upDemo/Ep8_Receiver.kt
rename to app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep8_Receiver.kt
index 78ca4fd..a4ec396 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/upDemo/Ep8_Receiver.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/Ep8_Receiver.kt
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package com.wintmain.foundation.prejob.upDemo
+package com.wintmain.foundation.prejob
-import android.app.Activity
import android.content.BroadcastReceiver
import android.content.ComponentName
import android.content.Context
@@ -141,7 +140,7 @@ class ep9_3 : AppCompatActivity() {
intent1.setComponent(
ComponentName(
"com.wintmain.foundation",
- "com.wintmain.foundation.prejob.upDemo.MyBroadcastReceiver"
+ "com.wintmain.foundation.prejob.MyBroadcastReceiver"
)
)
sendBroadcast(intent1)
@@ -152,7 +151,7 @@ class ep9_3 : AppCompatActivity() {
intent2.setComponent(
ComponentName(
"com.wintmain.foundation",
- "com.wintmain.foundation.prejob.upDemo.AnotherBroadcastReceiver"
+ "com.wintmain.foundation.prejob.AnotherBroadcastReceiver"
)
)
sendBroadcast(intent2)
diff --git a/app-catalog/samples/foundation/src/main/res/layout-land/ep3_7.xml b/app-catalog/samples/foundation/src/main/res/layout-land/ep3_7.xml
index cc7cda0..5724668 100644
--- a/app-catalog/samples/foundation/src/main/res/layout-land/ep3_7.xml
+++ b/app-catalog/samples/foundation/src/main/res/layout-land/ep3_7.xml
@@ -22,7 +22,7 @@