Activityclass added

cylonid · Jul 3, 2020 · 3b87864 · 3b87864
1 parent 3f4bd98
commit 3b87864
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 18 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -36,6 +36,13 @@
             <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.cylonid.nativealpha.SettingsActivity"
+            android:label="@string/app_name_unicode"
+            android:icon="@mipmap/native_alpha"
+            android:roundIcon="@mipmap/native_alpha"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/cylonid/nativealpha/MainActivity.java b/app/src/main/java/com/cylonid/nativealpha/MainActivity.java
@@ -4,6 +4,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.util.Patterns;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -41,12 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
             buildAddWebsiteDialog("Welcome!\nAdd your first web shortcut:");
         }
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
-
-        toolbar.setLogo(R.mipmap.native_alpha_white);
-        toolbar.setTitle(R.string.app_name);
-        setSupportActionBar(toolbar);
-
+        Utility.personalizeToolbar(this);
         FloatingActionButton fab = findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -75,7 +71,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
-            Intent intent = new Intent(this, NewActivity.class);
+            Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
             return true;
         }

diff --git a/app/src/main/java/com/cylonid/nativealpha/SettingsActivity.java b/app/src/main/java/com/cylonid/nativealpha/SettingsActivity.java
@@ -0,0 +1,15 @@
+package com.cylonid.nativealpha;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class SettingsActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.global_settings);
+        Utility.personalizeToolbar(this);
+    }
+}
diff --git a/app/src/main/java/com/cylonid/nativealpha/Utility.java b/app/src/main/java/com/cylonid/nativealpha/Utility.java
@@ -1,12 +1,15 @@
 package com.cylonid.nativealpha;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.util.TypedValue;
 
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 public final class Utility {
     public static final String INT_ID_WEBAPPID = "webappID";
@@ -30,6 +33,14 @@ public static void Assert(boolean condition, String message) {
             throw new AssertionError(message);
         }
     }
+
+    public static void personalizeToolbar(AppCompatActivity a)  {
+        Toolbar toolbar = a.findViewById(R.id.toolbar);
+        toolbar.setLogo(R.mipmap.native_alpha_white);
+        toolbar.setTitle(R.string.app_name);
+        a.setSupportActionBar(toolbar);
+    }
+
     @ColorInt
     public static int getThemeColor
             (

diff --git a/app/src/main/res/layout/global_settings.xml b/app/src/main/res/layout/global_settings.xml
@@ -4,67 +4,116 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".SettingsActivity">
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+
+    <ScrollView
 
-<ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
 
     <LinearLayout
-        android:id="@+id/mainScreen"
+        android:id="@+id/settingsScreen"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
+        android:layout_margin="25dp"
         >
 
         <TextView
             android:id="@+id/header1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Global settings"
+            android:textColor="@android:color/black"
             android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
         <TextView
             android:id="@+id/headerDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="These settings are applied globally and override app-specific settings."
+            android:textColor="@android:color/black"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
         <Space
             android:layout_width="1dp"
-            android:layout_height="50dp"/>
+            android:layout_height="30dp"/>
 
         <Switch
             android:id="@+id/switchGlobalCache"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Clear cache after usage" />
 
         <Switch
             android:id="@+id/switchGlobalCookies"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Clear cookies after usage" />
 
         <Switch
             android:id="@+id/switchMultiTouch"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Use two-finger swipes for browser forward and backward navigation" />
 
 
         <Switch
             android:id="@+id/switchMultiTouch3Fingers"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Use three-finger swipes to switch web apps (experimental)" />
-    </LinearLayout>
 
-</ScrollView>
+        <LinearLayout
+            android:id="@+id/buttons"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_margin="25dp"
+            android:layout_gravity="right"
 
+            >
 
+            <Button
+                android:id="@+id/btnCancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Cancel" />
+            <Button
+                android:id="@+id/btnSave"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
 
+        </LinearLayout>
+    </LinearLayout>
+
+
+
+</ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -4,4 +4,6 @@
     <color name="colorPrimaryDark">#7f0000</color>
     <color name="colorAccent">#b71c1c</color>
     <color name="transparent">#07000000</color>
+
+
 </resources>
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name='Nativefier'
+rootProject.name='NativeAlpha'
 include ':app'