Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2 #19

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

V2 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
457aeea
Revamp UI: Add bottom toolbar, update settings, modify main screen, r…
Dec 14, 2023
97bf7ed
About was migrated. App now updated with the latest About info
Dec 14, 2023
d8ec9fe
Merge pull request #17 from SidMalladi/v2_changes
trife Feb 6, 2024
156fb4f
bottom-nav-bar added to all screens
SidMalladi Feb 12, 2024
38a9d4a
updated bottom-nav-bar which was previously crashing. Also added a UX…
SidMalladi Feb 13, 2024
4f3dbe0
fixed the bug that was caused when pressing enter on the main page wh…
Feb 14, 2024
3e42c05
removed alertBox and embedded contains/match into the compareActivity…
Feb 15, 2024
e9d5849
Bugs:bottomnavbar jumps above the keyboard, removed dialog from compa…
Feb 16, 2024
337ba01
Bugs:bottomnavbar jumps above the keyboard, removed dialog from comp…
Feb 16, 2024
0dbf79b
dummy commit, in-progress but works
Feb 27, 2024
2c29fc9
Encapsulated ring notif, file export, homefrag refactor
SidMalladi Mar 1, 2024
a68f757
exportButton color, removed clearButton, last chosen mode, textlayout…
SidMalladi Mar 6, 2024
48b4167
last chosen mode is now persisted
SidMalladi Mar 6, 2024
50e987f
persisted mode fixed, bug with switching matches/contains fixed
SidMalladi Mar 7, 2024
cff3ae9
Refactored B_A_N into Verify
SidMalladi Mar 7, 2024
650d87d
compare now follows ui/logic (it was accidentally going to matches wh…
SidMalladi Mar 7, 2024
48e302c
introduced dataHelper(IdEntryRepository) which handles the db functions
SidMalladi Mar 11, 2024
8353b94
refreshData method; import functionality smoother running
SidMalladi Mar 11, 2024
cfef917
recyclerView completed (used model class and adapter instead of strin…
SidMalladi Mar 15, 2024
f9627cf
Fixes: coloring mode broken, back closes the app, export returns empt…
SidMalladi Apr 4, 2024
c7184c0
combined data in additional info recycler for smoother scroll
SidMalladi Apr 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
minSdkVersion 16
targetSdkVersion 34
versionCode 2
versionName "1.1"
versionName "2"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
multiDexEnabled = true
vectorDrawables.useSupportLibrary = true
Expand Down Expand Up @@ -40,6 +40,9 @@ android {
targetCompatibility 1.8
sourceCompatibility 1.8
}
buildFeatures {
viewBinding true
}
}

dependencies {
Expand All @@ -49,16 +52,25 @@ dependencies {
})
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.10.0'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'com.github.apl-devs:appintro:v4.2.0'
implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
implementation 'androidx.preference:preference-ktx:1.1.1'
implementation "androidx.navigation:navigation-ui-ktx:2.7.7"
testImplementation 'junit:junit:4.13.2'
implementation files('libs/poi-3.12-android-a.jar')
implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
implementation files('libs/poi-ooxml-schemas-3.12-20150511-a.jar')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.github.daniel-stoneuk:material-about-library:3.1.2'
implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.1"
implementation 'com.google.android.material:material:1.4.0'
}
repositories {
mavenCentral()
maven { url 'https://jitpack.io' }
}
46 changes: 29 additions & 17 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,43 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">

<activity
android:name="org.phenoapps.verify.MainActivity"
android:configChanges="keyboardHidden|screenSize|keyboard"
android:windowSoftInputMode="adjustPan"
android:exported="true">
android:name=".AboutActivity"
android:theme="@style/AppTheme.MaterialAboutActivity"
android:exported="true" />
<activity
android:name=".MainActivity"
android:configChanges="keyboardHidden|screenSize|keyboard|orientation"
android:exported="true"
android:windowSoftInputMode="adjustNothing">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name=".CompareActivity" android:exported="true"/>

<activity
android:name="org.phenoapps.verify.ScanActivity"
android:exported="true"/>

