Skip to content

Changed the UI of the front page . #2

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
Sanghamitra1234 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed the UI of the front page . #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 0 additions & 22 deletions .idea/compiler.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 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.

3 changes: 2 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ dependencies {
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.google.android.gms:play-services-ads:10.2.6'
testCompile 'junit:junit:4.12'

// Room
implementation "android.arch.persistence.room:runtime:1.0.0"
annotationProcessor "android.arch.persistence.room:compiler:1.0.0"
}
}
1 change: 1 addition & 0 deletions app/src/main/java/com/bbot/maxflow/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.CardView;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/bbot/maxflow/SolverPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public SolverPanel(Context context, String serialized) {
updateShowBtns();
fit = false;
HighlightAugPaths = true;
prevBmp = BitmapFactory.decodeResource(getResources(), R.drawable.keyboard_left_arrow_button);
prevBmp = BitmapFactory.decodeResource(getResources(), R.drawable.ic_keyboard_arrow_left_black_24dp);
nextBmp = BitmapFactory.decodeResource(getResources(), R.drawable.keyboard_right_arrow_button);
bmpW = prevBmp.getWidth();
bmpH = prevBmp.getHeight();
Expand Down
151 changes: 119 additions & 32 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,127 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
tools:context=".MainActivity"
android:orientation="vertical">

<!-- view for AdMob Banner Ad -->
<com.google.android.gms.ads.AdView
android:id="@+id/adView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
ads:adSize="BANNER"
ads:adUnitId="@string/banner_ad_unit_id" />
<LinearLayout
android:clipToPadding="false"
android:gravity="center"
android:id="@+id/layout1"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.CardView
android:foreground="?android:attr/selectableItemBackground"
android:clickable="false"
android:id="@+id/line1"

<Button
android:id="@+id/editor_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/about_btn"
android:layout_centerHorizontal="true"
android:text="Create Graph" />
android:layout_width="160dp"
android:layout_height="185dp"
android:layout_margin="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">
<ImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/circlebackgrounddeeppurple"
android:src="@drawable/ic_create_black_24dp"
android:padding="10dp"/>
<Button
android:layout_width="130dp"
android:layout_height="wrap_content"
android:textStyle="bold"
android:background="@drawable/btn"
android:layout_marginTop="10dp"
android:id="@+id/editor_btn"
android:text="Create Graph"/>

<Button
android:id="@+id/explorer_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/editor_btn"
android:layout_centerHorizontal="true"
android:text="Open Graph" />
</LinearLayout>
</android.support.v7.widget.CardView>

<Button
android:id="@+id/about_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="About" />
<LinearLayout
android:clipToPadding="false"
android:gravity="center"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.CardView
android:foreground="?android:attr/selectableItemBackground"
android:clickable="false"
android:layout_width="160dp"
android:layout_height="185dp"
android:layout_margin="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">
<ImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/circlebackgrounddeeppurple"
android:src="@drawable/ic_folder_open_black_24dp"
android:padding="10dp"/>
<Button
android:layout_width="130dp"
android:layout_height="wrap_content"
android:textStyle="bold"
android:layout_marginTop="10dp"
android:background="@drawable/btn"
android:text="Open Graph"
android:id="@+id/explorer_btn"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:clipToPadding="false"
android:gravity="center"
android:layout_below="@+id/layout1"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.CardView
android:foreground="?android:attr/selectableItemBackground"
android:clickable="false"
android:layout_width="160dp"
android:layout_height="185dp"
android:layout_margin="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">
<ImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/circlebackgrounddeeppurple"
android:src="@drawable/ic_class_black_24dp"
android:padding="10dp"/>
<Button
android:layout_width="130dp"
android:layout_height="wrap_content"
android:textStyle="bold"
android:background="@drawable/btn"
android:layout_marginTop="10dp"
android:id="@+id/about_btn"
android:text="About"/>

</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>

</LinearLayout>
<!-- view for AdMob Banner Ad -->
<com.google.android.gms.ads.AdView
android:id="@+id/adView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
ads:adSize="BANNER"
ads:adUnitId="@string/banner_ad_unit_id" />

</RelativeLayout>
11 changes: 10 additions & 1 deletion app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="bgcolor">#D0D0D0</color>
<color name="backgroundcolor">#fcfcfc</color>
<color name="lightgray">#ededed</color>
<color name="deeppurple">#7c4dff</color>
<color name="yello">#ffb300</color>
<color name="green">#00bfa5</color>
<color name="colorAccent">#FF4081</color>
<color name="darkblue">#23283a</color>
<color name="testcolorblue">#152b38</color>
<color name="pink">#fe104d</color>
<color name="black_overlay">#66000000</color>
</resources>
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jan 07 04:32:02 EST 2018
#Tue Oct 02 14:29:40 IST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip