From 5ff8f589d2939273aea29512ac89fbd822324401 Mon Sep 17 00:00:00 2001 From: Mihai-Cristian Condrea Date: Tue, 3 Mar 2026 17:00:01 +0200 Subject: [PATCH] Normalize lesson activity naming and document lesson template --- app/src/main/AndroidManifest.xml | 6 +-- ...story.java => AndroidHistoryActivity.java} | 4 +- ...ndroidSDK.java => AndroidSdkActivity.java} | 2 +- ...iewActivity.java => GridViewActivity.java} | 2 +- .../res/xml/preferences_android_studio.xml | 6 +-- docs/general/style-guidance.md | 38 +++++++++++++++++++ 6 files changed, 48 insertions(+), 10 deletions(-) rename app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/{AndroidHistory.java => AndroidHistoryActivity.java} (93%) rename app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/{AndroidSDK.java => AndroidSdkActivity.java} (98%) rename app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/{GirdViewActivity.java => GridViewActivity.java} (98%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 34219a26..29fa2bee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -183,7 +183,7 @@ android:label="@string/chronometer" android:parentActivityName=".ui.screens.main.MainActivity" /> @@ -218,7 +218,7 @@ android:label="@string/view_model" android:parentActivityName=".ui.screens.main.MainActivity" /> @@ -243,7 +243,7 @@ android:label="@string/android_start" android:parentActivityName=".ui.screens.main.MainActivity" /> diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistoryActivity.java similarity index 93% rename from app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java rename to app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistoryActivity.java index 40c8ab59..910cfcb6 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistoryActivity.java @@ -9,7 +9,7 @@ import me.zhanghai.android.fastscroll.FastScrollerBuilder; -public class AndroidHistory extends UpNavigationActivity { +public class AndroidHistoryActivity extends UpNavigationActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -20,4 +20,4 @@ protected void onCreate(Bundle savedInstanceState) { AdUtils.loadBanner(binding.adViewBottom); new FastScrollerBuilder(binding.scrollView).useMd2Style().build(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSdkActivity.java similarity index 98% rename from app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java rename to app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSdkActivity.java index 6e97ddca..113a1e1b 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSdkActivity.java @@ -18,7 +18,7 @@ import me.zhanghai.android.fastscroll.FastScrollerBuilder; -public class AndroidSDK extends UpNavigationActivity { +public class AndroidSdkActivity extends UpNavigationActivity { private final List androidVersions = Arrays.asList( new AndroidVersion("1.0", "1", "BASE", "None", "2008"), new AndroidVersion("1.1", "2", "BASE_1_1", "Petit Four", "2009"), diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GridViewActivity.java similarity index 98% rename from app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java rename to app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GridViewActivity.java index 164776f8..7331556a 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GridViewActivity.java @@ -18,7 +18,7 @@ import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity; import com.d4rk.androidtutorials.java.utils.EdgeToEdgeHelper; -public class GirdViewActivity extends SyntaxFabActivity { +public class GridViewActivity extends SyntaxFabActivity { private final String[] numbers = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"}; private ActivityGridViewBinding binding; diff --git a/app/src/main/res/xml/preferences_android_studio.xml b/app/src/main/res/xml/preferences_android_studio.xml index d99c7a6b..94db590c 100644 --- a/app/src/main/res/xml/preferences_android_studio.xml +++ b/app/src/main/res/xml/preferences_android_studio.xml @@ -32,7 +32,7 @@ app:title="@string/history_of_android"> // +├── Activity.java +├── tabs/ # optional: tab fragments for code/layout split +│ ├── TabCodeFragment.java +│ └── TabLayoutFragment.java +``` + +### Required raw files + +Create both source snippets in `app/src/main/res/raw/`: + +- `text__java.txt` +- `text__xml.txt` + +Use the same `` token (snake_case) in both filenames. + +### Registration points + +After adding files, register the lesson in all required places: + +1. **Activity declaration** in `app/src/main/AndroidManifest.xml`. +2. **Lesson entry** in `app/src/main/res/xml/preferences_android_studio.xml` via an intent target to `Activity`. +3. **Code viewer mapping** so the lesson key resolves to `text__java` and `text__xml` resources when opening syntax/code screens. + +### Naming rules + +- Class name and filename must match exactly (`Activity.java` -> `class Activity`). +- Keep lesson folders in lowercase (`//`). +- Optional supporting classes are allowed, but each lesson package must contain a single canonical `Activity` entry point. +