Skip to content

Joey's branch #1

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.

Sign up for GitHub

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

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

Joey's branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3733be1
Alyssa's Commit
sjg5509 Oct 26, 2017
4d24f7a
Tues Oct 31 changes
sjg5509 Oct 31, 2017
165f414
Erik's fix for out of memory error
sjg5509 Nov 7, 2017
a10eb65
-forces all lanscape Mode
sjg5509 Nov 9, 2017
22d6e44
changing setupadminpanel
sjg5509 Nov 14, 2017
899fe6c
changing scrollLayout from a RelativeLayout to a LinearLayout
sjg5509 Nov 14, 2017
ca045b3
Removing layout-large and layout-large-land to fix the AdminPanel cas…
sjg5509 Nov 14, 2017
88e0a7b
re-doing setupAdminPanel line change
sjg5509 Nov 14, 2017
3c6b6d7
fixed animations
jmiscioscia Nov 28, 2017
ae6b856
Fixed animations
jmiscioscia Dec 5, 2017
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
15 changes: 1 addition & 14 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "org.invotek.apps.easyvsd_shell"
minSdkVersion 15
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:screenOrientation="landscape"
android:label="EasyVSD Shell"
android:windowSoftInputMode="adjustResize"
android:configChanges="keyboardHidden|keyboard|screenSize"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/org/invotek/apps/easyvsd_shell/BackgroundHighlightButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,10 @@ public Bitmap decodeBitmapFromResource(Resources res, int resId, int reqWidth, i
options.inInputShareable = true;
options.inJustDecodeBounds = false;
ret = BitmapFactory.decodeResource(res, resId, options);

if(reqWidth > 0 && reqHeight > 0)
ret = Bitmap.createScaledBitmap(ret, reqWidth, reqHeight, true);

}catch(Exception e){
ret = null;
}finally{
Expand Down
109 changes: 65 additions & 44 deletions app/src/main/java/org/invotek/apps/easyvsd_shell/MainActivity.java
View file
Open in desktop

Large diffs are not rendered by default.

Loading