Skip to content

Commit 44d336d

Browse files
koraniarkoraniar
committed
optimize app and add tabs to drawer
1 parent 1f31a75 commit 44d336d

File tree

6 files changed

+47
-26
lines changed

6 files changed

+47
-26
lines changed

‎app/src/main/java/com/koraniar/freebitcoin/JavaScript.java

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ public final class JavaScript {
1111
//Global
1212
public static final String GlobalTestJSInterface = "javascript:(function(){android.showToast('hello moto');})()";
1313
public static final String GlobalTestLogin = "javascript:(function(){android.getPageInfo(" + RequestType.LoginTest + ",$('#homepage_login_button').length);})()";
14+
public static final String GoToHome = "javascript:(function(){$('.free_play_link').click();})()";
15+
public static final String GoToMultiply = "javascript:(function(){$('.double_your_btc_link').click();})()";
16+
public static final String GoToLottery = "javascript:(function(){$('.lottery_link').click();})()";
17+
public static final String GoToRefer = "javascript:(function(){$('.refer_link').click();})()";
18+
public static final String GoToProfile = "javascript:(function(){$('.edit_link').click();})()";
19+
public static final String GolobalHdeMenu = "javascript:(function(){$('.edit_link').click();})()";
1420

1521
//Free BTC
1622
public static final String FreeTestSound = "javascript:(function(){document.getElementById('test_sound').click();})()";

‎app/src/main/java/com/koraniar/freebitcoin/MainActivity.java

+13-19
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,12 @@ public void run() {
107107
notificationEnabled = true;
108108
int time = (Integer.parseInt(info) + 1);
109109
Toast.makeText(mContext, "We call you on " + Integer.toString(time) + " minutes", Toast.LENGTH_SHORT).show();
110-
_notificationService.showClaimBtcNotification(mContext, time * 60000, 101, "com.koraniar.freebitcoin.MainActivity");
110+
_notificationService.showClaimBtcNotification(mContext, time * 60000, 101, "Free BTC available", "Tap to claim it!", "com.koraniar.freebitcoin.MainActivity");
111111
}
112112
break;
113113
case RequestType.RollButtonPressed:
114114
notificationEnabled = false;
115+
_notificationService.showClaimBtcNotification(mContext, 61 * 60000, 101, "Free BTC", "This is a recordatory to play at freebitco.in", "com.koraniar.freebitcoin.MainActivity");
115116
(new Handler()).postDelayed(new Runnable() {
116117
@Override
117118
public void run() {
@@ -123,19 +124,6 @@ public void run() {
123124
});
124125
}
125126
}, 2000);
126-
(new Handler()).postDelayed(new Runnable() {
127-
@Override
128-
public void run() {
129-
if (!notificationEnabled) {
130-
mainWebView.post(new Runnable() {
131-
@Override
132-
public void run() {
133-
mainWebView.loadUrl(JavaScript.FreeGetCountDown);
134-
}
135-
});
136-
}
137-
}
138-
}, 4000);
139127
break;
140128
default:
141129
Toast.makeText(mContext, "Request Code is not valid", Toast.LENGTH_SHORT).show();
@@ -197,7 +185,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
197185
// as you specify a parent activity in AndroidManifest.xml.
198186
int id = item.getItemId();
199187

