Merge branch 'master' of https://github.com/PJBeans/LineageOS-Installer

PJ-Oscheh · Jan 5, 2018 · 3c25765 · 3c25765
2 parents 3017f11 + b991cc4
commit 3c25765
Show file tree

Hide file tree

Showing 2 changed files with 171 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,29 @@
+
 # LineageOS-Installer
 
-On December 22, 2017, development on version 2.0 began. This version will overall have a better design, including:
+## Version 2.0
+On December 22, 2017, development on version 2.0 began.
+## What is new
 - Proper names for forms
+- Forms designed to look like message boxes have been removed. Now, labels and buttons appear in the respective form.
 - Use of Ignace Mae's "Material Skin" (as opposed to colored labels and picture boxes)
-- Foreign language support
-- A nicer installation screen, with a progress bar if possible.
+- > This means window borders, along with buttons and text all follow Material Design! Buttons have animation when you hover and click them, although with the set up of this application, the animation for floating buttons isn't seen. Hopefully this can be fixed, but it isn't a major issue.
+- A nicer installation screen with a progress bar
+- A new guide for enabling USB Debugging, written in HTML. This guide isn't complete yet.
+- The form (yes - form without the "s;" all files are downloaded in one form, with the browsers being shown/hidden at the click of a button) to download files is now bigger, and an "Open in Browser" button was added incase the page proves difficult to use in a confined space or simply won't display correctly.
+- The ADB check is now automatic (needs improvement, see below)
+- A file check is now performed prior to installation that checks for the LineageOS Zip, GApps Zip, TWRP, and all installation scripts.
+## What is to come
+- Foreign language support (see below)
+- Support for Samsung Devices if possible
+## What isn't complete
+- ADB Check is not complete; although it can check to see whether the device is connected, it *cannot* determine whether the user allowed the connection to be authorized.
+- Foreign language support will come with text that is programatically set at run time or through the `LangSelect` form. It is partially implemented for English but it is not complete; only a few forms (and even those may be incomplete) are set up for this right now. The HTML pages also won't change with this button; for local pages ("Set Up Your Device") we could probably just add each language's "Set Up Your Device" page. 
+- Flat buttons are pre-highlighted.
+## What is new in the repository
+- Removed adb executible for now; it is unclear whether ADB and Fastboot can be redistributed. If they can, they will be included in the application.
+- Removed `Land.png`, Next and About button textures as they are all now irrelevant.
+
 
 A simple, graphical solution to installing LineageOS.
 
@@ -22,10 +41,8 @@ TESTED DEVICES:
 
 ## Versions
 - Prebuilt: v1.4.1-development
-- Source: v1.5.0-development
+- Source: v2.0-development
 
-## Screenshots
-![Landing Page](Land.png)
 ## How can I contribute?
 You can contribute right here on GitHub! If you know Visual Basic, feel free to modify the installer to fix an issue, add something or delete something obsolete. You can also test the installer for your device, and report your results on [this thread](https://forum.xda-developers.com/lineage/general/want-lineage-os-installer-t3529172). 
 

diff --git a/setUpYourDevice.html b/setUpYourDevice.html
@@ -0,0 +1,148 @@
+<!DOCTYPE HTML>
+
+	<html>
+
+		<head>
+
+			<title>Set Up Your Device</title>
+
+			<meta charset="utf-8">
+
+			<meta name="viewport" content="width=device-width, initial-scale=1">
+
+				<!-- Latest compiled and minified CSS -->
+
+				<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+
+
+				<!-- Optional theme -->
+
+				<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+
+
+				<!-- Latest compiled and minified JavaScript -->
+
+				<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+
+				<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
+		</head>
+
+		<style>
+
+					body {
+
+						padding-top: 70px;
+
+			}
+
+
+
+					.navbar {
+
+						background: #00695C;
+
+						border-color: #00695C;
+
+
+
+						}
+
+					.navbar .navbar-brand {
+
+						color: #ffffff
+
+						}
+
+					.navbar .navbar-brand:hover,
+
+					.navbar .navbar-brand:focus {
+
+						color: #e0e0e0
+
+						}
+
+					.navbar .navbar-nav > li > a {
+
+						color: #ffffff;
+
+					}
+
+					.navbar .navbar-nav > li > a:hover,
+
+					.navbar .navbar-nav > li > a:focus {
+
+					color: #e0e0e0;
+
+					}
+
+					.navbar-default .navbar-nav>.active>a,
+
+					.navbar-default .navbar-nav>.active>a:focus,
+
+					.navbar-default .navbar-nav>.active>a:hover {
+
+					color: #ffffff
+
+					}
+
+
+
+					.navbar .navbar-nav>.active>a,
+
+					.navbar .navbar-nav>.open>a {
+
+					background-image: linear-gradient(to bottom,#105b5e 0,#105b5e 100%);
+
+					.nav-tabs.nav-stacked.nav-condensed > li > a {
+
+					padding-top: 4px; 
+
+					padding-bottom: 4px; 
+
+}
+
+					}
+
+		</style>
+
+		<body>
+
+		<nav class="navbar navbar-default navbar-static-top navbar-fixed-top">
+
+			<div class="container-fluid">
+
+			<div class="navbar-header">
+
+
+
+			<a class="navbar-brand" href="./index.html">Prepare your device</a>
+
+			</div>
+
+			<div class="collapse navbar-collapse" id="myNavbar">
+
+
+
+			</div>
+
+			</div>
+
+			</div>
+
+		</nav>
+
+		<h1>Set up your device:</h1>
+		<ol>
+		<li>Go to About Phone (or Tablet).</li>
+		<li>Tap "Build Number" 7 times.</li>
+		<li>Go back to Setting's home</li>
+		<li>Tap "Developer Settings"</li>
+		<li>Enable "USB Debugging."</li>
+		<li>Enable "OEM Unlocking." This option may not be present on all devices; if so, your manufacturer should have enabled this option by default</li>
+		</ol>
+		</body>
+
+	</html>