From 7a269d65afed446248db126faa8d33f4523acce1 Mon Sep 17 00:00:00 2001 From: ganeshrevadi Date: Fri, 2 Dec 2022 11:55:45 +0530 Subject: [PATCH 1/2] Check --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 52 +++++++++++++------ .../example/android/miwok/ColorsActivity.java | 14 +++++ .../example/android/miwok/FamilyActivity.java | 14 +++++ .../example/android/miwok/MainActivity.java | 34 ++++++++++++ .../android/miwok/NumbersActivity.java | 35 +++++++++++++ .../android/miwok/PhrasesActivity.java | 14 +++++ app/src/main/res/layout/activity_colors.xml | 9 ++++ app/src/main/res/layout/activity_family.xml | 9 ++++ app/src/main/res/layout/activity_main.xml | 14 +++-- app/src/main/res/layout/activity_numbers.xml | 13 +++++ app/src/main/res/layout/activity_phrases.xml | 9 ++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 14 files changed, 200 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/com/example/android/miwok/ColorsActivity.java create mode 100644 app/src/main/java/com/example/android/miwok/FamilyActivity.java create mode 100644 app/src/main/java/com/example/android/miwok/NumbersActivity.java create mode 100644 app/src/main/java/com/example/android/miwok/PhrasesActivity.java create mode 100644 app/src/main/res/layout/activity_colors.xml create mode 100644 app/src/main/res/layout/activity_family.xml create mode 100644 app/src/main/res/layout/activity_numbers.xml create mode 100644 app/src/main/res/layout/activity_phrases.xml diff --git a/app/build.gradle b/app/build.gradle index 7e5cb6a18..385073025 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 744c73868..612eef721 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,18 +1,4 @@ - @@ -22,7 +8,41 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + + + + + + + + + + + + @@ -31,4 +51,4 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/example/android/miwok/ColorsActivity.java b/app/src/main/java/com/example/android/miwok/ColorsActivity.java new file mode 100644 index 000000000..277f4019c --- /dev/null +++ b/app/src/main/java/com/example/android/miwok/ColorsActivity.java @@ -0,0 +1,14 @@ +package com.example.android.miwok; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class ColorsActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_colors); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/android/miwok/FamilyActivity.java b/app/src/main/java/com/example/android/miwok/FamilyActivity.java new file mode 100644 index 000000000..260922334 --- /dev/null +++ b/app/src/main/java/com/example/android/miwok/FamilyActivity.java @@ -0,0 +1,14 @@ +package com.example.android.miwok; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class FamilyActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_family); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/android/miwok/MainActivity.java b/app/src/main/java/com/example/android/miwok/MainActivity.java index d6d18eb26..c0b1224ef 100644 --- a/app/src/main/java/com/example/android/miwok/MainActivity.java +++ b/app/src/main/java/com/example/android/miwok/MainActivity.java @@ -15,7 +15,10 @@ */ package com.example.android.miwok; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.TextView; // import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity; @@ -27,5 +30,36 @@ protected void onCreate(Bundle savedInstanceState) { // Set the content of the activity to use the activity_main.xml layout file setContentView(R.layout.activity_main); + // Find the View that shows the numbers category + TextView numbers = (TextView) findViewById(R.id.numbers); + +// Set a click listener on that View + numbers.setOnClickListener(new View.OnClickListener() { + // The code in this method will be executed when the numbers View is clicked on. + @Override + public void onClick(View view) { + Intent numbersIntent = new Intent(MainActivity.this, NumbersActivity.class); + startActivity(numbersIntent); + } + }); + } + ; + + public void openNumbersList(View view){ + Intent i = new Intent(this,NumbersActivity.class); + startActivity(i); + } + + public void openColorsList(View view){ + Intent i = new Intent(this,ColorsActivity.class); + startActivity(i); + } + public void openFamilyList(View view){ + Intent i = new Intent(this,FamilyActivity.class); + startActivity(i); + } + public void openPhrasesList(View view){ + Intent i = new Intent(this,PhrasesActivity.class); + startActivity(i); } } diff --git a/app/src/main/java/com/example/android/miwok/NumbersActivity.java b/app/src/main/java/com/example/android/miwok/NumbersActivity.java new file mode 100644 index 000000000..1c63dc489 --- /dev/null +++ b/app/src/main/java/com/example/android/miwok/NumbersActivity.java @@ -0,0 +1,35 @@ +package com.example.android.miwok; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; +import android.util.Log; +import android.widget.LinearLayout; +import android.widget.TextView; + +import java.util.ArrayList; + +public class NumbersActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_numbers); + ArrayList words = new ArrayList(); + words.add("one"); + words.add("two"); + words.add("three"); + words.add("four"); + words.add("five"); + words.add("six"); + words.add("seven"); + words.add("eight"); + words.add("nine"); + words.add("ten"); + + LinearLayout rootView = (LinearLayout)findViewById(R.id.rootView); + TextView wordView = new TextView(this); + wordView.setText(words.get(0)); + rootView.addView(wordView); + } + } diff --git a/app/src/main/java/com/example/android/miwok/PhrasesActivity.java b/app/src/main/java/com/example/android/miwok/PhrasesActivity.java new file mode 100644 index 000000000..6f6db8acb --- /dev/null +++ b/app/src/main/java/com/example/android/miwok/PhrasesActivity.java @@ -0,0 +1,14 @@ +package com.example.android.miwok; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class PhrasesActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_phrases); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_colors.xml b/app/src/main/res/layout/activity_colors.xml new file mode 100644 index 000000000..5fff9f7b8 --- /dev/null +++ b/app/src/main/res/layout/activity_colors.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_family.xml b/app/src/main/res/layout/activity_family.xml new file mode 100644 index 000000000..82254519f --- /dev/null +++ b/app/src/main/res/layout/activity_family.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7aee2b9ac..57ec6ce66 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -26,24 +26,30 @@ android:id="@+id/numbers" style="@style/CategoryStyle" android:background="@color/category_numbers" - android:text="@string/category_numbers" /> + android:text="@string/category_numbers" + android:onClick="openNumbersList"/> + android:text="@string/category_family" + android:onClick="openFamilyList" + /> + android:text="@string/category_colors" + android:onClick="openColorsList"/> + android:text="@string/category_phrases" + android:onClick="openPhrasesList" + /> diff --git a/app/src/main/res/layout/activity_numbers.xml b/app/src/main/res/layout/activity_numbers.xml new file mode 100644 index 000000000..ab8f7dfb4 --- /dev/null +++ b/app/src/main/res/layout/activity_numbers.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_phrases.xml b/app/src/main/res/layout/activity_phrases.xml new file mode 100644 index 000000000..80b3a3164 --- /dev/null +++ b/app/src/main/res/layout/activity_phrases.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5aff577ce..da45b924e 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' + classpath 'com.android.tools.build:gradle:7.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca896a9c6..d66f36f20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip From 76c8116d30d29ec08c4b7078fd00587196fe2395 Mon Sep 17 00:00:00 2001 From: ganeshrevadi Date: Tue, 13 Dec 2022 23:02:12 +0530 Subject: [PATCH 2/2] Check --- .../android/miwok/NumbersActivity.java | 39 ++++++----- .../com/example/android/miwok/TextView.java | 65 +++++++++++++++++++ .../java/com/example/android/miwok/Word.java | 4 ++ app/src/main/res/layout/activity_numbers.xml | 17 +++-- app/src/main/res/layout/list_item.xml | 6 ++ 5 files changed, 105 insertions(+), 26 deletions(-) create mode 100644 app/src/main/java/com/example/android/miwok/TextView.java create mode 100644 app/src/main/java/com/example/android/miwok/Word.java create mode 100644 app/src/main/res/layout/list_item.xml diff --git a/app/src/main/java/com/example/android/miwok/NumbersActivity.java b/app/src/main/java/com/example/android/miwok/NumbersActivity.java index 1c63dc489..c5a0e8632 100644 --- a/app/src/main/java/com/example/android/miwok/NumbersActivity.java +++ b/app/src/main/java/com/example/android/miwok/NumbersActivity.java @@ -4,7 +4,9 @@ import android.os.Bundle; import android.util.Log; +import android.widget.ArrayAdapter; import android.widget.LinearLayout; +import android.widget.ListView; import android.widget.TextView; import java.util.ArrayList; @@ -15,21 +17,24 @@ public class NumbersActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_numbers); - ArrayList words = new ArrayList(); - words.add("one"); - words.add("two"); - words.add("three"); - words.add("four"); - words.add("five"); - words.add("six"); - words.add("seven"); - words.add("eight"); - words.add("nine"); - words.add("ten"); - - LinearLayout rootView = (LinearLayout)findViewById(R.id.rootView); - TextView wordView = new TextView(this); - wordView.setText(words.get(0)); - rootView.addView(wordView); - } + ArrayList words = new ArrayList(); + + //words.add one + words.add(new Word()); + + + ArrayAdapter itemsAdapter = new ArrayAdapter(this,R.layout.list_item, words); + + ListView listView = (ListView) findViewById(R.id.list); + + listView.setAdapter(itemsAdapter); + + + + + + } + + } + diff --git a/app/src/main/java/com/example/android/miwok/TextView.java b/app/src/main/java/com/example/android/miwok/TextView.java new file mode 100644 index 000000000..2e6ea6257 --- /dev/null +++ b/app/src/main/java/com/example/android/miwok/TextView.java @@ -0,0 +1,65 @@ +package com.example.android.miwok; + +import android.content.Context; +import android.view.View; + +/** + * Displays text to the user. + */ +public class TextView extends View { + + // String value + private String mText; + + // Text color of the text + private int mTextColor; + + // Context of the app + private Context mContext; + + /** + * Constructs a new TextView with initial values for text and text color. + */ + public TextView(Context context) { + super(context); + mText = ""; + mTextColor = 0; + mContext = context; + } + + /** + * Sets the string value in the TextView. + * + * @param text is the updated string to be displayed. + */ + public void setText(String text) { + mText = text; + } + + /** + * Sets the text color of the TextView. + * + * @param color of text to be displayed. + */ + public void setTextColor(int color) { + mTextColor = color; + } + + /** + * Gets the string value in the TextView. + * + * @return current text in the TextView. + */ + public String getText() { + return mText; + } + + /** + * Gets the text color of the TextView. + * + * @return current text color. + */ + public int getTextColor() { + return mTextColor; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/android/miwok/Word.java b/app/src/main/java/com/example/android/miwok/Word.java new file mode 100644 index 000000000..f27871d0a --- /dev/null +++ b/app/src/main/java/com/example/android/miwok/Word.java @@ -0,0 +1,4 @@ +package com.example.android.miwok; + +public class Word { +} diff --git a/app/src/main/res/layout/activity_numbers.xml b/app/src/main/res/layout/activity_numbers.xml index ab8f7dfb4..8ae3a9ece 100644 --- a/app/src/main/res/layout/activity_numbers.xml +++ b/app/src/main/res/layout/activity_numbers.xml @@ -1,13 +1,12 @@ - - - - \ No newline at end of file + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context="com.example.android.miwok.NumbersActivity"/> diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml new file mode 100644 index 000000000..41d2ef14c --- /dev/null +++ b/app/src/main/res/layout/list_item.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file