200-
//noinspection SimplifiableIfStatement
201188
if (id == R.id.action_settings) {
202189
return true;
203190
} else if (id == R.id.action_reload_page) {
@@ -211,13 +198,20 @@ public boolean onOptionsItemSelected(MenuItem item) {
211198
@SuppressWarnings("StatementWithEmptyBody")
212199
@Override
213200
public boolean onNavigationItemSelected(MenuItem item) {
214-
// Handle navigation view item clicks here.
215201
int id = item.getItemId();
216202

217-
if (id == R.id.nav_manage) {
218-
_notificationService.showNotification(getApplicationContext(), 102, "Free BTC available", "Tap to claim it!", MainActivity.class);
203+
if (id == R.id.nav_home) {
204+
mainWebView.loadUrl(JavaScript.GoToHome);
205+
} else if (id == R.id.nav_multiply) {
206+
mainWebView.loadUrl(JavaScript.GoToMultiply);
207+
} else if (id == R.id.nav_lottery) {
208+
mainWebView.loadUrl(JavaScript.GoToLottery);
209+
} else if (id == R.id.nav_refer) {
210+
mainWebView.loadUrl(JavaScript.GoToRefer);
211+
} else if (id == R.id.nav_profile) {
212+
mainWebView.loadUrl(JavaScript.GoToProfile);
219213
} else if (id == R.id.nav_share) {
220-
mainWebView.loadUrl(JavaScript.GlobalTestLogin);
214+
_notificationService.showNotification(getApplicationContext(), 102, "Free BTC available", "Tap to claim it!", MainActivity.class);
221215
} else if (id == R.id.nav_send) {
222216
mainWebView.loadUrl(JavaScript.FreeTestSound);
223217
}

‎app/src/main/java/com/koraniar/freebitcoin/NotificationService.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.graphics.Color;
1111
import android.media.RingtoneManager;
1212
import android.os.Bundle;
13+
import android.os.StrictMode;
1314
import android.os.SystemClock;
1415
import android.support.v4.app.TaskStackBuilder;
1516
import android.support.v7.app.NotificationCompat;
@@ -38,8 +39,10 @@ public void onReceive(final Context context, Intent intent) {
3839
try {
3940
int notificationId = extras.getInt("NOTIFICATION_ID");
4041
String className = extras.getString("ACTIVITY");
42+
String title = extras.getString("TITLE");
43+
String message = extras.getString("MESSAGE");
4144
Class<?> activity = Class.forName(className);
42-
self.showNotification(context, notificationId, "Free BTC available", "Tap to claim it!", activity);
45+
self.showNotification(context, notificationId, title, message, activity);
4346
}catch (ClassNotFoundException e){
4447
Log.e(LOG_TAG, "Class not founded");
4548
}
@@ -49,10 +52,12 @@ public void onReceive(final Context context, Intent intent) {
4952
}
5053
}
5154

52-
public void showClaimBtcNotification(Context context, long delay, int notificationId, String activity) {
55+
public void showClaimBtcNotification(Context context, long delay, int notificationId, String title, String contentMessage, String activity) {
5356
Intent notificationIntent = new Intent(context, MyNotificationPublisher.class);
5457
notificationIntent.putExtra("NOTIFICATION_ID", notificationId);
5558
notificationIntent.putExtra("ACTIVITY", activity);
59+
notificationIntent.putExtra("TITLE", title);
60+
notificationIntent.putExtra("MESSAGE", contentMessage);
5661
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, notificationId, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
5762

5863
long futureInMillis = SystemClock.elapsedRealtime() + delay;

‎app/src/main/res/menu/activity_main_drawer.xml

+18-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,25 @@
33

44
<group android:checkableBehavior="single">
55
<item
6-
android:id="@+id/nav_manage"
6+
android:id="@+id/nav_home"
7+
android:icon="@drawable/ic_default_notification_icon"
8+
android:title="Home" />
9+
<item
10+
android:id="@+id/nav_multiply"
11+
android:icon="@drawable/ic_menu_manage"
12+
android:title="Multiply" />
13+
<item
14+
android:id="@+id/nav_lottery"
15+
android:icon="@drawable/ic_menu_manage"
16+
android:title="Lottery" />
17+
<item
18+
android:id="@+id/nav_refer"
19+
android:icon="@drawable/ic_menu_manage"
20+
android:title="Refer" />
21+
<item
22+
android:id="@+id/nav_profile"
723
android:icon="@drawable/ic_menu_manage"
8-
android:title="Tools" />
24+
android:title="Profile" />
925
</group>
1026

1127
<item android:title="Communicate">

‎app/src/main/res/values/colors.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#3F51B5</color>
4-
<color name="colorPrimaryDark">#303F9F</color>
3+
<color name="colorPrimary">#FF9C2E</color>
4+
<color name="colorPrimaryDark">#E77F12</color>
55
<color name="colorAccent">#FF4081</color>
66
<color name="colorMainOriginal">#F7931A</color>
77
<color name="colorMainNotification">#f99e2f</color>

‎app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<resources>
2-
<string name="app_name">Free Bitcoin</string>
2+
<string name="app_name">FreeBitcoin</string>
33

44
<string name="navigation_drawer_open">Open navigation drawer</string>
55
<string name="navigation_drawer_close">Close navigation drawer</string>

0 commit comments

Comments
 (0)