<activity android:name="org.phenoapps.verify.LoaderDBActivity" android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize|keyboard"/>
android:name=".CompareActivity"
android:configChanges="keyboardHidden|screenSize|keyboard|orientation"
android:windowSoftInputMode="adjustNothing"
android:exported="true"

<activity android:name="org.phenoapps.verify.SettingsActivity" android:exported="true"/>

<activity android:name="org.phenoapps.verify.IntroActivity" android:exported="true"
android:theme = "@style/AppThemeNoActionBar"/>
/>
<activity
android:name=".ScanActivity"
android:exported="true" />
<activity
android:name=".LoaderDBActivity"
android:configChanges="orientation|keyboardHidden|screenSize|keyboard"
android:exported="true" />
<activity
android:name=".SettingsActivity"
android:exported="true" />
<activity
android:name=".IntroActivity"
android:exported="true"
android:theme="@style/AppThemeNoActionBar" />
</application>

</manifest>
</manifest>
83 changes: 83 additions & 0 deletions app/src/main/java/org/phenoapps/verify/AboutActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
package org.phenoapps.verify;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.swiperefreshlayout.widget.CircularProgressDrawable;

import android.content.Context;
import android.net.Uri;
import android.os.Bundle;

import com.danielstone.materialaboutlibrary.ConvenienceBuilder;
import com.danielstone.materialaboutlibrary.MaterialAboutActivity;
import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem;
import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem;
import com.danielstone.materialaboutlibrary.model.MaterialAboutCard;
import com.danielstone.materialaboutlibrary.model.MaterialAboutList;

public class AboutActivity extends MaterialAboutActivity {


private CircularProgressDrawable progress;
private MaterialAboutActionItem updateCheckItem;




@NonNull
@Override
protected MaterialAboutList getMaterialAboutList(@NonNull Context context) {

MaterialAboutCard.Builder appCardBuilder = new MaterialAboutCard.Builder();

appCardBuilder.addItem(new MaterialAboutTitleItem.Builder().text("CheckList").icon(R.mipmap.ic_launcher).build());

appCardBuilder.addItem(ConvenienceBuilder.createVersionActionItem(this,
getResources().getDrawable(R.drawable.ic_about),
"Version",
false));

MaterialAboutCard.Builder authorCardBuilder = new MaterialAboutCard.Builder();
authorCardBuilder.title("Developers");

authorCardBuilder.addItem(new MaterialAboutActionItem.Builder()
.text(getString(R.string.dev_chaney))
.subText("\t\t"+getString(R.string.ksu))
.icon(R.drawable.ic_person_profile)
.build());
authorCardBuilder.addItem(new MaterialAboutActionItem.Builder()
.text(getString(R.string.dev_trevor))
.subText("\t\t"+getString(R.string.ksu)+"\n\t\t"+getString(R.string.dev_trevor_email))
.icon(R.drawable.ic_person_profile)
.build());
authorCardBuilder.addItem(new MaterialAboutActionItem.Builder()
.text(getString(R.string.dev_jesse))
.subText("\t\t"+getString(R.string.ksu)+"\n\t\t"+getString(R.string.dev_jesse_email)+
"\n\t\t"+"http://wheatgenetics.org")
.icon(R.drawable.ic_person_profile)
.build());

MaterialAboutCard.Builder descriptionCard = new MaterialAboutCard.Builder();
descriptionCard.title("Description");
descriptionCard.addItem(new MaterialAboutActionItem.Builder()
.text("Verify is an Android application that imports a list of entries, scans barcodes, and " +
"identifies whether it exists in the list of entries along with audio/visual notifications.").build());

return new MaterialAboutList(appCardBuilder.build(),authorCardBuilder.build(), descriptionCard.build());
}

@Nullable
@Override
protected CharSequence getActivityTitle() {
return "About";
}

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
progress = new CircularProgressDrawable(this);
progress.setStyle(CircularProgressDrawable.DEFAULT);
progress.start();
}
}
199 changes: 0 additions & 199 deletions app/src/main/java/org/phenoapps/verify/CompareActivity.kt

This file was deleted.

Loading