agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Create LicenseActivity and blue and green button styles

Browse source
This commit is contained in:
Severiano Jaramillo 2018-05-25 11:47:00 -05:00
parent 9989fbbb74
commit 5b341fb018
10 changed files with 118 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/AndroidManifest.xml
View file

@ -16,15 +16,17 @@
android:supportsRtl="true"
android:configChanges="locale"
android:theme="@style/AppTheme">
<activity android:name=".activities.IntroActivity"
android:theme="@style/AppTheme.NoActionBar">
<activity android:name=".activities.LicenseActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".activities.IntroActivity"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity android:name=".activities.BoardActivity"
android:theme="@style/AppTheme.NoActionBar" >
</activity>

38
app/src/main/java/cy/agorise/crystalwallet/activities/LicenseActivity.java Normal file
View file

@ -0,0 +1,38 @@
package cy.agorise.crystalwallet.activities;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.webkit.WebView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import cy.agorise.crystalwallet.R;
public class LicenseActivity extends AppCompatActivity {
@BindView(R.id.wvEULA) WebView wvEULA;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_license);
ButterKnife.bind(this);
// TODO check if license has been agreed
String html = getString(R.string.licence_html);
wvEULA.loadData(html, "text/html", "UTF-8");
}
@OnClick(R.id.btnAgree)
public void onAgree() {
// TODO send user to Intro activity if no active account or to Board activity otherwise
}
@OnClick(R.id.btnDisAgree)
public void onDisagree() {
finish();
}
}

2
app/src/main/res/drawable/send_button_background.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:drawable="@color/redcolor"/>
<item android:state_enabled="true" android:drawable="@color/redColor"/>
<item android:state_enabled="false" android:drawable="@color/gray"/>
</selector>

53
app/src/main/res/layout/activity_license.xml Normal file
View file

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:background="@android:color/darker_gray"
tools:context="cy.agorise.crystalwallet.activities.LicenseActivity">
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<WebView
android:id="@+id/wvEULA"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</WebView>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@android:color/white"
android:clipToPadding="false"
android:padding="4dp"
android:orientation="horizontal">
<Button
android:id="@+id/btnDisAgree"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.50"
android:layout_marginEnd="8dp"
android:theme="@style/RedButton"
android:textColor="@color/white"
android:textSize="14sp"
android:text="@string/disagree" />
<Button
android:id="@+id/btnAgree"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_marginStart="8dp"
android:theme="@style/BlueButton"
android:text="@string/agree"
android:textSize="14sp"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/create_seed.xml
View file

@ -85,7 +85,7 @@
android:layout_gravity="center"
android:layout_marginStart="24dp"
android:layout_marginTop="48dp"
android:background="@color/redcolor"
android:background="@color/redColor"
android:text="@string/cancel"
android:textColor="@color/white"
android:textStyle="bold"

2
app/src/main/res/layout/fragment_accounts_settings.xml
View file

@ -101,7 +101,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@color/redcolor"
android:background="@color/redColor"
android:text="@string/remove"
android:textColor="@color/white"
android:textStyle="bold"

2
app/src/main/res/layout/fragment_import_account_options.xml
View file

@ -56,7 +56,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:background="@color/redcolor"
android:background="@color/redColor"
android:text="@string/dialog_cancel"
android:textAllCaps="false"
android:textColor="@color/white"

3
app/src/main/res/values/colors.xml
View file

@ -19,7 +19,7 @@
<color name="greencolor">#70882E</color>
<color name="red">#ff0000</color>
<color name="pinkColor">#FF4081</color>
<color name="redcolor">#DD4739</color>
<color name="redColor">#DD4739</color>
<color name="textColorPrimary">#FFFFFF</color>
<color name="windowBackground">#FFFFFF</color>
@ -27,7 +27,6 @@
<color name="bottomBarColor">#dddddd</color>
<color name="blackColor">#000000</color>
<color name="whiteColor">#ffffff</color>
<color name="receive_amount">#669900</color>
<color name="receive_amount_light">#c5e1a5</color>

6
app/src/main/res/values/strings.xml
View file

File diff suppressed because one or more lines are too long

14
app/src/main/res/values/styles.xml
View file

@ -105,4 +105,18 @@
<item name="android:minHeight">16dp</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="BlueButton" parent="Theme.AppCompat">
<item name="colorAccent">@color/colorPrimary</item>
<item name="colorControlHighlight">@color/colorPrimaryDark</item>
<item name="colorButtonNormal">@color/gray</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
</style>
<style name="RedButton" parent="Theme.AppCompat">
<item name="colorAccent">@color/red</item>
<item name="colorControlHighlight">@color/redColor</item>
<item name="colorButtonNormal">@color/gray</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
</style>
</resources>