Skip to content
This repository has been archived by the owner on Dec 27, 2022. It is now read-only.

Commit

Permalink
hotfix/housekeeping (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
codewithJosh authored Nov 11, 2022
2 parents c998b50 + c98e506 commit ea0b830
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 18 deletions.
19 changes: 10 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ plugins {
}

android {
compileSdk 32
compileSdk 33

defaultConfig {
applicationId "com.codewithjosh.ImmuniNation2k21"
minSdk 23
targetSdk 32
versionCode 10
versionName "0.10.0"
targetSdk 33
versionCode 11
versionName "0.11.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -26,22 +26,23 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.codewithjosh.ImmuniNation2k21'
}

dependencies {

implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

// add dependency on Google Firebase Authentication
implementation 'com.google.firebase:firebase-auth:21.0.6'
implementation 'com.google.firebase:firebase-auth:21.1.0'

// add dependency on Google Firebase Cloud Firestore
implementation 'com.google.firebase:firebase-firestore:24.2.0'
implementation 'com.google.firebase:firebase-firestore:24.4.0'

// add dependency on H. Dodenhof CircleImageView
implementation 'de.hdodenhof:circleimageview:3.1.0'
Expand All @@ -53,7 +54,7 @@ dependencies {
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'

// add dependency on Google Firebase Cloud Storage
implementation 'com.google.firebase:firebase-storage:20.0.1'
implementation 'com.google.firebase:firebase-storage:20.1.0'

// add dependency on ZXing, Journey ZXingAndroidEmbedded
implementation 'com.journeyapps:zxing-android-embedded:3.4.0'
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.codewithjosh.ImmuniNation2k21">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/layout/activity_view_schedule.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>

<ImageView
android:id="@+id/iv_end_of_proof"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
Expand All @@ -107,7 +106,6 @@
app:layout_constraintBottom_toBottomOf="parent" />

<ImageView
android:id="@+id/iv_start_of_proof"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="color_black_ff">#FF000000</color>
<color name="color_white_ff">#FFFFFFFF</color>
<color name="color_chinese_black">#131313</color>
<color name="color_chinese_white">#E1E1E1</color>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<string name="hint_last_name">Last Name</string>
<string name="text_button_register">Create Account</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title_admin_schedule">Admin Schedule</string>
<string name="title_admin_request">Admin Request</string>
<string name="title_schedule">Schedule</string>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.2.1' apply false
id 'com.android.library' version '7.2.1' apply false
id 'com.android.application' version '7.3.1' apply false
id 'com.android.library' version '7.3.1' apply false
}

task clean(type: Delete) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jul 14 21:00:21 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit ea0b830

Please sign in to comment.