diff --git a/app/build.gradle b/app/build.gradle index 273371c..4cdf962 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,6 +16,7 @@ android { targetSdkVersion 29 versionCode 1 versionName "1.0" + vectorDrawables.useSupportLibrary = true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -40,6 +41,8 @@ dependencies { implementation 'com.journeyapps:zxing-android-embedded:4.1.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.wear:wear:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e724dac..cc4c495 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,12 +6,16 @@ + @@ -21,6 +25,7 @@ + diff --git a/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt b/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt new file mode 100644 index 0000000..adadcde --- /dev/null +++ b/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt @@ -0,0 +1,31 @@ +package com.github.mondei1.offpass + +import android.os.Bundle +import android.util.Log +import androidx.appcompat.app.AppCompatActivity +import kotlinx.android.synthetic.main.activity_create.* + +class CreateActivity : AppCompatActivity() { + private var fragment_title: TextInput? = null + private var fragment_username: TextInput? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + fragment_title = TextInput.newInstance("Title", "ENTER TITLE", "30dp") + fragment_username = TextInput.newInstance("Username", "ENTER USERNAME", "30dp") + supportFragmentManager.beginTransaction() + .replace(R.id.title, fragment_title!!) + .replace(R.id.username, fragment_username!!) + .commit() + + setSupportActionBar(findViewById(R.id.toolbar)) + + setContentView(R.layout.activity_create) + back.setOnClickListener { + Log.i("CREATE", "Back got clicked!") + finish() + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/github/mondei1/offpass/MainActivity.kt b/app/src/main/java/com/github/mondei1/offpass/MainActivity.kt index 9b1215a..57ee409 100644 --- a/app/src/main/java/com/github/mondei1/offpass/MainActivity.kt +++ b/app/src/main/java/com/github/mondei1/offpass/MainActivity.kt @@ -25,21 +25,22 @@ class MainActivity : AppCompatActivity() { .initiateScan() Log.i("Main", "Clicked on text") } + + add_button.setOnClickListener { + val intent: Intent = Intent(this, CreateActivity::class.java) + startActivity(intent) + } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) var result: IntentResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data) - if (result != null) { - if (result.contents == null) { - Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show() - } else { - Log.i("SCANNER", "Scanned: " + result.contents) - Toast.makeText(this, "Scanned: " + result.contents, Toast.LENGTH_LONG).show() - } + if (result.contents == null) { + Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show() } else { - super.onActivityResult(requestCode, resultCode, data) + Log.i("SCANNER", "Scanned: " + result.contents) + Toast.makeText(this, "Scanned: " + result.contents, Toast.LENGTH_LONG).show() } } diff --git a/app/src/main/java/com/github/mondei1/offpass/TextInput.kt b/app/src/main/java/com/github/mondei1/offpass/TextInput.kt new file mode 100644 index 0000000..68863f6 --- /dev/null +++ b/app/src/main/java/com/github/mondei1/offpass/TextInput.kt @@ -0,0 +1,67 @@ +package com.github.mondei1.offpass + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import kotlinx.android.synthetic.main.fragment_text_input.* + +// TODO: Rename parameter arguments, choose names that match +// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER +private const val ARG_HEAD = "param1" +private const val ARG_TITLE = "param2" +private const val ARG_TITLE_SIZE = "param3" + +/** + * A simple [Fragment] subclass. + * Use the [TextInput.newInstance] factory method to + * create an instance of this fragment. + */ +class TextInput : Fragment() { + // TODO: Rename and change types of parameters + private var arg_head: String? = null + private var arg_title: String? = null + private var arg_title_size: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + arg_title = it.getString(ARG_TITLE) + arg_head = it.getString(ARG_HEAD) + arg_title_size = it.getString(ARG_TITLE_SIZE) + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_text_input, container, false) + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + head.text = arg_head + title.background = null + title.hint = arg_title + } + + companion object { + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(head: String, title: String, title_size: String) = + TextInput().apply { + arguments = Bundle().apply { + putString(ARG_HEAD, head) + putString(ARG_TITLE, title) + putString(ARG_TITLE_SIZE, title_size) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi/baseline_sd_storage_24.xml b/app/src/main/res/drawable-anydpi/baseline_sd_storage_24.xml new file mode 100644 index 0000000..fe754d9 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/baseline_sd_storage_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_compress.xml b/app/src/main/res/drawable-anydpi/ic_compress.xml new file mode 100644 index 0000000..1254141 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_compress.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi/printer.xml b/app/src/main/res/drawable-anydpi/printer.xml new file mode 100644 index 0000000..e586894 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/printer.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_18.png new file mode 100644 index 0000000..da6e6ab Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_18.png differ diff --git a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_24.png new file mode 100644 index 0000000..f9b5c4a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_24.png differ diff --git a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_36.png b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_36.png new file mode 100644 index 0000000..ddd2a58 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_36.png differ diff --git a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_48.png new file mode 100644 index 0000000..81fd4b8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_48.png differ diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-hdpi/baseline_settings_white_18.png new file mode 100644 index 0000000..eb33d5e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_white_18.png differ diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-hdpi/baseline_settings_white_24.png new file mode 100644 index 0000000..9059e00 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_white_24.png differ diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_white_36.png b/app/src/main/res/drawable-hdpi/baseline_settings_white_36.png new file mode 100644 index 0000000..e230df7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_white_36.png differ diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-hdpi/baseline_settings_white_48.png new file mode 100644 index 0000000..45d855b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_white_48.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_18.png new file mode 100644 index 0000000..3d57108 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_18.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_24.png new file mode 100644 index 0000000..262c745 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_24.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_36.png b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_36.png new file mode 100644 index 0000000..f9b5c4a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_36.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_48.png new file mode 100644 index 0000000..bf7d722 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_48.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-mdpi/baseline_settings_white_18.png new file mode 100644 index 0000000..a986dea Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_white_18.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-mdpi/baseline_settings_white_24.png new file mode 100644 index 0000000..1198fc2 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_white_24.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_white_36.png b/app/src/main/res/drawable-mdpi/baseline_settings_white_36.png new file mode 100644 index 0000000..9059e00 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_white_36.png differ diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-mdpi/baseline_settings_white_48.png new file mode 100644 index 0000000..307389f Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_white_48.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_18.png new file mode 100644 index 0000000..f9b5c4a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_18.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_24.png new file mode 100644 index 0000000..bf7d722 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_24.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_36.png b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_36.png new file mode 100644 index 0000000..81fd4b8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_36.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_48.png new file mode 100644 index 0000000..3746a8a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_48.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_settings_white_18.png new file mode 100644 index 0000000..9059e00 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_white_18.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_settings_white_24.png new file mode 100644 index 0000000..307389f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_white_24.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_white_36.png b/app/src/main/res/drawable-xhdpi/baseline_settings_white_36.png new file mode 100644 index 0000000..45d855b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_white_36.png differ diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_settings_white_48.png new file mode 100644 index 0000000..46180dd Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_white_48.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_18.png new file mode 100644 index 0000000..ddd2a58 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_18.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_24.png new file mode 100644 index 0000000..81fd4b8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_24.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_36.png b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_36.png new file mode 100644 index 0000000..8a07e37 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_36.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_48.png new file mode 100644 index 0000000..e9dfb3a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_48.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_18.png new file mode 100644 index 0000000..e230df7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_18.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_24.png new file mode 100644 index 0000000..45d855b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_24.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_36.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_36.png new file mode 100644 index 0000000..a0acae5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_36.png differ diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_48.png new file mode 100644 index 0000000..76458c8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_48.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_18.png new file mode 100644 index 0000000..81fd4b8 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_18.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_24.png new file mode 100644 index 0000000..3746a8a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_24.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_36.png new file mode 100644 index 0000000..e9dfb3a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_36.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_48.png new file mode 100644 index 0000000..8e0c787 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_48.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_18.png new file mode 100644 index 0000000..45d855b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_18.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_24.png new file mode 100644 index 0000000..46180dd Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_24.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_36.png new file mode 100644 index 0000000..76458c8 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_36.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_48.png new file mode 100644 index 0000000..43aaed2 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_48.png differ diff --git a/app/src/main/res/drawable/baseline_arrow_forward_24.xml b/app/src/main/res/drawable/baseline_arrow_forward_24.xml new file mode 100644 index 0000000..702e70c --- /dev/null +++ b/app/src/main/res/drawable/baseline_arrow_forward_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout-v28/fragment_text_input.xml b/app/src/main/res/layout-v28/fragment_text_input.xml new file mode 100644 index 0000000..10b0a68 --- /dev/null +++ b/app/src/main/res/layout-v28/fragment_text_input.xml @@ -0,0 +1,30 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_create.xml b/app/src/main/res/layout/activity_create.xml new file mode 100644 index 0000000..e15bcdc --- /dev/null +++ b/app/src/main/res/layout/activity_create.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b9f1067..b459235 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -66,7 +66,7 @@ app:srcCompat="@android:drawable/ic_menu_set_as" />