diff --git a/Assignments/CriminalIntent12/.idea/deploymentTargetDropDown.xml b/Assignments/CriminalIntent12/.idea/deploymentTargetDropDown.xml index 89435ac..0c0c338 100644 --- a/Assignments/CriminalIntent12/.idea/deploymentTargetDropDown.xml +++ b/Assignments/CriminalIntent12/.idea/deploymentTargetDropDown.xml @@ -3,20 +3,7 @@ - - - - - - - - - - - - - - + diff --git a/Assignments/CriminalIntent12/app/src/main/java/asdv/lisset/criminalintent/CrimeFragment.java b/Assignments/CriminalIntent12/app/src/main/java/asdv/lisset/criminalintent/CrimeFragment.java index 7298975..f73815d 100644 --- a/Assignments/CriminalIntent12/app/src/main/java/asdv/lisset/criminalintent/CrimeFragment.java +++ b/Assignments/CriminalIntent12/app/src/main/java/asdv/lisset/criminalintent/CrimeFragment.java @@ -137,7 +137,7 @@ public class CrimeFragment extends Fragment { date.setMinutes(minute); crime.setDate(date); updateDate(); - getActivity().setResult(778, data); + getActivity().setResult(REQUEST_TIME, data); } //if (resultCode != Activity.RESULT_OK) { diff --git a/Assignments/CriminalIntentChapter7/.idea/appInsightsSettings.xml b/Assignments/CriminalIntentChapter7/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..371f2e2 --- /dev/null +++ b/Assignments/CriminalIntentChapter7/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/app/build.gradle b/Assignments/CriminalIntentChapter7/app/build.gradle index f16309b..5a80337 100644 --- a/Assignments/CriminalIntentChapter7/app/build.gradle +++ b/Assignments/CriminalIntentChapter7/app/build.gradle @@ -13,7 +13,6 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -30,10 +29,8 @@ android { dependencies { - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'com.android.support:recyclerview-v7:28.0.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/app/src/androidTest/java/com/example/criminalintentchapter7/ExampleInstrumentedTest.java b/Assignments/CriminalIntentChapter7/app/src/androidTest/java/com/example/criminalintentchapter7/ExampleInstrumentedTest.java index 5731f2e..87a0742 100644 --- a/Assignments/CriminalIntentChapter7/app/src/androidTest/java/com/example/criminalintentchapter7/ExampleInstrumentedTest.java +++ b/Assignments/CriminalIntentChapter7/app/src/androidTest/java/com/example/criminalintentchapter7/ExampleInstrumentedTest.java @@ -1,9 +1,8 @@ package com.example.criminalintentchapter7; import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; @@ -11,18 +10,17 @@ import org.junit.runner.RunWith; import static org.junit.Assert.*; /** - * Instrumented test, which will execute on an Android device. + * Instrumentation test, which will execute on an Android device. * * @see Testing documentation */ @RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest -{ +public class ExampleInstrumentedTest { @Test - public void useAppContext() - { + public void useAppContext() throws Exception { // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.example.criminalintentchapter7", appContext.getPackageName()); + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.bignerdranch.android.criminalintent", appContext.getPackageName()); } } \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/app/src/main/AndroidManifest.xml b/Assignments/CriminalIntentChapter7/app/src/main/AndroidManifest.xml index f36ca73..cc00e55 100644 --- a/Assignments/CriminalIntentChapter7/app/src/main/AndroidManifest.xml +++ b/Assignments/CriminalIntentChapter7/app/src/main/AndroidManifest.xml @@ -11,20 +11,22 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.CriminalIntentChapter7" - tools:targetApi="31"> + tools:replace="android:appComponentFactory" + tools:targetApi="34"> - + android:value="" + /> + \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeActivity.java b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeActivity.java index 8568313..f958e23 100644 --- a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeActivity.java +++ b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeActivity.java @@ -1,30 +1,11 @@ package com.example.criminalintentchapter7; -import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; +import android.app.Fragment; -import android.os.Bundle; - -public class CrimeActivity extends AppCompatActivity +public class CrimeActivity extends SingleFragmentActivity { - @Override - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_crime); - - FragmentManager fm = getSupportFragmentManager(); - Fragment fragment = fm.findFragmentById( R.id.fragment_container ); - - if ( fragment == null) - { - fragment = new CrimeFragment(); - FragmentTransaction ft = fm.beginTransaction(); - ft.add( R.id.fragment_container ,fragment ); - ft.commit(); - } + protected Fragment createFragment() { + return new CrimeFragment(); } } \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeFragment.java b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeFragment.java index 6d3a3c3..6ce9f93 100644 --- a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeFragment.java +++ b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeFragment.java @@ -1,5 +1,6 @@ package com.example.criminalintentchapter7; +import android.app.Fragment; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -11,10 +12,6 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.EditText; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.LifecycleObserver; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -27,7 +24,7 @@ public class CrimeFragment extends Fragment private CheckBox solvedCheckBox; @Override - public void onCreate(@Nullable Bundle savedInstanceState) + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.crime = new Crime(); @@ -44,9 +41,8 @@ public class CrimeFragment extends Fragment super.onStart(); } - @Nullable @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.fragment_crime, container, false); @@ -54,7 +50,7 @@ public class CrimeFragment extends Fragment this.dateButton = v.findViewById(R.id.button_crime_date); this.solvedCheckBox = v.findViewById(R.id.checkBox_crime_solved); - SimpleDateFormat dt = new SimpleDateFormat( "EEEE, MMMM d, yyyy"); + SimpleDateFormat dt = new SimpleDateFormat( "EEEE, MMMM d, yyyy"); String s = dt.format(this.crime.getDate()); this.dateButton.setText( s ); this.dateButton.setEnabled( false); @@ -83,7 +79,9 @@ public class CrimeFragment extends Fragment @Override public void afterTextChanged(Editable editable) - {} + { + + } }); diff --git a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeLab.java b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeLab.java new file mode 100644 index 0000000..ccfbae1 --- /dev/null +++ b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeLab.java @@ -0,0 +1,42 @@ +package com.example.criminalintentchapter7; + +import android.content.Context; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +public class CrimeLab { + private static CrimeLab sCrimeLab; + private List mCrimes; + + public List getCrimes() { + return mCrimes; + } + + public static CrimeLab get(Context context) { + if (sCrimeLab == null) { + sCrimeLab = new CrimeLab(context); + } + return sCrimeLab; + } + private CrimeLab(Context context) { + mCrimes = new ArrayList<>(); + for (int i = 0; i < 100; ++i) { + Crime crime = new Crime(); + crime.setTitle("Crime #" + i); + crime.setSolved(i % 2 == 0); + mCrimes.add(crime); + } + } + + public Crime getCrime(UUID id) { + for (Crime crime: mCrimes) { + if (crime.getId().equals(id)) { + return crime; + } + } + return null; + } + +} diff --git a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeListActivity.java b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeListActivity.java new file mode 100644 index 0000000..246d74e --- /dev/null +++ b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeListActivity.java @@ -0,0 +1,9 @@ +package com.example.criminalintentchapter7; + +import android.app.Fragment; +public class CrimeListActivity extends SingleFragmentActivity { + @Override + protected Fragment createFragment() { + return new CrimeListFragment(); + } +} diff --git a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeListFragment.java b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeListFragment.java new file mode 100644 index 0000000..06d74c2 --- /dev/null +++ b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/CrimeListFragment.java @@ -0,0 +1,64 @@ +package com.example.criminalintentchapter7; + +import android.os.Bundle; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import android.app.Fragment; + + +import java.util.List; + +import kotlin.LateinitKt; + +public class CrimeListFragment extends Fragment { + private RecyclerView mCrimeRecyclerView; + private CrimeAdapter mAdapter; + @Override + public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + super.onCreateView(inflater, container, savedInstanceState); + View view = inflater.inflate(R.layout.fragment_crime_list, container, false); + mCrimeRecyclerView = (RecyclerView) view.findViewById(R.id.crime_recycler_view); + mCrimeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); + updateUI(); + return view; + } + private void updateUI() { + CrimeLab crimeLab = CrimeLab.get(getActivity()); + List crimes = crimeLab.getCrimes(); + mAdapter = new CrimeAdapter(crimes); + mCrimeRecyclerView.setAdapter(mAdapter); + + } + private class CrimeHolder extends RecyclerView.ViewHolder { + public CrimeHolder(LayoutInflater inflater, ViewGroup parent) { + super(inflater.inflate(R.layout.list_item_crime, parent, false)); + } + } + private class CrimeAdapter extends RecyclerView.Adapter { + private List mCrimes; + + public CrimeAdapter(List crimes) { + mCrimes = crimes; + } + + @Override + public CrimeHolder onCreateViewHolder(ViewGroup parent, int i) { + LayoutInflater layoutInflater = LayoutInflater.from(getActivity()); + return new CrimeHolder(layoutInflater, parent); + } + + @Override + public void onBindViewHolder(CrimeHolder crimeHolder, int i) { + + } + + @Override + public int getItemCount() { + return mCrimes.size(); + } + } +} diff --git a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/Message.java b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/Message.java new file mode 100644 index 0000000..5033e5d --- /dev/null +++ b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/Message.java @@ -0,0 +1,13 @@ +package com.example.criminalintentchapter7; + +public class Message { + private String message = "Hello Fragments."; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/SingleFragmentActivity.java b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/SingleFragmentActivity.java new file mode 100644 index 0000000..f652990 --- /dev/null +++ b/Assignments/CriminalIntentChapter7/app/src/main/java/com/example/criminalintentchapter7/SingleFragmentActivity.java @@ -0,0 +1,27 @@ +package com.example.criminalintentchapter7; + +import android.app.Fragment; +import android.os.Bundle; + +import android.support.v7.app.AppCompatActivity; +import android.app.FragmentManager; + + +public abstract class SingleFragmentActivity extends AppCompatActivity { + protected abstract Fragment createFragment(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_fragment); + + FragmentManager fm = getSupportFragmentManager(); + Fragment fragment = fm.findFragmentById(R.id.fragment_container); + + if (fragment == null) { + fragment = createFragment(); + fm.beginTransaction().add(R.id.fragment_container, fragment).commit(); + } + + } +} diff --git a/Assignments/CriminalIntentChapter7/app/src/main/res/layout/activity_crime.xml b/Assignments/CriminalIntentChapter7/app/src/main/res/layout/activity_fragment.xml similarity index 100% rename from Assignments/CriminalIntentChapter7/app/src/main/res/layout/activity_crime.xml rename to Assignments/CriminalIntentChapter7/app/src/main/res/layout/activity_fragment.xml diff --git a/Assignments/CriminalIntentChapter7/app/src/main/res/layout/fragment_crime_list.xml b/Assignments/CriminalIntentChapter7/app/src/main/res/layout/fragment_crime_list.xml new file mode 100644 index 0000000..60c5277 --- /dev/null +++ b/Assignments/CriminalIntentChapter7/app/src/main/res/layout/fragment_crime_list.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/app/src/main/res/layout/list_item_crime.xml b/Assignments/CriminalIntentChapter7/app/src/main/res/layout/list_item_crime.xml new file mode 100644 index 0000000..2bd8f80 --- /dev/null +++ b/Assignments/CriminalIntentChapter7/app/src/main/res/layout/list_item_crime.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/app/src/test/java/com/example/criminalintentchapter7/ExampleUnitTest.java b/Assignments/CriminalIntentChapter7/app/src/test/java/com/example/criminalintentchapter7/ExampleUnitTest.java index 0aedb46..0d3f499 100644 --- a/Assignments/CriminalIntentChapter7/app/src/test/java/com/example/criminalintentchapter7/ExampleUnitTest.java +++ b/Assignments/CriminalIntentChapter7/app/src/test/java/com/example/criminalintentchapter7/ExampleUnitTest.java @@ -9,11 +9,9 @@ import static org.junit.Assert.*; * * @see Testing documentation */ -public class ExampleUnitTest -{ +public class ExampleUnitTest { @Test - public void addition_isCorrect() - { + public void addition_isCorrect() throws Exception { assertEquals(4, 2 + 2); } } \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/build.gradle b/Assignments/CriminalIntentChapter7/build.gradle index 71b99f4..f05eacf 100644 --- a/Assignments/CriminalIntentChapter7/build.gradle +++ b/Assignments/CriminalIntentChapter7/build.gradle @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false } \ No newline at end of file diff --git a/Assignments/CriminalIntentChapter7/gradle.properties b/Assignments/CriminalIntentChapter7/gradle.properties index 3e927b1..5129e9f 100644 --- a/Assignments/CriminalIntentChapter7/gradle.properties +++ b/Assignments/CriminalIntentChapter7/gradle.properties @@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true +android.useAndroidX=false # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library diff --git a/Assignments/CriminalIntentChapter7/gradle/wrapper/gradle-wrapper.properties b/Assignments/CriminalIntentChapter7/gradle/wrapper/gradle-wrapper.properties index d868f64..c3b39e4 100644 --- a/Assignments/CriminalIntentChapter7/gradle/wrapper/gradle-wrapper.properties +++ b/Assignments/CriminalIntentChapter7/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jan 27 10:10:42 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/Assignments/FragmentToFragmentMap-463f5dd8-a8b5-4d15-8488-8d2e2a087c58.zip b/Assignments/FragmentToFragmentMap-463f5dd8-a8b5-4d15-8488-8d2e2a087c58.zip new file mode 100644 index 0000000..dd788a4 Binary files /dev/null and b/Assignments/FragmentToFragmentMap-463f5dd8-a8b5-4d15-8488-8d2e2a087c58.zip differ diff --git a/Assignments/WorkingTMProject.zip b/Assignments/WorkingTMProject.zip new file mode 100644 index 0000000..ed58aa4 Binary files /dev/null and b/Assignments/WorkingTMProject.zip differ diff --git a/Assignments/mp2_sample/.idea/.gitignore b/Assignments/mp2_sample/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Assignments/mp2_sample/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Assignments/mp2_sample/.idea/.name b/Assignments/mp2_sample/.idea/.name new file mode 100644 index 0000000..9698395 --- /dev/null +++ b/Assignments/mp2_sample/.idea/.name @@ -0,0 +1 @@ +FragmentToFragmentMap \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/appInsightsSettings.xml b/Assignments/mp2_sample/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..371f2e2 --- /dev/null +++ b/Assignments/mp2_sample/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/compiler.xml b/Assignments/mp2_sample/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/Assignments/mp2_sample/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/deploymentTargetDropDown.xml b/Assignments/mp2_sample/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/Assignments/mp2_sample/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/discord.xml b/Assignments/mp2_sample/.idea/discord.xml new file mode 100644 index 0000000..30bab2a --- /dev/null +++ b/Assignments/mp2_sample/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/gradle.xml b/Assignments/mp2_sample/.idea/gradle.xml new file mode 100644 index 0000000..32522c1 --- /dev/null +++ b/Assignments/mp2_sample/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/migrations.xml b/Assignments/mp2_sample/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/Assignments/mp2_sample/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/misc.xml b/Assignments/mp2_sample/.idea/misc.xml new file mode 100644 index 0000000..0ad17cb --- /dev/null +++ b/Assignments/mp2_sample/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/.idea/vcs.xml b/Assignments/mp2_sample/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/Assignments/mp2_sample/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/mp2_sample/build.gradle b/Assignments/mp2_sample/build.gradle index 71b99f4..f05eacf 100644 --- a/Assignments/mp2_sample/build.gradle +++ b/Assignments/mp2_sample/build.gradle @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false } \ No newline at end of file diff --git a/Assignments/mp2_sample/gradle/wrapper/gradle-wrapper.properties b/Assignments/mp2_sample/gradle/wrapper/gradle-wrapper.properties index 04c1098..9d6d82b 100644 --- a/Assignments/mp2_sample/gradle/wrapper/gradle-wrapper.properties +++ b/Assignments/mp2_sample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Mar 15 11:05:12 CDT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/compiler.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/compiler.xml index 96cc43e..61a9130 100644 --- a/Book Files/08_RecyclerView/CriminalIntent/.idea/compiler.xml +++ b/Book Files/08_RecyclerView/CriminalIntent/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/discord.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/discord.xml new file mode 100644 index 0000000..d8e9561 --- /dev/null +++ b/Book Files/08_RecyclerView/CriminalIntent/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/gradle.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/gradle.xml index 0e23f8e..b45c0ba 100644 --- a/Book Files/08_RecyclerView/CriminalIntent/.idea/gradle.xml +++ b/Book Files/08_RecyclerView/CriminalIntent/.idea/gradle.xml @@ -1,18 +1,19 @@ + diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/migrations.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/Book Files/08_RecyclerView/CriminalIntent/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/misc.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/misc.xml index 5d19981..8ec9413 100644 --- a/Book Files/08_RecyclerView/CriminalIntent/.idea/misc.xml +++ b/Book Files/08_RecyclerView/CriminalIntent/.idea/misc.xml @@ -1,4 +1,3 @@ - @@ -27,17 +26,7 @@ - - - - - - - - - - - + diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/modules.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/modules.xml deleted file mode 100644 index 37be0dd..0000000 --- a/Book Files/08_RecyclerView/CriminalIntent/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/runConfigurations.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/Book Files/08_RecyclerView/CriminalIntent/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Book Files/08_RecyclerView/CriminalIntent/.idea/vcs.xml b/Book Files/08_RecyclerView/CriminalIntent/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/Book Files/08_RecyclerView/CriminalIntent/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Book Files/08_RecyclerView/CriminalIntent/build.gradle b/Book Files/08_RecyclerView/CriminalIntent/build.gradle index 1ea4bd0..4e851ff 100644 --- a/Book Files/08_RecyclerView/CriminalIntent/build.gradle +++ b/Book Files/08_RecyclerView/CriminalIntent/build.gradle @@ -1,11 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext { + agp_version = '8.3.1' + } repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath "com.android.tools.build:gradle:$agp_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Book Files/08_RecyclerView/CriminalIntent/gradle/wrapper/gradle-wrapper.properties b/Book Files/08_RecyclerView/CriminalIntent/gradle/wrapper/gradle-wrapper.properties index a82392d..3ac940f 100644 --- a/Book Files/08_RecyclerView/CriminalIntent/gradle/wrapper/gradle-wrapper.properties +++ b/Book Files/08_RecyclerView/CriminalIntent/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sun Mar 31 00:43:34 CDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/ZIPs/CriminalIntent_MP3_CalebFontenot.zip b/ZIPs/CriminalIntent_MP3_CalebFontenot.zip new file mode 100644 index 0000000..6d9540d Binary files /dev/null and b/ZIPs/CriminalIntent_MP3_CalebFontenot.zip differ diff --git a/ZIPs/templatesMatricesSample-1.zip b/ZIPs/templatesMatricesSample-1.zip new file mode 100644 index 0000000..faf0570 Binary files /dev/null and b/ZIPs/templatesMatricesSample-1.zip differ