Skip to content

Commit

Permalink
Merge pull request #618 from AEFeinstein/save-image
Browse files Browse the repository at this point in the history
General updates for release
  • Loading branch information
AEFeinstein authored Nov 27, 2023
2 parents c815088 + 79d54e6 commit 93c0c67
Show file tree
Hide file tree
Showing 11 changed files with 5,275 additions and 3,395 deletions.
25 changes: 11 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ MTG Familiar is an Android app which has a suite of tools to play Magic: The Gat
- Momir, Jhoira, Stonehewer randomizer

## How To Build
[![Build Status](https://circleci.com/gh/AEFeinstein/mtg-familiar.svg?&style=shield&circle-token=aa58feb74f2eb4f089dc621f23745b3b32279fd9)](https://circleci.com/gh/AEFeinstein/mtg-familiar)
[![AEFeinstein](https://circleci.com/gh/AEFeinstein/mtg-familiar.svg?&style=svg)](https://circleci.com/gh/AEFeinstein/mtg-familiar)
- Download and install the latest [Android Studio](https://developer.android.com/sdk/index.html)
- Make sure you have installed the lastest Android SDK Platform, Android SDK Tools, Android SDK Platform-tools, Android SDK Build-tools, Android Support Repository, Android Support Library, and Google Play Services from the Android SDK manager
- Make sure you have installed the latest Android SDK Platform, Android SDK Tools, Android SDK Platform-tools, Android SDK Build-tools, Android Support Repository, Android Support Library, and Google Play Services from the Android SDK manager
- Check out this project with Android Studio's VCS tools
- Press the build button

Expand All @@ -26,13 +26,13 @@ MTG Familiar is an Android app which has a suite of tools to play Magic: The Gat
2. Run MTG Familiar on said Emulator
3. Force Update the database in Familiar running in the emulator
4. Run the following script to pull off and compress the database
~~~~
rm data datagz
adb root
adb pull /data/data/com.gelakinetic.mtgfam/databases/data
adb pull /data/data/com.gelakinetic.mtgfam.debug/databases/data
gzip -c -f --best data > datagz
~~~~
~~~~
rm data datagz
adb root
adb pull /data/data/com.gelakinetic.mtgfam/databases/data
adb pull /data/data/com.gelakinetic.mtgfam.debug/databases/data
gzip -c -f --best data > datagz
~~~~
5. Copy ```datagz``` into the ```/mobile/src/main/res/raw directory```
6. Increment ```DATABASE_VERSION``` in ```/mobile/src/main/java/com/gelakinetic/mtgfam/helpers/database/CardDbAdapter.java```
7. Rename and copy any new Magic Tournament Rules, Infraction Procedure Guide, or Judging at Regular documents into ```/mobile/src/main/res/raw```. This isn't really the database, but it's nice
Expand All @@ -49,10 +49,7 @@ MTG Familiar is an Android app which has a suite of tools to play Magic: The Gat
</a>
## Show Support
The app is free, and the source is all here. If you'd like to say thanks and show a little support, here's a button: [![PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=SZK4TAH2XBZNC&lc=US&item_name=MTG%20Familiar&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted)

## FAQs
-No one has asked any questions yet!
The app is free, and the source is all here. If you'd like to say thanks and show a little support, here's a button: [![PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=SZK4TAH2XBZNC&lc=US&item_name=MTG%20Familiar&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted).
## Become an Official Beta Tester
To receive official beta builds through Google Play, first join the Google+ Community [MTG Familiar Beta Testers](https://plus.google.com/communities/110783165129365768059). Once you are a member of the community, you can opt-in to the [beta program here](https://play.google.com/apps/testing/com.gelakinetic.mtgfam)
To receive official beta builds through Google Play, opt-in to the [beta program here](https://play.google.com/apps/testing/com.gelakinetic.mtgfam).
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.android.tools.build:gradle:8.1.4'
//classpath //https://plugins.gradle.org/plugin/com.github.spotbugs

// NOTE: Do not place your application dependencies here; they belong
Expand Down
10 changes: 5 additions & 5 deletions mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,21 @@ dependencies {
annotationProcessor 'androidx.annotation:annotation:1.5.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.fragment:fragment:1.6.1'
implementation 'androidx.fragment:fragment:1.6.2'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'com.google.android.material:material:1.10.0'

// Third-party
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
implementation 'com.github.castorflex.smoothprogressbar:library:1.1.0'
implementation 'com.github.woxthebox:draglistview:1.7.3'
implementation 'org.jetbrains:annotations:24.0.1'
implementation 'org.jetbrains:annotations:24.1.0'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
implementation 'com.jpardogo.materialtabstrip:library:1.1.1'
implementation 'com.code-troopers.betterpickers:library:3.1.0'
implementation 'com.github.machinarius:preferencefragment:0.1.2'
implementation 'org.jsoup:jsoup:1.16.1'
implementation 'org.jsoup:jsoup:1.16.2'
implementation 'com.splitwise:tokenautocomplete:3.0.2'
implementation 'com.google.code.findbugs:annotations:3.0.1', {
// Need to exclude these, or build is broken by:
Expand All @@ -187,7 +187,7 @@ dependencies {
exclude module: 'rxjava'
}

implementation 'org.apache.commons:commons-text:1.10.0'
implementation 'org.apache.commons:commons-text:1.11.0'

// Testing
//noinspection GradleDependency
Expand All @@ -198,7 +198,7 @@ dependencies {
// Optional -- Hamcrest library
androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.6.0'
testImplementation 'org.mockito:mockito-core:5.7.0'

// Spotbugs
// spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
Expand Down
26 changes: 0 additions & 26 deletions mobile/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<activity
android:name=".FamiliarActivity"
android:exported="true"
android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -67,31 +66,6 @@
android:host="multiverseid"
android:pathPrefix="/"
android:scheme="card" />
<!-- Accepts URLs from gatherer -->
<data
android:host="gatherer.wizards.com"
android:pathPrefix="/Pages/Card"
android:scheme="http" />
<data
android:host="gatherer.wizards.com"
android:pathPrefix="/Pages/Card"
android:scheme="https" />
<data
android:host="gatherer.wizards.com"
android:pathPrefix="/Pages/Search/Default.aspx?name="
android:scheme="http" />
<data
android:host="gatherer.wizards.com"
android:pathPrefix="/Pages/Search/Default.aspx?name="
android:scheme="https" />
<data
android:host="www.wizards.com"
android:pathPrefix="/magic/autocard.asp?name="
android:scheme="http" />
<data
android:host="www.wizards.com"
android:pathPrefix="/magic/autocard.asp?name="
android:scheme="https" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
public class CardDbAdapter {

/* Database version. Must be incremented whenever datagz is updated */
public static final int DATABASE_VERSION = 134;
public static final int DATABASE_VERSION = 135;

/* Database Tables */
public static final String DATABASE_TABLE_CARDS = "cards";
Expand Down
Binary file modified mobile/src/main/res/raw/datagz
Binary file not shown.
Loading

0 comments on commit 93c0c67

Please sign in to comment.