Skip to content

Commit c20ee1f

Browse files
ejaz4ejaz4
committed
🎨
1 parent 500e43a commit c20ee1f

16 files changed

+80
-49
lines changed

‎.idea/misc.xml‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/Theme.DotBrowser">
12+
<activity
13+
android:name=".subactivities.AddressBar"
14+
android:exported="false" />
1215
<activity
1316
android:name=".WelcomeActivity"
1417
android:exported="false" />

‎app/src/main/java/co/dothq/browser/BrowserActivity.kt‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package co.dothq.browser
22

3-
import android.content.Context
4-
import android.content.SharedPreferences
5-
import android.graphics.Color
6-
import android.os.Build
3+
import android.app.Activity
4+
import android.content.Intent
75
import androidx.appcompat.app.AppCompatActivity
86
import android.os.Bundle
9-
import android.util.Log
107
import android.view.View
11-
import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
8+
import android.widget.LinearLayout
129
import android.widget.Toast
10+
import androidx.activity.result.ActivityResult
11+
import androidx.activity.result.contract.ActivityResultContracts
1312
import org.mozilla.geckoview.GeckoRuntime;
1413
import org.mozilla.geckoview.GeckoSession;
1514
import org.mozilla.geckoview.GeckoView;
16-
import co.dothq.browser.PreferencesManager;
17-
import co.dothq.browser.BrowserDelegates
18-
15+
import co.dothq.browser.managers.ApplicationManager
16+
import co.dothq.browser.managers.PreferencesManager
17+
import co.dothq.browser.managers.StorageManager
18+
import co.dothq.browser.subactivities.AddressBar
1919

2020

2121
class BrowserActivity : AppCompatActivity() {
@@ -37,9 +37,30 @@ class BrowserActivity : AppCompatActivity() {
3737
val session = GeckoSession()
3838
val runtime = GeckoRuntime.create(this)
3939

40+
4041
session.open(runtime)
4142
view.setSession(session)
4243
session.navigationDelegate = BrowserDelegates().createNavigationDelegate("main", this, applicationContext);
44+
45+
val addressBar = findViewById<LinearLayout>(R.id.addressBarContainer);
46+
47+
addressBar.setOnClickListener {
48+
val addressBarIntent = Intent(this, AddressBar::class.java);
49+
50+
addressBarIntent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
51+
52+
var launchAddressBar = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
53+
if (result.resultCode == Activity.RESULT_OK) {
54+
val data: Intent? = result.data
55+
if (data != null) {
56+
session.loadUri(data.toString());
57+
}
58+
}
59+
}
60+
61+
launchAddressBar.launch(addressBarIntent)
62+
}
63+
4364
session.loadUri("https://ddg.gg")
4465
}
4566

‎app/src/main/java/co/dothq/browser/BrowserDelegates.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package co.dothq.browser
33
import android.app.Activity
44
import android.content.Context
55
import android.widget.TextView
6+
import co.dothq.browser.managers.StorageManager
67
import org.mozilla.geckoview.AllowOrDeny
78
import org.mozilla.geckoview.GeckoResult
89
import org.mozilla.geckoview.GeckoSession

‎app/src/main/java/co/dothq/browser/ExtensionManager.kt‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎app/src/main/java/co/dothq/browser/WelcomeActivity.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package co.dothq.browser
33
import android.content.Intent
44
import androidx.appcompat.app.AppCompatActivity
55
import android.os.Bundle
6-
import android.widget.Button
76
import android.widget.LinearLayout
87
import android.widget.TextView
8+
import co.dothq.browser.managers.StorageManager
99
import co.dothq.browser.util.defaultProfile
1010
import java.util.*
1111

@@ -25,8 +25,9 @@ class WelcomeActivity : AppCompatActivity() {
2525
defaultProfile().applyDefaultPreferences(applicationContext);
2626
StorageManager().set(applicationContext, "setup", true, "appValues");
2727
val browserIntent = Intent(this, BrowserActivity::class.java);
28-
browserIntent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
28+
intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
2929
startActivity(browserIntent)
30+
overridePendingTransition(0, 0);
3031
this.finish()
3132
}
3233
}

‎app/src/main/java/co/dothq/browser/ApplicationManager.kt‎ renamed to ‎app/src/main/java/co/dothq/browser/managers/ApplicationManager.kt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
package co.dothq.browser
1+
package co.dothq.browser.managers
22

33
import android.content.Context
44
import android.content.Intent
5-
import android.util.Log
6-
import android.widget.Toast
7-
import androidx.core.content.ContextCompat.startActivity
8-
import co.dothq.browser.util.defaultProfile
95
import android.app.Activity
10-
11-
6+
import co.dothq.browser.WelcomeActivity
127

138

149
class ApplicationManager {

‎app/src/main/java/co/dothq/browser/managers/ExtensionManager.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package co.dothq.browser.managers
2+
3+
class ExtensionManager {
4+
}

‎app/src/main/java/co/dothq/browser/PreferenceManager.kt‎ renamed to ‎app/src/main/java/co/dothq/browser/managers/PreferenceManager.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package co.dothq.browser
1+
package co.dothq.browser.managers
22

33
import android.content.Context
4+
import co.dothq.browser.managers.StorageManager
45

56
fun pref(id: String, value: Any, context: Context) {
67
PreferencesManager().set(context, id, value)

‎app/src/main/java/co/dothq/browser/StorageManager.kt‎ renamed to ‎app/src/main/java/co/dothq/browser/managers/StorageManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.dothq.browser
1+
package co.dothq.browser.managers
22

33
import android.app.Application
44
import android.content.Context

0 commit comments

Comments
 (0)